drop lifecycle library workaround

GrapheneOS · Oct 8, 2023 · 0aeb874 · 0aeb874
1 parent fa7b940
commit 0aeb874
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 3 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -113,9 +113,6 @@ dependencies {
     implementation("com.google.zxing:core:3.5.2")
     implementation("org.bouncycastle:bcprov-jdk18on:1.76")
 
-    // work around conflict
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
-
     val cameraVersion = "1.3.0-rc02"
     implementation("androidx.camera:camera-core:$cameraVersion")
     implementation("androidx.camera:camera-camera2:$cameraVersion")

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -393,6 +393,26 @@
             <sha512 value="81afecd2d9d659489b9a044e5b06cc40db7369910f0f27597ec739238f3301979571d5d4cabeba7d7667df13d5c18aeab3b18e448f90854c1b3c32d6cfb080ad" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-common" version="2.1.0">
+         <artifact name="lifecycle-common-2.1.0.pom">
+            <sha512 value="0687c36c80dd95da29b16d4d2bc40e5bd496246071e9c3a2212ca31377f62d751ab54e37f6ffbb10c4314943befcc2e761efc3f9bea86ad7463dc63592b14fcf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.lifecycle" name="lifecycle-common" version="2.3.1">
+         <artifact name="lifecycle-common-2.3.1.module">
+            <sha512 value="4e798df95a08fef11972ea001b6fb5078dd2156c74f199cce26dc810a00684938210fa9052b33ad670d3584a2bb0f7e209e8b08bb325439528512348b4a8dd7e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.lifecycle" name="lifecycle-common" version="2.4.0">
+         <artifact name="lifecycle-common-2.4.0.module">
+            <sha512 value="1f65c41dc22b87a2ba6ad5b4d4e557addc003e3335a1fea0de1ff2f8e6fdadeb78f9f7544f9cf4ea938925f5a7b67c4f929cfd073b8240f9463c45207b156bf7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.lifecycle" name="lifecycle-common" version="2.5.1">
+         <artifact name="lifecycle-common-2.5.1.module">
+            <sha512 value="99a42f1932149b11e0436a20e81b7819d9413b7ee022c5be5f819f3726bc16c7615ac355fe565bf5c8b1d8519d739c4691ab78482a943a210883d54dbacc44b3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-common" version="2.6.1">
          <artifact name="lifecycle-common-2.6.1.jar">
             <sha512 value="0a14c05591e2f13ce875edb53e1d06c492183eedfcd762f512ed6e16f386bfde534009276eab35e260d0b2e47389f8c1fb41e9d389f6472b4b6fe2b270c8729c" origin="Generated by Gradle"/>
@@ -401,6 +421,11 @@
             <sha512 value="468cbd736dff16f00675827ef5679ba49a127972991ff38ce98ee7b01582d2b6ae79f66c3812aecb5e8e3dc6a1c8573e0b4233ab4f5c6a50bc76b7b0aaa42bcd" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-livedata" version="2.1.0">
+         <artifact name="lifecycle-livedata-2.1.0.pom">
+            <sha512 value="8e9ec9b695036432e7f59aa883b9392a4f8cea42034658314f664fdf24f8ea9d7017dc8a46e4870ec576815ecf20de5ee3cd1e4c78676154309484cb0b3bc870" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-livedata" version="2.6.1">
          <artifact name="lifecycle-livedata-2.6.1.aar">
             <sha512 value="fd7d9f2f1dc80383b1b24b600543f5cf4fa9ab6db3ba5c1253bb8aa4551aad99448247299aa8f2eb7335a73321c752986a90acc25b761f96b7a6a6e4fc22f96a" origin="Generated by Gradle"/>
@@ -414,6 +439,11 @@
             <sha512 value="5ad2c1db0a9d0004c56a50f617b1cefc848beb3cadbc3d70f33fc8d29ece6fb8a01a21a10b2f2b9835acdc2850934c88e47987ad322b4ddf478d8d8a57d4ce68" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-livedata-core" version="2.3.1">
+         <artifact name="lifecycle-livedata-core-2.3.1.module">
+            <sha512 value="f187344b8d5ed20a9368b392371350255d5c53dd1b6efbf7faec91915674fd0334e27006685067e7baf596827281f080f416046ca35aee751f7bc5f8a58543be" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-livedata-core" version="2.6.1">
          <artifact name="lifecycle-livedata-core-2.6.1.aar">
             <sha512 value="8f22135d674f653374da4324be539b7911c72fb63fbd797b08c22aea940c8a780765db639130cc47703dd49e4509c7fa11687dd26a320dc350c633d12fb88f27" origin="Generated by Gradle"/>
@@ -422,6 +452,11 @@
             <sha512 value="3a554c8778ace01d6c992089009cf0888a493ffdeb089ac0ea37a1f09c4450396c325706bc4e0defa3a262f22372a3b860aeb1ce6544d8e402fbbbec93a1b471" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-livedata-core-ktx" version="2.3.1">
+         <artifact name="lifecycle-livedata-core-ktx-2.3.1.module">
+            <sha512 value="bd42ad99f0246cd33ef33229e2b3418bedeafe67ef59532a0c87f75908d11405dbb87b42b1f54ad2627e5f8e07192ceeb0780213a06204733eb16ec015ab218c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-livedata-core-ktx" version="2.6.1">
          <artifact name="lifecycle-livedata-core-ktx-2.6.1.aar">
             <sha512 value="6d1bf65522a4dfaf27da7eb3162f4495c481dff2ff13c36b5e797631b6b7e00aafc966c27213e80324961950f95771e60d45cc9ac5a3bd3baaa02bf3c0546b26" origin="Generated by Gradle"/>
@@ -430,6 +465,11 @@
             <sha512 value="2ad362d871378e9bea2b7f50ae880fab6d30576e2845a4d64f696a54bda2438e73d711965f22e9a1c22fc40c11183ba1b7a362f746090bfa509ba9d3c1c7808d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-process" version="2.4.1">
+         <artifact name="lifecycle-process-2.4.1.module">
+            <sha512 value="f4ac107bb96ae1ea834744f825eeae9d84c596c560b28b3905d478bdb450b098f994431b8a580e50c5e5dc111e208c909612c0a7d309dbfeb869e9c89b825bb5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-process" version="2.6.1">
          <artifact name="lifecycle-process-2.6.1.aar">
             <sha512 value="7c20ff3ee56d3e1d30c533b23a14d02793d440fa1d2b7bd84e35ff90068116fe8b5d7bb73e3f10dba311a3a14ecd4abf9fb3c8d63ac6602ec60eeb630df70563" origin="Generated by Gradle"/>
@@ -443,6 +483,11 @@
             <sha512 value="dd19564bc42288512a7ff2cc0d8b8dbb6e59ff26e4a02f32e6f7118f833f075c69df01ecd3f1646b9796c0edabdd71f4a947e2e1797feedaf82ea1fa5208d737" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-runtime" version="2.3.1">
+         <artifact name="lifecycle-runtime-2.3.1.module">
+            <sha512 value="a8535ba2441a71623b982081c47395fd6dfac649a15275b8d70e0424183616bd91f410b0ac5bc34f98ed9e363b8f2dcd59bcccfeebeff910ff3c529b16ecc126" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-runtime" version="2.5.1">
          <artifact name="lifecycle-runtime-2.5.1.module">
             <sha512 value="a5945aa15574a09832cf0032f4880d877d8b8ff674de759a84e027bbffd5e887ad2112b2c11dbb762c8d28e7759e2f0c9bac270b82e2990aa3edf5e3ed1a11c3" origin="Generated by Gradle"/>
@@ -456,6 +501,11 @@
             <sha512 value="d977356007c3a264bb869922dcdf25c03c23227c4d876c64148ad65853792150693e30dbd6b052b84e8c44ea100e97705521c7a663a643a9b547640c14f9b49c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-runtime-ktx" version="2.5.1">
+         <artifact name="lifecycle-runtime-ktx-2.5.1.module">
+            <sha512 value="05e18a9b10627c2af655c2493dffa6ccf0d06283f3c0c77a10fa5e9e74b3097a8917e29384136e9a05b11cfb287a1e75a035978767c5ee01703f6e1e1c60df98" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-runtime-ktx" version="2.6.1">
          <artifact name="lifecycle-runtime-ktx-2.6.1.aar">
             <sha512 value="f0b53fa1ce84ddd56eaef082455f1f06deacd3e602085b9faba0d95e795baf7b1007e6726f8f3e71a65355e11eaebac9a6c8359f7c2fad044da51696076ded15" origin="Generated by Gradle"/>
@@ -464,6 +514,11 @@
             <sha512 value="2afa26f167dc14910e4c6c376eea9d9122f575c6221f3c14e403800c13bc96c28204299e7545157bd4eff15981a29f72fcf13086f28a8e3df08b49ec8c4db2fa" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.3.1">
+         <artifact name="lifecycle-viewmodel-2.3.1.module">
+            <sha512 value="49648a66104759e2740303567882a4cd7e1e37dfc4b281acef90483789fbea73b25cb4e2f4b1a0c85fa28b49a571e83230977ba6e6723bc31a3c905a32dffbbc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.5.1">
          <artifact name="lifecycle-viewmodel-2.5.1.module">
             <sha512 value="43f89934867aa566c02c42a0614dd6efdbdd182b9f514a010bff25e5db3f1e47e1d7d472b4281b7abd504bd0341fc5caca6e15b11bd7482e167f49a10381bdeb" origin="Generated by Gradle"/>
@@ -477,6 +532,16 @@
             <sha512 value="f69ebd7ef6f55d1b834d74efdf9ff36307bf825b0ac7b216926d8cf9691cbdf476aa18f861a73761d87e2b9f36f2b8f3b3ed1d5b78b0f1100df8d92f61209728" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel-ktx" version="2.3.1">
+         <artifact name="lifecycle-viewmodel-ktx-2.3.1.module">
+            <sha512 value="b5c4a26eb95235b84c78e4af8741bda77528bcc417a402a155227ea3521703ce115b9899c92c02b03bd72786d33962e139078344792fc255995fe89c1d61c0c8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel-ktx" version="2.5.1">
+         <artifact name="lifecycle-viewmodel-ktx-2.5.1.module">
+            <sha512 value="7fc3d975166180077a46662a16efe03de574ddff463ba0a0d34d0feb9e701ee47ed9afc3ea96918a20879bee6771a105fe150b0a393a862834a9bfaa6f4b65cd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-viewmodel-ktx" version="2.6.1">
          <artifact name="lifecycle-viewmodel-ktx-2.6.1.aar">
             <sha512 value="1a6dc42daacf9954856fcd15f436a05ab308a53991fe2dde7beaa5b5d7feb63d5c0a0768ccfbdde1edca32077ef5dc5a3543ba3ea21ea6ed7099e649f4bd5dd4" origin="Generated by Gradle"/>
@@ -485,6 +550,16 @@
             <sha512 value="5c733d219cc3221a92b0698bf4619dbe639411439c8ef4835c90b65d168e0dd301a690e25e59895e38bef6b2913da3009441ea44c9514bdf799ba7ea3382c8a2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel-savedstate" version="2.3.1">
+         <artifact name="lifecycle-viewmodel-savedstate-2.3.1.module">
+            <sha512 value="ca470374c680acc4dda37084b403ed02d52e129f2484075c55b796874576b328695670efb2a1dbbe0384ee3150756a56eae7e232309d9e141cacfcbfbcb7233f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel-savedstate" version="2.5.1">
+         <artifact name="lifecycle-viewmodel-savedstate-2.5.1.module">
+            <sha512 value="5ccfa98b7627c66afe3d3b892c7ffac37999ba2fd0730115d55feba8640d89c5ce806af8bf1858eed37e887171f7613d81c5231d1b42f85a7a3c889a57f1b662" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-viewmodel-savedstate" version="2.6.1">
          <artifact name="lifecycle-viewmodel-savedstate-2.6.1.aar">
             <sha512 value="6cefe9ad510a5d43412fe9a9ce5c0e6ebffa3086e31094675e389aeea285053a98f3516244ea92509c2724b848e3041ffa0c5d7cff4fc67e906165d417744195" origin="Generated by Gradle"/>
@@ -2359,6 +2434,11 @@
             <sha512 value="a3e69e3b8416e71842921d439a45bce30bd00043e17923b5071a298c79f4914b1cb1faa8daa779cbc234b576aa54a3de4d816c2bd7e4c2712a119c357027c2b9" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-android" version="1.5.2">
+         <artifact name="kotlinx-coroutines-android-1.5.2.module">
+            <sha512 value="4e8ff2590dc74100f384b6efdafe711272289e7380af399e263c6ca05b3c27ba35328ad3744e021b21950856ef9cd4d2c911defd4e79c3c27e6d673a623c3e84" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-android" version="1.6.4">
          <artifact name="kotlinx-coroutines-android-1.6.4.jar">
             <sha512 value="c8be5d3720d5a38fb58a98813229378c8830c75ef677460a8fa59413bc257955b75243e7094e9e55947550386f281bf346d9e460192be143ab209aef2698b11b" origin="Generated by Gradle"/>