Remove transitive dependencies conflict resolution workarround

Signed-off-by: Patryk Miś <foss@patrykmis.com>
talkback-foss-team · Oct 19, 2023 · 55d1159 · 55d1159
1 parent 3d06161
commit 55d1159
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 26 deletions.
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -1963,18 +1963,13 @@
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.8.22">
+         <artifact name="kotlin-stdlib-1.8.22.jar">
+            <sha512 value="dc3a94c627234bfc2fe6421610e86cb6945d294257d1f4814295370ca6bc2f0db99c582b24d3e3bf7e5e484dbb3e06823eea5e947ce66a4bf6d6fd182c8ca5fd" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="kotlin-stdlib-1.8.22.pom">
             <sha512 value="536ec183fa6c553b5c351b39599842127e6b8e6a9bd8f638e3d2aff7d03dd365e3a9f8533419dd9d3d79ec0ee606544adfbc0c2a969ecf4c1198ce9bcc3099e7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.9.10">
-         <artifact name="kotlin-stdlib-1.9.10.jar">
-            <sha512 value="6eab000f55dd196a074d1d97df9d285bccace31f0cae8db1846b1c9a55a6ea5e401307a95922a1d758b4152916de47fe36d31551ad0250918e6e07ce710a83a2" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlin-stdlib-1.9.10.pom">
-            <sha512 value="d1a76621379d2e075949585be004fded4f37ab3cefbf4bad93bbaaf2dd124ca4c4d1993f8ba37f9990419a6c6b860ead598a91352fdfa8f87db661976597d3a1" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.8.20-RC2">
          <artifact name="kotlin-stdlib-common-1.8.20-RC2.jar">
             <sha512 value="666a14ab16596f5dd2b1c77769f5b5f379231ceeec5fb3d8e9f2439a3b211268e8ef18e2c11dfa139b330e8b6d95ff0ec7b77773a3c73041ada269ecfc5cd681" origin="Generated by Gradle"/>
@@ -1983,12 +1978,20 @@
             <sha512 value="7fe21bc1fa260e554f25c5049665aa9e58d45665af5a58b223b18ef79167588724c38699bc85e629d963a86161ebec75d32512dd08773d079bcb2fe7c06f4c05" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.9.10">
-         <artifact name="kotlin-stdlib-common-1.9.10.jar">
-            <sha512 value="e7166112e27edcbc1fb7b918bf66120b35f82311016f944472ebc23c848b81d7016660d5d1a3e7a1679e599c555d796d73c520a0d8178e00b36aa3668415170e" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.8.22">
+         <artifact name="kotlin-stdlib-common-1.8.22.jar">
+            <sha512 value="abf0ed302d8c6bde132f2912e85a1d9abcb89067565a79bb023aabdcd00101c6ba414297fd49eeb528380921794a7ef95574ca5bda4bdcd9f6f78f9e91852c2f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-common-1.8.22.pom">
+            <sha512 value="97790ad48156ae61e05853453e53225831db860fcaf452e2f41e9764ed87e3d28410e6806f0b1f25db80eba8d6475e6b8e908360e9fc605567b9cfbdf188f51b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.6.21">
+         <artifact name="kotlin-stdlib-jdk7-1.6.21.jar">
+            <sha512 value="0c56a3bd135e31155cf35f7bb1c6d71afd597599db23b587d0231d4b5f5a5e6a62432d33f160eb6e90bbe228bd92a2913370751435e4b95afb6b0a93ff1e3668" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-stdlib-common-1.9.10.pom">
-            <sha512 value="0a382eb25f25bf3d863a727bf6f4a4452c4059226e4ed57ff401b38426a50cfb8befbcb438399f841b0033e4ee54dc5aafb1b19d54a9814c4518df12fb027403" origin="Generated by Gradle"/>
+         <artifact name="kotlin-stdlib-jdk7-1.6.21.pom">
+            <sha512 value="104134319654ab484c91a5fde48a383828bf48285fd9a6a6763679a2efc4972a371178cd5d6dd7dc5259bc5dca054d68b75cce58c90d62c0e022a5fa49632258" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.8.20-RC2">
@@ -1999,12 +2002,20 @@
             <sha512 value="6d2fb2db5c076aa4dcfe34be522d7dd80f14c1a45e579637cee4056fb79abc02b2bc877a925ae04367db706557b655278b55ea01bf42419f1ab8cf18937aec13" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.9.10">
-         <artifact name="kotlin-stdlib-jdk7-1.9.10.jar">
-            <sha512 value="f839178f07b9d6bd9a3910d13b181399e975211fa556c3a9ead08eca30ababa74f75c79aee95224ffb7b610b9e56768eeeba18e8fae84826903adb12e122bb67" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.8.22">
+         <artifact name="kotlin-stdlib-jdk7-1.8.22.jar">
+            <sha512 value="903a748df5bbdfa2ac3fd0b117920719a32d0aaf8ed76567d14ad6fc3617370412378c5d3da6d3b3f2c3dc913a1acfa0cb7041346d4903806eaf9e550d25db30" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-jdk7-1.8.22.pom">
+            <sha512 value="c3888a3f49293b9a559a047cd063089cbc97fe47879b1637e9cb3ac76596f0b054f57b4d9929de63741a3bd7b3e2bd5971b188d85b70965d522f3f78a1198b1f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.6.21">
+         <artifact name="kotlin-stdlib-jdk8-1.6.21.jar">
+            <sha512 value="c6055591873996d21f809b7508c8d19371bc832979a563bbfe9d9c7d04c4133708ba16104ee611136618e647f8a9950b1202cb2dfca1af9fa809c6bc276c87ec" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-stdlib-jdk7-1.9.10.pom">
-            <sha512 value="fdb3c9ce1109cb6f067f0645ffca942982dc7ac66ca92eb5ae22edf9011bc8b5e02ce0e96a5def49945aec45f59f565789dd9c076913f8c8045660dcbcf33a9e" origin="Generated by Gradle"/>
+         <artifact name="kotlin-stdlib-jdk8-1.6.21.pom">
+            <sha512 value="bcb1a110d1949e6e4755eb36dd7aec09dd8c5177c952886218e17f7cb0556895dca87ac4802dd4a7457f6e8771f22e900f84762b910eb41b2862fda3b6cd723b" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.8.20-RC2">
@@ -2015,12 +2026,12 @@
             <sha512 value="9112b50ecc9f2274516fba55999a2aefac64f02970158a30ebf3a2f5052b66127dc571ee346b50dc677009ffafedf79aa6725f2621f7e3f8abb5fadcf507c57f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.9.10">
-         <artifact name="kotlin-stdlib-jdk8-1.9.10.jar">
-            <sha512 value="b027fc4a0be8e69f41a86ae775ce350ef0084eb4652e50a0640dbcc600db76c3fc2983e17c96b6071b5698cea636e1b2cb015e84a6c0efe95e6db668036ba3cc" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.8.22">
+         <artifact name="kotlin-stdlib-jdk8-1.8.22.jar">
+            <sha512 value="84dcd075a8d500fe6233eac8e07348bc4f4d0a1aaa1db216a77ccc9b1f2a94f14bc49a210931fe3daa71b3fe900e095c9ae32aeb32a370259228b1dbe31f3f7e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-stdlib-jdk8-1.9.10.pom">
-            <sha512 value="8cf0741fc581be275cccb34ab1f37ea6f6adfbeb086ec685258d2ddee1d7fdb03695a4da20c6a97e3043886dbf95f36b29db11699069d71c0c7aff9f4f6c740c" origin="Generated by Gradle"/>
+         <artifact name="kotlin-stdlib-jdk8-1.8.22.pom">
+            <sha512 value="80e20706caf63123f2b4c967f50fa2a230f9a60d76461734f7950c66523e0d3ed2e05f3f568e4a6d684cd62bb4b305579860eb359db027b2bbac1a1f721f4e5a" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-android" version="1.6.4">

diff --git a/shared.gradle b/shared.gradle
@@ -69,7 +69,4 @@ dependencies {
 
     // UI understanding
     implementation 'joda-time:joda-time:2.12.5'
-
-    // transitive dependencies conflict resolution
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10'
 }