Merge branch 'revert-mockk-version'

2 files changed, 83 insertions, 71 deletions

diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt
index 84663674ec..52561dab5b 100644
--- a/android/buildSrc/src/main/kotlin/Versions.kt
+++ b/android/buildSrc/src/main/kotlin/Versions.kt
@@ -8,7 +8,9 @@ object Versions {
     const val kotlinCompilerExtensionVersion = "1.4.7"
     const val kotlinx = "1.7.1"
     const val leakCanary = "2.11"
-    const val mockk = "1.13.5"
+    // Make sure the following issue has been fixed before upgrading mockk:
+    // https://github.com/mockk/mockk/issues/1035
+    const val mockk = "1.13.3"
     const val mockWebserver = "4.11.0"
     const val turbine = "0.13.0"
 
diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml
index c660e58de9..da9356ec6e 100644
--- a/android/gradle/verification-metadata.xml
+++ b/android/gradle/verification-metadata.xml
@@ -2295,100 +2295,100 @@
             <sha256 value="6ac46f3122870ba5a99a3c15749da63f127696f22a6c149ec323ff96ffc81d0a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk" version="1.13.5">
-         <artifact name="mockk-1.13.5.module">
-            <sha256 value="e7b7d8a0a22288c4be2b3c6c14178fbc16bf13d0bc272c0bc36f067650dd879c" origin="Generated by Gradle"/>
+      <component group="io.mockk" name="mockk" version="1.13.3">
+         <artifact name="mockk-1.13.3.module">
+            <sha256 value="f83832be0cf849b985662000056f8fc301b8f4362b4f0c25fee61423c07b6fe7" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-metadata-1.13.5.jar">
-            <sha256 value="6ed9cf19c2b963d9209f4a3d92900bece4c02e08e60e4f8eae747e85af67fa1d" origin="Generated by Gradle"/>
+         <artifact name="mockk-metadata-1.13.3.jar">
+            <sha256 value="13ff085568eeb957142398f5549bb947d207f93865db0d3cd4713728572723a6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk-agent" version="1.13.5">
-         <artifact name="mockk-agent-1.13.5.module">
-            <sha256 value="02fd3b983addd1dcd363f4e1468d419190ff84f948ee078bcb1c9abc9787bec3" origin="Generated by Gradle"/>
+      <component group="io.mockk" name="mockk-agent" version="1.13.3">
+         <artifact name="mockk-agent-1.13.3.module">
+            <sha256 value="2092372aed0da05c9eebc1ab5fdf69505dcf0e71326c50c516371a4252a7a2a1" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-agent-metadata-1.13.5.jar">
-            <sha256 value="8ce5bdbeda78233faa222dac164429b90a475c235ac60115104d14ecb11211b1" origin="Generated by Gradle"/>
+         <artifact name="mockk-agent-metadata-1.13.3.jar">
+            <sha256 value="5967da86c356d25c6af6add49a7cd1bddd747c877bad2ca99dd98d29ad00e379" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk-agent-android" version="1.13.5">
-         <artifact name="mockk-agent-android-1.13.5.aar">
-            <sha256 value="6f63d4540c18bb98b10af5de86e2f7db08a40645c4b1ad486c5216c6c2f2453c" origin="Generated by Gradle"/>
+      <component group="io.mockk" name="mockk-agent-android" version="1.13.3">
+         <artifact name="mockk-agent-android-1.13.3.aar">
+            <sha256 value="b7809f03af9f42724730148bece306a3d820d4e0f2707000385ce71ab2dc3842" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-agent-android-1.13.5.module">
-            <sha256 value="a80487533d0613fd854471a04910f9b5fdfc1e37cff1ad985406a60da8619dc4" origin="Generated by Gradle"/>
+         <artifact name="mockk-agent-android-1.13.3.module">
+            <sha256 value="e0f98dcec1d9033080465630efdea211a3f9b79058cc4d8bf40c2ffc6a01b0d5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk-agent-api" version="1.13.5">
-         <artifact name="mockk-agent-api-1.13.5.module">
-            <sha256 value="b438768adaae12bdf8ed6a59b0259201f8f1ef942802fb6cc5143b993bd0d389" origin="Generated by Gradle"/>
+      <component group="io.mockk" name="mockk-agent-api" version="1.13.3">
+         <artifact name="mockk-agent-api-1.13.3.module">
+            <sha256 value="e13e3ef7459734042323cb263f0583a8c881a83f2947b32d03f777c143cf26f0" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-agent-api-metadata-1.13.5.jar">
-            <sha256 value="99b0762540e4e9460c840b6a08e5b781bbef0f3679d9a5403cee26b87bc4510a" origin="Generated by Gradle"/>
+         <artifact name="mockk-agent-api-metadata-1.13.3.jar">
+            <sha256 value="65721657da7a1d6b27e0ef0a6ba4dcdbd1a5735529ff648a45e806452b8f54fa" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk-agent-api-jvm" version="1.13.5">
-         <artifact name="mockk-agent-api-jvm-1.13.5.jar">
-            <sha256 value="91567dc7787b05ed6f7d61995786ff7f96ba4ad0154346330c8c48a17d104ce1" origin="Generated by Gradle"/>
+      <component group="io.mockk" name="mockk-agent-api-jvm" version="1.13.3">
+         <artifact name="mockk-agent-api-jvm-1.13.3.jar">
+            <sha256 value="4a9d25bf44a97c419305f70f3a05db34a3feb7b7825f501f8a95fbc4cffbefc5" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-agent-api-jvm-1.13.5.module">
-            <sha256 value="2ddeffbd7dc082b73280cb76e713c7869826d004a6dbeba1767c58dcdec47a24" origin="Generated by Gradle"/>
+         <artifact name="mockk-agent-api-jvm-1.13.3.module">
+            <sha256 value="e8b3c171e360f36c2cbc89e8d63c192b19ff22ece0b54ffd75eb1b79a75b9677" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk-agent-jvm" version="1.13.5">
-         <artifact name="mockk-agent-jvm-1.13.5.jar">
-            <sha256 value="97f8f51881ceeb0b46524e8b5f8ba89237c5e2872b10ad177412fbe0054d251c" origin="Generated by Gradle"/>
+      <component group="io.mockk" name="mockk-agent-jvm" version="1.13.3">
+         <artifact name="mockk-agent-jvm-1.13.3.jar">
+            <sha256 value="ba8e134b622e0c6e839b8f92dca17d115f0c3782b436d039ea33d2f3f332b96b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-agent-jvm-1.13.5.module">
-            <sha256 value="6554d5d27428d599f3ef23bd7462c941bea6c4f83f7720a1b6db35773ddbca1b" origin="Generated by Gradle"/>
+         <artifact name="mockk-agent-jvm-1.13.3.module">
+            <sha256 value="60fe63be953dbf20d9778fcbe31738699e76adc14aae3b3f8dcdc82b81699932" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk-android" version="1.13.5">
-         <artifact name="mockk-android-1.13.5.aar">
+      <component group="io.mockk" name="mockk-android" version="1.13.3">
+         <artifact name="mockk-android-1.13.3.aar">
             <sha256 value="9e342154c992ebcab661df99843a3043885d851504cb025408fa80faab1b7f8d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-android-1.13.5.module">
-            <sha256 value="1112ed9da24c8382ad3288b31f926c959e24ca28b2b44ba7b06c82a075cba17b" origin="Generated by Gradle"/>
+         <artifact name="mockk-android-1.13.3.module">
+            <sha256 value="f72f6113ce2bed38bdc0f0dddad81ca8d9c9212ab734c3f84174e5b862cc4e10" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk-core" version="1.13.5">
-         <artifact name="mockk-core-1.13.5.module">
-            <sha256 value="d058ee178abbc37e2bbdeee46091b84b4e101b43d2461bec1ceb303083a0c6d0" origin="Generated by Gradle"/>
+      <component group="io.mockk" name="mockk-core" version="1.13.3">
+         <artifact name="mockk-core-1.13.3.module">
+            <sha256 value="2bdf523ecdc0778b3a9e97d5d1197fb683ea92fd12139b200bdfbafc01fb1a6e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-core-metadata-1.13.5.jar">
-            <sha256 value="99b0762540e4e9460c840b6a08e5b781bbef0f3679d9a5403cee26b87bc4510a" origin="Generated by Gradle"/>
+         <artifact name="mockk-core-metadata-1.13.3.jar">
+            <sha256 value="65721657da7a1d6b27e0ef0a6ba4dcdbd1a5735529ff648a45e806452b8f54fa" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk-core-jvm" version="1.13.5">
-         <artifact name="mockk-core-jvm-1.13.5.jar">
-            <sha256 value="082307627a5d0456e6194585a02eb61e299c15f5767ea3f21b21a2cbfff4e967" origin="Generated by Gradle"/>
+      <component group="io.mockk" name="mockk-core-jvm" version="1.13.3">
+         <artifact name="mockk-core-jvm-1.13.3.jar">
+            <sha256 value="6e4b14767d31c8a58c21d344214ff5a4991cda16976e775e576686f1858e21ce" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-core-jvm-1.13.5.module">
-            <sha256 value="b4c590cc1bd0e26990fc361c80cda75ec638851a91c744f076cb49b3d6770114" origin="Generated by Gradle"/>
+         <artifact name="mockk-core-jvm-1.13.3.module">
+            <sha256 value="bb22e01a98c6a5740e20aaa4c5b2ed59aa32f317f3a8c60940dcd59aaef794d7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk-dsl" version="1.13.5">
-         <artifact name="mockk-dsl-1.13.5.module">
-            <sha256 value="3948340390402798dc5cc972115134a95a1efba4917417f76beb0ad712846eef" origin="Generated by Gradle"/>
+      <component group="io.mockk" name="mockk-dsl" version="1.13.3">
+         <artifact name="mockk-dsl-1.13.3.module">
+            <sha256 value="20d9eaa9e470304de667e39fd1ede37be50661eeaa389f676de451e158ab82d7" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-dsl-metadata-1.13.5.jar">
-            <sha256 value="99b0762540e4e9460c840b6a08e5b781bbef0f3679d9a5403cee26b87bc4510a" origin="Generated by Gradle"/>
+         <artifact name="mockk-dsl-metadata-1.13.3.jar">
+            <sha256 value="65721657da7a1d6b27e0ef0a6ba4dcdbd1a5735529ff648a45e806452b8f54fa" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk-dsl-jvm" version="1.13.5">
-         <artifact name="mockk-dsl-jvm-1.13.5.jar">
-            <sha256 value="c3189584471299771f165678ba081a29285fbf742fe5829154e3b34f940a3483" origin="Generated by Gradle"/>
+      <component group="io.mockk" name="mockk-dsl-jvm" version="1.13.3">
+         <artifact name="mockk-dsl-jvm-1.13.3.jar">
+            <sha256 value="c7eda6af417482cea3c847888c789a826298884014902ec32e4e610f77e7ac4e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-dsl-jvm-1.13.5.module">
-            <sha256 value="b6812575181f55aa4b6e1b210cd34f382b3bd53f2911549485da22003f2e16ff" origin="Generated by Gradle"/>
+         <artifact name="mockk-dsl-jvm-1.13.3.module">
+            <sha256 value="907fd0f070e484110da40cae9d89475707c2471619bf36a66e661661dc961716" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk-jvm" version="1.13.5">
-         <artifact name="mockk-jvm-1.13.5.jar">
-            <sha256 value="303e0b4080504c1fbbbb01e7ee30cccdfe9c97bc574806abe1e89b151d8cb957" origin="Generated by Gradle"/>
+      <component group="io.mockk" name="mockk-jvm" version="1.13.3">
+         <artifact name="mockk-jvm-1.13.3.jar">
+            <sha256 value="2bacc065deb36a20476e0b61caa7c97444e4ef667d4c48cc28e0c7c959f85c68" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-jvm-1.13.5.module">
-            <sha256 value="3b5ff07f6de535cf3753810a90a7f695b72ab4015d9d63fc907763009b68fb15" origin="Generated by Gradle"/>
+         <artifact name="mockk-jvm-1.13.3.module">
+            <sha256 value="bdea760dfa921e480c78a8f9c094ec34965b2226d39df8421c0060183bd0dcaf" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.netty" name="netty-buffer" version="4.1.52.Final">
@@ -2517,14 +2517,14 @@
             <sha256 value="12cfcb37f4d8d5414eb405271681e9805a1085b5ad794356088f369ebb9c9b87" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="net.bytebuddy" name="byte-buddy" version="1.12.20">
-         <artifact name="byte-buddy-1.12.20.jar">
-            <sha256 value="0a9b2795e0e2391117062f0fc7f6ae98fa3c2a7c927847ff1e01bb7cffcd9167" origin="Generated by Gradle"/>
+      <component group="net.bytebuddy" name="byte-buddy" version="1.12.18">
+         <artifact name="byte-buddy-1.12.18.jar">
+            <sha256 value="39200c13a72b6a3f4ec43c7b6d2fb78ecbeb25c29e986f4efa572636b39d750e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="net.bytebuddy" name="byte-buddy-agent" version="1.12.20">
-         <artifact name="byte-buddy-agent-1.12.20.jar">
-            <sha256 value="e898463a5ac6964ec8847f44e43759a97580be26ceef1fd211dc888e73519c7b" origin="Generated by Gradle"/>
+      <component group="net.bytebuddy" name="byte-buddy-agent" version="1.12.18">
+         <artifact name="byte-buddy-agent-1.12.18.jar">
+            <sha256 value="c31a3256b2df60a5d227971798f73b5aa268a0cb854ecec39ffa6e372eecde21" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="net.gpedro.integrations.slack" name="slack-webhook" version="1.4.0">
@@ -3103,6 +3103,11 @@
             <sha256 value="e771fe74250a943e8f6346713201ff1d8cb95c3a5d1a91a22b65a9e04f6a8901" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.8.10">
+         <artifact name="kotlin-stdlib-1.8.10.jar">
+            <sha256 value="17e1076131cd07c958a942ff8a087cf865b1ef3de58463e1e5dd6fd7515406b0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.8.20">
          <artifact name="kotlin-stdlib-1.8.20.jar">
             <sha256 value="4395647b1961d9fb730a34e8dbe56c293157bc0759004cca63d9b5ee6653e5c7" origin="Generated by Gradle"/>
@@ -3138,6 +3143,11 @@
             <sha256 value="54f61351b1936ad88f4e53059fe781e723eae51d78ed9e7422d8b403574ec682" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.7.20">
+         <artifact name="kotlin-stdlib-jdk7-1.7.20.jar">
+            <sha256 value="524da3c1a2ad56fd52c4ae2272ef3de421de8d2047ab1c51fc306d351243f2f5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.8.20">
          <artifact name="kotlin-stdlib-jdk7-1.8.20.jar">
             <sha256 value="af1ec40c3b951afdcc0c2a0173c7b81763c5281c2d5bafbf0a8544a24c5dcc0c" origin="Generated by Gradle"/>
@@ -3158,6 +3168,11 @@
             <sha256 value="8aafdd60c94f454c92e5066d266a5ed53ecc63c78f623b3fd9db56fea4032873" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.7.20">
+         <artifact name="kotlin-stdlib-jdk8-1.7.20.jar">
+            <sha256 value="1da0d306c995945e1f807240ef64b5cd2dd5ac58612afb1a8596143d10b7ded5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.8.20">
          <artifact name="kotlin-stdlib-jdk8-1.8.20.jar">
             <sha256 value="e398b67977622718bf18ff99b739c7d9da060f33fb458a2e25203221c16af010" origin="Generated by Gradle"/>
@@ -3532,11 +3547,6 @@
             <sha256 value="d3ef575e3e4979678dc01bf1dcce51021493b4d11fb7f1be8ad982877c16a1c0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.slf4j" name="slf4j-api" version="2.0.5">
-         <artifact name="slf4j-api-2.0.5.jar">
-            <sha256 value="f4a2974509291acc49fda4a79b0d59e15e2b524095d6421c66391b92387af4c9" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.sonatype.goodies" name="package-url-java" version="1.1.1">
          <artifact name="package-url-java-1.1.1.jar">
             <sha256 value="15297862342b494a535742fba90ea8a321cd13e1d0dc4c61b7a3b18ce385e1a8" origin="Generated by Gradle"/>