diff --git a/app/build.gradle b/app/build.gradle
index 5ef71c06c..781f53ffd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -578,7 +578,7 @@ dependencies {
     implementation libs.rxjava3.rxkotlin
     implementation libs.rxdogtag
 
-    androidTestUtil 'androidx.test:orchestrator:1.4.1'
+    androidTestUtil testLibs.androidx.test.orchestrator
 }
 
 def getLastCommitTimestamp() {
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragmentTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragmentTest.kt
index be7c6deb5..bd8115de7 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragmentTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragmentTest.kt
@@ -25,14 +25,19 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
+import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.testing.Put
 import org.thoughtcrime.securesms.testing.RxTestSchedulerRule
 import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.thoughtcrime.securesms.testing.SignalDatabaseRule
+import org.thoughtcrime.securesms.testing.assertIs
 import org.thoughtcrime.securesms.testing.assertIsNotNull
 import org.thoughtcrime.securesms.testing.assertIsNull
 import org.thoughtcrime.securesms.testing.success
 import org.whispersystems.signalservice.internal.push.ReserveUsernameResponse
+import java.util.Optional
 import java.util.concurrent.TimeUnit
 
 @RunWith(AndroidJUnit4::class)
diff --git a/contacts/app/build.gradle b/contacts/app/build.gradle
index bcd392831..2548e9fdc 100644
--- a/contacts/app/build.gradle
+++ b/contacts/app/build.gradle
@@ -37,8 +37,7 @@ ktlint {
 dependencies {
     coreLibraryDesugaring libs.android.tools.desugar
 
-    implementation "androidx.activity:activity-ktx:1.2.2"
-
+    implementation libs.androidx.activity.ktx
     implementation libs.androidx.appcompat
     implementation libs.material.material
     implementation libs.androidx.constraintlayout
diff --git a/dependencies.gradle b/dependencies.gradle
index e95a446de..36aa2452d 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -43,6 +43,7 @@ dependencyResolutionManagement {
             alias('androidx-navigation-fragment-ktx').to('androidx.navigation', 'navigation-fragment-ktx').versionRef('androidx-navigation')
             alias('androidx-navigation-ui-ktx').to('androidx.navigation', 'navigation-ui-ktx').versionRef('androidx-navigation')
             alias('androidx-lifecycle-viewmodel-ktx').to('androidx.lifecycle', 'lifecycle-viewmodel-ktx').versionRef('androidx-lifecycle')
+            alias('androidx-lifecycle-livedata-core').to('androidx.lifecycle', 'lifecycle-livedata').versionRef('androidx-lifecycle')
             alias('androidx-lifecycle-livedata-ktx').to('androidx.lifecycle', 'lifecycle-livedata-ktx').versionRef('androidx-lifecycle')
             alias('androidx-lifecycle-process').to('androidx.lifecycle', 'lifecycle-process').versionRef('androidx-lifecycle')
             alias('androidx-lifecycle-viewmodel-savedstate').to('androidx.lifecycle', 'lifecycle-viewmodel-savedstate').versionRef('androidx-lifecycle')
@@ -72,6 +73,7 @@ dependencyResolutionManagement {
             alias('google-zxing-core').to('com.google.zxing:core:3.4.1')
             alias('google-ez-vcard').to('com.googlecode.ez-vcard:ez-vcard:0.9.11')
             alias('google-jsr305').to('com.google.code.findbugs:jsr305:3.0.2')
+            alias('google-guava-android').to('com.google.guava:guava:30.0-android')
 
             // Exoplayer
             alias('exoplayer-core').to('com.google.android.exoplayer', 'exoplayer-core').versionRef('exoplayer')
@@ -123,6 +125,10 @@ dependencyResolutionManagement {
             alias('lottie').to('com.airbnb.android:lottie:3.6.0')
             alias('stickyheadergrid').to('com.codewaves.stickyheadergrid:stickyheadergrid:0.9.4')
             alias('dnsjava').to('dnsjava:dnsjava:2.1.9')
+            alias('nanohttpd-webserver').to('org.nanohttpd:nanohttpd-webserver:2.3.1')
+
+            // Can't use the newest version because it hits some weird NoClassDefFoundException
+            alias('jknack-handlebars').to('com.github.jknack:handlebars:4.0.7')
 
             // Mp4Parser
             alias('mp4parser-isoparser').to('org.mp4parser', 'isoparser').versionRef('mp4parser')
@@ -141,6 +147,7 @@ dependencyResolutionManagement {
             alias('androidx-test-core-ktx').to('androidx.test', 'core-ktx').versionRef('androidx-test')
             alias('androidx-test-ext-junit').to('androidx.test.ext', 'junit').versionRef('androidx-test-ext-junit')
             alias('androidx-test-ext-junit-ktx').to('androidx.test.ext', 'junit-ktx').versionRef('androidx-test-ext-junit')
+            alias('androidx-test-orchestrator').to('androidx.test:orchestrator:1.4.1')
             alias('espresso-core').to('androidx.test.espresso:espresso-core:3.4.0')
             alias('mockito-core').to('org.mockito:mockito-inline:4.6.1')
             alias('mockito-kotlin').to('org.mockito.kotlin:mockito-kotlin:4.0.0')
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index bd1b265fc..37ae8a6f9 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -20,16 +20,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
       </trusted-artifacts>
    </configuration>
    <components>
-      <component group="androidx.activity" name="activity" version="1.0.0">
-         <artifact name="activity-1.0.0.aar">
-            <sha256 value="d1bc9842455c2e534415d88c44df4d52413b478db9093a1ba36324f705f44c3d" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.activity" name="activity" version="1.2.2">
-         <artifact name="activity-1.2.2.module">
-            <sha256 value="b7730754793e2fa510ddb10b7514e65f8706e4ec4b100acf7e4215f0bd5519b4" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.activity" name="activity" version="1.5.1">
          <artifact name="activity-1.5.1.aar">
             <sha256 value="4b04b42d2c1f81c02faf0f7b6e9cc9fede10fdee8f66136cd4b99f88e8f48c0f" origin="Generated by Gradle"/>
@@ -38,14 +28,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="c4317fb95ce2716b88f1f4a5334795efda084097a3f2447ffccb10a412c85be4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.activity" name="activity-ktx" version="1.2.2">
-         <artifact name="activity-ktx-1.2.2.aar">
-            <sha256 value="9829e13d6a6b045b03b21a330512e091dc76eb5b3ded0d88d1ab0509cf84a50e" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="activity-ktx-1.2.2.module">
-            <sha256 value="92f4431091650b5a67cc4f654bd9b822c585cf4262180912f075779f07a04ba6" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.activity" name="activity-ktx" version="1.5.1">
          <artifact name="activity-ktx-1.5.1.aar">
             <sha256 value="fd69a5ccb99244cb7c5224580a58e23238d10ed4086199a33e9bfc31c4e4834f" origin="Generated by Gradle"/>
@@ -54,24 +36,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="890eb6f3aa3d119236b4c96ec6b1beb647c296a4d99ca7e4a500a164a95ca2cb" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.annotation" name="annotation" version="1.0.0">
-         <artifact name="annotation-1.0.0.jar">
-            <sha256 value="0baae9755f7caf52aa80cd04324b91ba93af55d4d1d17dcc9a7b53d99ef7c016" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.annotation" name="annotation" version="1.1.0">
-         <artifact name="annotation-1.1.0.jar">
-            <sha256 value="d38d63edb30f1467818d50aaf05f8a692dea8b31392a049bfa991b159ad5b692" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.annotation" name="annotation" version="1.2.0">
-         <artifact name="annotation-1.2.0.jar">
-            <sha256 value="9029262bddce116e6d02be499e4afdba21f24c239087b76b3b57d7e98b490a36" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="annotation-1.2.0.module">
-            <sha256 value="2efcab81ef91b211bacd206eaacd995a51f633a2e96b57a8fc00144c5f9c56b3" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.annotation" name="annotation" version="1.3.0">
          <artifact name="annotation-1.3.0.jar">
             <sha256 value="97dc45afefe3a1e421da42b8b6e9f90491477c45fc6178203e3a5e8a05ee8553" origin="Generated by Gradle"/>
@@ -88,11 +52,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="c1e04cf467714b7789d517c958233a20826f474a3825aa9b77296a22ff7b7dd7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.annotation" name="annotation-experimental" version="1.0.0">
-         <artifact name="annotation-experimental-1.0.0.aar">
-            <sha256 value="b219d2b568e7e4ba534e09f8c2fd242343df6ccbdfbbe938846f5d740e6b0b11" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.annotation" name="annotation-experimental" version="1.1.0">
          <artifact name="annotation-experimental-1.1.0.aar">
             <sha256 value="0157de61a2064047896a058080f3fd67ba57ad9a94857b3f7a363660243e3f90" origin="Generated by Gradle"/>
@@ -101,14 +60,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="0361d1526a4d7501255e19779e09e93cdbd07fee0e2f5c50b7a137432d510119" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.appcompat" name="appcompat" version="1.2.0">
-         <artifact name="appcompat-1.2.0.aar">
-            <sha256 value="3d2131a55a61a777322e2126e0018011efa6339e53b44153eb651b16020cca70" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="appcompat-1.2.0.module">
-            <sha256 value="2670902fc6c26047c42e0f60ee34656fa071841db370de958198413b5ab58fc3" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.appcompat" name="appcompat" version="1.5.1">
          <artifact name="appcompat-1.5.1.aar">
             <sha256 value="50f2c7756e28a7da648bd4551ee3b31e0b71863a6bf591f0ca978428219c5eab" origin="Generated by Gradle"/>
@@ -117,14 +68,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="8c8e88ccafb55c142ea2ac0669fd4db8e7190a853d73fcc429a5c012ceacddf2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.appcompat" name="appcompat-resources" version="1.2.0">
-         <artifact name="appcompat-resources-1.2.0.aar">
-            <sha256 value="c470297c03ff3de1c3d15dacf0be0cae63abc10b52f021dd07ae28daa3100fe5" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="appcompat-resources-1.2.0.module">
-            <sha256 value="75d9865bc6b0f779043b4f6523a944bd2ccb7526f5c1f5ef24624ac78dec3bd3" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.appcompat" name="appcompat-resources" version="1.5.1">
          <artifact name="appcompat-resources-1.5.1.aar">
             <sha256 value="6cfa9caae1869ffe03da9ec3ebf47ad84d70a7185ee86ec63aa8289cbb457e67" origin="Generated by Gradle"/>
@@ -248,21 +191,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="9ca19f5448709301c7563488ef941be9dfa55c83538ca7a059b2113e83527b46" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.coordinatorlayout" name="coordinatorlayout" version="1.0.0">
-         <artifact name="coordinatorlayout-1.0.0.aar">
-            <sha256 value="e508c695489493374d942bf7b4ee02abf7571d25aac4c622e57d6cd5cd29eb73" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.coordinatorlayout" name="coordinatorlayout" version="1.1.0">
          <artifact name="coordinatorlayout-1.1.0.aar">
             <sha256 value="44a9e30abf56af1025c52a0af506fee9c4131aa55efda52f9fd9451211c5e8cb" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.core" name="core" version="1.2.0">
-         <artifact name="core-1.2.0.aar">
-            <sha256 value="524b8b88ceb6a74a7e44e6b567a135660f211799904cb218bfee5be1166820b2" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.core" name="core" version="1.5.0">
          <artifact name="core-1.5.0.aar">
             <sha256 value="2b279712795689069cfb63e48b3ab63c32a5649bdda44c482eb8f81ca1a72161" origin="Generated by Gradle"/>
@@ -271,16 +204,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="e3877fa529fe29177f34a26e0790ed35544848b0c7503bfed30b2539f1686d65" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.core" name="core" version="1.6.0">
-         <artifact name="core-1.6.0.module">
-            <sha256 value="8348e2b5c0c7e283370b85037cec8b32b4acab8d73a7a53235a372446b1387c8" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.core" name="core" version="1.7.0">
-         <artifact name="core-1.7.0.module">
-            <sha256 value="988f820899d5a4982e5c878ca1cd417970ace332ea2ff72f5be19b233fa0e788" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.core" name="core" version="1.8.0">
          <artifact name="core-1.8.0.aar">
             <sha256 value="48c64a15ec3eb11bfb33339e5ceb70ec7f821bd2dfa2eb8675ebd5353317e792" origin="Generated by Gradle"/>
@@ -289,11 +212,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="505f1838869611519d65ec7feb650e88856e3682e37e42a2a24b73e655a98d74" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.core" name="core-ktx" version="1.1.0">
-         <artifact name="core-ktx-1.1.0.aar">
-            <sha256 value="070cc5f8864f449128a2f4b25ca5b67aa3adca3ee1bd611e2eaf1a18fad83178" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.core" name="core-ktx" version="1.2.0">
          <artifact name="core-ktx-1.2.0.aar">
             <sha256 value="dcb74d510d552b35eff73b0dd27b829649535f3902e5b5a1f26040383c10a940" origin="Generated by Gradle"/>
@@ -335,64 +253,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="01f76ab043770a97b054046f9815717b82ce0355c02967d16c61981359dc189a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.databinding" name="databinding-common" version="7.0.3">
-         <artifact name="databinding-common-7.0.3.jar">
-            <sha256 value="0b0a59e3d09c6c5722ce61b6195972e2bc51cb959ac4c2bce54f519ca194f667" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="databinding-common-7.0.3.module">
-            <sha256 value="fc99b6dcc52eee4c5793bd595a224640affce1292ee7b9ee46dae2f8efd5f1e9" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.databinding" name="databinding-common" version="7.0.4">
-         <artifact name="databinding-common-7.0.4.jar">
-            <sha256 value="7f5d3e8c1a8b3339a88580d65bcd0b39166f818e1fd00c903787159aa010aced" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="databinding-common-7.0.4.module">
-            <sha256 value="f515eb1a115763f5b6fc187c551d86ffb8e3984c07d7cd82414afd20a6c90e24" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.databinding" name="databinding-common" version="7.2.2">
          <artifact name="databinding-common-7.2.2.jar">
             <sha256 value="852e465a49271dbc7f6abfbe367368aeb6d3130a1faaf9617ccb9de6118d1ca2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.databinding" name="databinding-compiler-common" version="7.0.3">
-         <artifact name="databinding-compiler-common-7.0.3.jar">
-            <sha256 value="ef28ebb99b5d425c182e210f07fe3677d96039217e5ab8f5df046836aa1c572f" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="databinding-compiler-common-7.0.3.module">
-            <sha256 value="6a23cc88e91663e6303cf4356d3ad57b9c220107dfff44af571a9fb185b39e75" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.databinding" name="databinding-compiler-common" version="7.0.4">
-         <artifact name="databinding-compiler-common-7.0.4.jar">
-            <sha256 value="6895602a25dbc3c8e5359c01b8e8e3e002d2140fd0181d12e9445b94976068e4" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="databinding-compiler-common-7.0.4.module">
-            <sha256 value="ce24bd56e057cb1e10664bbed7f0bef17f9bca1ecdaeaaff1a9f0f15600711a1" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.databinding" name="databinding-compiler-common" version="7.2.2">
          <artifact name="databinding-compiler-common-7.2.2.jar">
             <sha256 value="e1d31640e73f06e529c8f03dc074e2da70496d3ac188d8cbc8fdb6036dd1f607" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.databinding" name="viewbinding" version="7.0.3">
-         <artifact name="viewbinding-7.0.3.aar">
-            <sha256 value="b58b61f7bb379a1491e0686af44ec692df77c3d19a3f9fd4250873d7a56c892a" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="viewbinding-7.0.3.module">
-            <sha256 value="615ba2996eec4163c918cc1a61301dcd927e677e8f9cc0b3792a650018cb803b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.databinding" name="viewbinding" version="7.0.4">
-         <artifact name="viewbinding-7.0.4.aar">
-            <sha256 value="fdfa1be0e0f784f4a7751e0a197431293b10da4dc479aebdea5710203d6994bb" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="viewbinding-7.0.4.module">
-            <sha256 value="394da170a64781c54be83d812d951d9b357b14867f3686b5d57a01d974b1e4cd" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.databinding" name="viewbinding" version="7.2.2">
          <artifact name="viewbinding-7.2.2.aar">
             <sha256 value="84edc51571d02791e262b3acf9927a44b51c47de66ce6d8cd6d126311cb6784f" origin="Generated by Gradle"/>
@@ -458,32 +328,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="44d1e007ccced0a102cb955e5cdc6e94156fdfabf45db586f47b666f33031da1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.fragment" name="fragment" version="1.0.0">
-         <artifact name="fragment-1.0.0.aar">
-            <sha256 value="65dd32d71fe65a32e77989a6cfb1ad09307038927f82a740c7611162d0b518f8" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.fragment" name="fragment" version="1.1.0">
-         <artifact name="fragment-1.1.0.aar">
-            <sha256 value="a14c8b8f2153f128e800fbd266a6beab1c283982a29ec570d2cc05d307d81496" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.fragment" name="fragment" version="1.3.1">
-         <artifact name="fragment-1.3.1.aar">
-            <sha256 value="51c99df6c4961126f7b2ef14452e5b36e87904b267df90921ffa7578ae6998e1" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="fragment-1.3.1.module">
-            <sha256 value="f7b07632a0e21994a66a6dfb291a4f5ae55c2699827ff45df071168560509c9b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.fragment" name="fragment" version="1.3.2">
-         <artifact name="fragment-1.3.2.aar">
-            <sha256 value="299879e2ce39d35214391db4ef2d7257a801f9b7fbe76488cc64897d16a98b25" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="fragment-1.3.2.module">
-            <sha256 value="769e3922eb5500d2e10786f99abd3cf75a24d754f1dfcdad47d8f297b973bcc1" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.fragment" name="fragment" version="1.3.6">
          <artifact name="fragment-1.3.6.aar">
             <sha256 value="12f0831b4f08092d5dda272c1923c11a022ff20ceffed3e801751e21bb8d1c1e" origin="Generated by Gradle"/>
@@ -556,27 +400,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="7bad7a188804adea6fa1f35d5ef99b705f20bd93ecadde484760ff86b535fefc" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-common" version="2.1.0">
-         <artifact name="lifecycle-common-2.1.0.jar">
-            <sha256 value="76db6be533bd730fb361c2feb12a2c26d9952824746847da82601ef81f082643" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.lifecycle" name="lifecycle-common" version="2.3.0">
-         <artifact name="lifecycle-common-2.3.0.jar">
-            <sha256 value="15848fb56db32f4c7cdc72b324003183d52a4884d6bf09be708ac7f587d139b5" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="lifecycle-common-2.3.0.module">
-            <sha256 value="47bfb037959169dde7eedc6294d83ad061724e4dae27c03a4836e392d5ad5ba7" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.lifecycle" name="lifecycle-common" version="2.3.1">
-         <artifact name="lifecycle-common-2.3.1.jar">
-            <sha256 value="15848fb56db32f4c7cdc72b324003183d52a4884d6bf09be708ac7f587d139b5" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="lifecycle-common-2.3.1.module">
-            <sha256 value="5fb7c8514d8c56cada5e29ef89dc0289e71942ab4cb0b2e6dca137b9dcb8fdd4" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.lifecycle" name="lifecycle-common" version="2.5.1">
          <artifact name="lifecycle-common-2.5.1.jar">
             <sha256 value="20ad1520f625cf455e6afd7290988306d3a9886efa993e0860fbabf4bb3f7bda" origin="Generated by Gradle"/>
@@ -598,14 +421,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="c82609ced8c498f0a701a30fb6771bb7480860daee84d82e0a81ee86edf7ba39" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-livedata" version="2.3.1">
-         <artifact name="lifecycle-livedata-2.3.1.aar">
-            <sha256 value="b1e061139126f883d4010f23fe7ba460adea432d453c88a00b868cbf9ac037ce" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="lifecycle-livedata-2.3.1.module">
-            <sha256 value="93494e78d5049dff897fde50f477e7b965e9a3de4a1ed453b5f0cbc409eb4e4c" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.lifecycle" name="lifecycle-livedata" version="2.5.1">
          <artifact name="lifecycle-livedata-2.5.1.aar">
             <sha256 value="8ad18cf18a8f82d77b11aab49cf9b9b3d418e5f564b216e91d815cf038cefdfb" origin="Generated by Gradle"/>
@@ -619,14 +434,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="fde334ec7e22744c0f5bfe7caf1a84c9d717327044400577bdf9bd921ec4f7bc" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-livedata-core" version="2.3.0">
-         <artifact name="lifecycle-livedata-core-2.3.0.aar">
-            <sha256 value="89f480888f2bb8eb62d9b7b1eb34be69b59ec84b24a1b0bdbeb49973478c6da3" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="lifecycle-livedata-core-2.3.0.module">
-            <sha256 value="1db780dc703f46140f87c8c6ad856e3d7bbd3ec1312dfdbb6467083913fe333b" 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.aar">
             <sha256 value="e55d38c372460f0a03997ddc950c67227511340fd74f8634d99d29653cd81ab1" origin="Generated by Gradle"/>
@@ -659,11 +466,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="1cedc0f971979cdec31f1542f263a8d41df6cfffc4857ea73a7d85643b73486d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-process" version="2.2.0">
-         <artifact name="lifecycle-process-2.2.0.aar">
-            <sha256 value="3a977e7778fc8418742d388409daaba7ea8fea8823d21ffb96e4c4236f715070" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.lifecycle" name="lifecycle-process" version="2.4.1">
          <artifact name="lifecycle-process-2.4.1.aar">
             <sha256 value="db649b3efa24e31052145310b002db91da346b3f89c093ec38c3046db45e794e" origin="Generated by Gradle"/>
@@ -680,14 +482,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="4363f8e0f37436b6599beaf893874c827f987e2a3d9636c221e80066f4774f3f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-reactivestreams" version="2.3.1">
-         <artifact name="lifecycle-reactivestreams-2.3.1.aar">
-            <sha256 value="a5600258465fe03a96a5d6891e08cbb5bd8ce8d9af89ed54af9d3d8ccf801bdc" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="lifecycle-reactivestreams-2.3.1.module">
-            <sha256 value="469904b4954f0aef2abc71935e33edb3702c0b9be85f019d7b9c1c423b1f5a73" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.lifecycle" name="lifecycle-reactivestreams" version="2.5.1">
          <artifact name="lifecycle-reactivestreams-2.5.1.aar">
             <sha256 value="39c09b99ed45a532f43e64bd6fffdf31f8ba89bab162a7a49595d2a4b2e9f436" origin="Generated by Gradle"/>
@@ -696,14 +490,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="bdc4f25d5e2bd69cde23e2f0c191f3fc92d1430e0c04315d4a31386d9ff359bb" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-reactivestreams-ktx" version="2.3.1">
-         <artifact name="lifecycle-reactivestreams-ktx-2.3.1.aar">
-            <sha256 value="55daac9050fb8ed601c46dcc05096dcc3ea8d2e463a92dbb9e1a875db9ef3066" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="lifecycle-reactivestreams-ktx-2.3.1.module">
-            <sha256 value="db80b8ae072a6e53585da40f79f1f8ea986029486a60614d552a7a8f08228f23" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.lifecycle" name="lifecycle-reactivestreams-ktx" version="2.5.1">
          <artifact name="lifecycle-reactivestreams-ktx-2.5.1.aar">
             <sha256 value="33ace4ac0718e51ce24e9419e4578b0743be88c469f68d7813f734437ea216b4" origin="Generated by Gradle"/>
@@ -717,19 +503,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="e4afc9e636183f6f3e0edf1cf46121a492ffd2c673075bb07f55c7a99dd43cfb" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-runtime" version="2.1.0">
-         <artifact name="lifecycle-runtime-2.1.0.aar">
-            <sha256 value="e5173897b965e870651e83d9d5af1742d3f532d58863223a390ce3a194c8312b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.lifecycle" name="lifecycle-runtime" version="2.3.0">
-         <artifact name="lifecycle-runtime-2.3.0.aar">
-            <sha256 value="94f528fd5fb123f75b6e65d07a6ef5cd6c0e69ac604d106aaa12705282456234" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="lifecycle-runtime-2.3.0.module">
-            <sha256 value="01f17f2bc714167f2cc1e66ccf74cbced329fd5be884872c786be69616ca5aad" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.lifecycle" name="lifecycle-runtime" version="2.3.1">
          <artifact name="lifecycle-runtime-2.3.1.aar">
             <sha256 value="dd294f4a689c71ff877fd41f3b67a3a62f7760d44ce420e6130f1fc3569d8f00" origin="Generated by Gradle"/>
@@ -772,19 +545,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="d6460aea1b6bad80ab14cf88297e9e43bfde8d87c3e5c28f2c508233ffbcc062" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.1.0">
-         <artifact name="lifecycle-viewmodel-2.1.0.aar">
-            <sha256 value="ba55fb7ac1b2828d5327cda8acf7085d990b2b4c43ef336caa67686249b8523d" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.3.0">
-         <artifact name="lifecycle-viewmodel-2.3.0.aar">
-            <sha256 value="cea8f26fa232037922b69af9cd1bde2df1211acc8b75253e425b7150a5fca59d" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="lifecycle-viewmodel-2.3.0.module">
-            <sha256 value="feeb5ec453c20d8c1900b0849d2066edc8a41532ce0088d641c4a886bae57a08" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.3.1">
          <artifact name="lifecycle-viewmodel-2.3.1.aar">
             <sha256 value="b6db4c274a12ff85a4747e1e6669c7e98aefa2571ace9d1f1a6fa6be417ce838" origin="Generated by Gradle"/>
@@ -817,14 +577,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="e292838f93ba9df0ec8331659bd116ff8fbe7dce48c1482b3f1b0e887c1e3d6d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-viewmodel-savedstate" version="2.3.0">
-         <artifact name="lifecycle-viewmodel-savedstate-2.3.0.aar">
-            <sha256 value="49f9532b5104cc1ee64900ed4f696d031d807fba726e0d5d6a52459e8fba4a1d" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="lifecycle-viewmodel-savedstate-2.3.0.module">
-            <sha256 value="aaebeb10e23b2ca35346e767aead804254a9889623873fc5cab2041dc931ad9c" 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.aar">
             <sha256 value="97137a8af6a31776a14e4866ab808c7c0a791b484bdbc788bbd83e66407564c0" origin="Generated by Gradle"/>
@@ -851,14 +603,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="e71c328ceef5c4a7d76f2d86df1b65d65fe2acf868b1a4efd84a3f34336186d8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.media" name="media" version="1.3.1">
-         <artifact name="media-1.3.1.aar">
-            <sha256 value="24c6ca0c281b27dec054a09ae584028266683274ca8f53b230470ff404a7d3f4" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="media-1.3.1.module">
-            <sha256 value="b33e9774c6079652153496218d8b60c2becf76609e1dd899b3c5784a6de4fa7f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.media" name="media" version="1.4.3">
          <artifact name="media-1.4.3.aar">
             <sha256 value="89a83d648dafeb5160a76dcdf996735d746f410c115166cf15693b5208d73d95" origin="Generated by Gradle"/>
@@ -930,14 +674,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="d4186b87776ea8705961e436c5cdbfc811d21b8c5486bc6b5172f35646356c42" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.navigation" name="navigation-safe-args-generator" version="2.3.5">
-         <artifact name="navigation-safe-args-generator-2.3.5.jar">
-            <sha256 value="a78c4bea31b89a5b92cd2578589f0ece2c36c83babdc6478f7d621643265bdd0" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="navigation-safe-args-generator-2.3.5.module">
-            <sha256 value="06d6bc8ff911ebe24115f7f6d7eea455af957c2c973192cba291854cecc27689" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.navigation" name="navigation-safe-args-generator" version="2.5.2">
          <artifact name="navigation-safe-args-generator-2.5.2.jar">
             <sha256 value="7f576c31920eec76fde59e1c1db77e3ec18d542f72cb839c3c1c0442c743252f" origin="Generated by Gradle"/>
@@ -946,14 +682,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="a5c861609669f34bc726f84d45afb33d407bc6f1bae470d6df59792205a2878d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.navigation" name="navigation-safe-args-gradle-plugin" version="2.3.5">
-         <artifact name="navigation-safe-args-gradle-plugin-2.3.5.jar">
-            <sha256 value="249f5f2e829fa27a3af50c957d8a9e635d8b65fc220d1be9e80ad769d56e19b2" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="navigation-safe-args-gradle-plugin-2.3.5.module">
-            <sha256 value="d5afcdceec23b23c313746eb9ca696d4ca48f1bfd0e953e0d4926660b592fc97" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.navigation" name="navigation-safe-args-gradle-plugin" version="2.5.2">
          <artifact name="navigation-safe-args-gradle-plugin-2.5.2.jar">
             <sha256 value="12181b07b9f8541aea07561beb11641658b47440dab9b088cd4dd03c4381a375" origin="Generated by Gradle"/>
@@ -1009,19 +737,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="352a11a8d8a4c1bd6cd2c2fefff9c94ca954d7b5202a0656959db95297f6a2b7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.savedstate" name="savedstate" version="1.0.0">
-         <artifact name="savedstate-1.0.0.aar">
-            <sha256 value="2510a5619c37579c9ce1a04574faaf323cd0ffe2fc4e20fa8f8f01e5bb402e83" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.savedstate" name="savedstate" version="1.1.0">
-         <artifact name="savedstate-1.1.0.aar">
-            <sha256 value="d60bbe44c2c08083a17c5dc678a6d6b4d0a2d664858016ab5c049cbea90a63b7" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="savedstate-1.1.0.module">
-            <sha256 value="6eea2bc150828c8fcba777e93037038e2ee3ec441c43d6acecf2c5cd9ddc5374" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.savedstate" name="savedstate" version="1.2.0">
          <artifact name="savedstate-1.2.0.aar">
             <sha256 value="2de528d6898e95ef020d22d9ffdf9d1f77cbdd93f92d39dfaa5d5c43b0c311c8" origin="Generated by Gradle"/>
@@ -1030,14 +745,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="4247c23308abcb5d0ff8cdaf7dfd583f3c2a1016f68d13f1a41c21600b6fafd7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.savedstate" name="savedstate-ktx" version="1.1.0">
-         <artifact name="savedstate-ktx-1.1.0.aar">
-            <sha256 value="e44d61347463b0fafeeb649cbcc3d7109b2eb5e11d1522e986105170cdebbf68" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="savedstate-ktx-1.1.0.module">
-            <sha256 value="0ffb42dfad618f906268f75b83e4c37daf8f2529e6ff34106e194d173b573e83" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.savedstate" name="savedstate-ktx" version="1.2.0">
          <artifact name="savedstate-ktx-1.2.0.aar">
             <sha256 value="43112928d3cbb108801ee11130f303404bc4892cf78908811568195107bba7fe" origin="Generated by Gradle"/>
@@ -1054,11 +761,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="25715ba5648065f810ae38956d30fa9cd778fe34538c7bc4fe6911dba53ef73b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.slidingpanelayout" name="slidingpanelayout" version="1.0.0">
-         <artifact name="slidingpanelayout-1.0.0.aar">
-            <sha256 value="76bffb7cefbf780794d8817002dad1562f3e27c0a9f746d62401c8edb30aeede" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.slidingpanelayout" name="slidingpanelayout" version="1.2.0">
          <artifact name="slidingpanelayout-1.2.0.aar">
             <sha256 value="5f53339be2a4f90a9abea3571dd59e70a8a49e7f15dd82974a3898b4652e8714" origin="Generated by Gradle"/>
@@ -1090,11 +792,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="9761b3a809c9b093fd06a3c4bbc645756dec0e95b5c9da419bc9f2a3f3026e8d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.test" name="core" version="1.3.0">
-         <artifact name="core-1.3.0.aar">
-            <sha256 value="86549cae8c5b848f817e2c716e174c7dab61caf0b4df9848680eeb753089a337" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.test" name="core" version="1.4.0">
          <artifact name="core-1.4.0.aar">
             <sha256 value="671284e62e393f16ceae1a99a3a9a07bf1aacda29f8fe7b6b884355ef34c09cf" origin="Generated by Gradle"/>
@@ -1105,11 +802,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="e4f9ca2b8f700cc278d878ed3925730e1ad5d60135bbfd05ab6708a528ebfa58" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.test" name="monitor" version="1.3.0">
-         <artifact name="monitor-1.3.0.aar">
-            <sha256 value="f73a31306a783e63150c60c49e140dc38da39a1b7947690f4b73387b5ebad77e" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.test" name="monitor" version="1.4.0">
          <artifact name="monitor-1.4.0.aar">
             <sha256 value="46a912a1e175f27a97521af3f50e5af87c22c49275dd2c57c043740012806325" origin="Generated by Gradle"/>
@@ -1186,11 +878,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="76da2c502371d9c38054df5e2b248d00da87809ed058f3363eae87ce5e2403f8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.versionedparcelable" name="versionedparcelable" version="1.1.0">
-         <artifact name="versionedparcelable-1.1.0.aar">
-            <sha256 value="9a1d77140ac222b7866b5054ee7d159bc1800987ed2d46dd6afdd145abb710c1" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.versionedparcelable" name="versionedparcelable" version="1.1.1">
          <artifact name="versionedparcelable-1.1.1.aar">
             <sha256 value="57e8d93260d18d5b9007c9eed3c64ad159de90c8609ebfc74a347cbd514535a4" origin="Generated by Gradle"/>
@@ -1282,89 +969,26 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="243a64470fda0e86a6fddeb0af4c7aa9426ce84e68cbfe18d75ee5da4b7e0b92" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android" name="signflinger" version="7.0.3">
-         <artifact name="signflinger-7.0.3.jar">
-            <sha256 value="903a4536db3e96b4e1e1dc1e400eb0b91bf7866d9b39cd7ec94d75dde158f152" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="signflinger-7.0.3.module">
-            <sha256 value="a22fd2603eef9ed9d5ce706c89c28376704716b36804a99437740257607003d7" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android" name="signflinger" version="7.0.4">
-         <artifact name="signflinger-7.0.4.jar">
-            <sha256 value="cbd7521394564969fb04146da85eaee125394d47a5e12bd5a8145dbcfd91a57d" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="signflinger-7.0.4.module">
-            <sha256 value="908eecafb48fa056a1fcb62da4ee4130773bb54a489c2d38b31a4a09c355a374" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android" name="signflinger" version="7.2.2">
          <artifact name="signflinger-7.2.2.jar">
             <sha256 value="1fc1397976b690a9da0f2b2cc0378fc30b8e389fab658074fe6bceaa8b971ae7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android" name="zipflinger" version="7.0.4">
-         <artifact name="zipflinger-7.0.4.jar">
-            <sha256 value="a23657cc9675d9b607d419dfcddf0b85b6ec9d2728a5d1604001716d3e8ff203" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="zipflinger-7.0.4.module">
-            <sha256 value="fd2fc9f4b55ec0eae2be547f307ef7d0345cc236ab9035be858ddbb1dd23f667" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android" name="zipflinger" version="7.2.2">
          <artifact name="zipflinger-7.2.2.jar">
             <sha256 value="07207f161e936cd972432d4a09f378836b701e49dc30162e9f51c41f8755d28c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.databinding" name="baseLibrary" version="7.0.3">
-         <artifact name="baseLibrary-7.0.3.module">
-            <sha256 value="6d7539a6ae29bd6f21ad50da86ab9427c69e5cae9075b5324584d9372aa73191" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.databinding" name="baseLibrary" version="7.0.4">
-         <artifact name="baseLibrary-7.0.4.jar">
-            <sha256 value="ad80c2c96a65e5990a52daa610f12e13388faa8424c93b10c2aae9cc5c3260cd" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="baseLibrary-7.0.4.module">
-            <sha256 value="6578fea71da02a6fd736570b33ba20774cb7206bf393700d6d89c1ff88554eda" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.databinding" name="baseLibrary" version="7.2.2">
          <artifact name="baseLibrary-7.2.2.jar">
             <sha256 value="b9900577d2219784492414d361303eee4b14971ae52e2d7a8bd67a33c1636f95" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="annotations" version="26.6.3">
-         <artifact name="annotations-26.6.3.jar">
-            <sha256 value="9bb9e1aef699819309fb30ab9094d7beb04fb09da184ddabc14ca3ec21c7f14a" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools" name="annotations" version="30.0.4">
-         <artifact name="annotations-30.0.4.jar">
-            <sha256 value="df132b4daa2bb73770cd459c4c6b9b927695dd8a89592ab149ecdb7e0d8506ed" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="annotations-30.0.4.module">
-            <sha256 value="d5ef55a059aba65f6054837175027285d239b9ea3db511ee82e5b206c785061c" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools" name="annotations" version="30.2.2">
          <artifact name="annotations-30.2.2.jar">
             <sha256 value="630ab4c6f211fa1c0f5c884152cb6311360f1b796442196c287a658645a99645" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="common" version="26.6.3">
-         <artifact name="common-26.6.3.jar">
-            <sha256 value="030b1eb5371dce1729eba49d132e52e75f85225ffb60e2fabaaebfe97470a506" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools" name="common" version="30.0.4">
-         <artifact name="common-30.0.4.jar">
-            <sha256 value="d1aa2b6a43843c385ddd246fb0118acf45afad5317edb3c508a4604a288fa9c9" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="common-30.0.4.module">
-            <sha256 value="d1cbbf0146874a79e7f6b66dee4a4047693fe7ce014779be3e56dc283620d9c6" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools" name="common" version="30.2.2">
          <artifact name="common-30.2.2.jar">
             <sha256 value="ba5774b1a04fc11e2dc363ed2e27013ed7cbeabe696d3bdaba36629c996d3d53" origin="Generated by Gradle"/>
@@ -1380,219 +1004,46 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="4ed1e921fd0ffcfeef2f10ce248f7725b139f593d4bc3549bf694b2e4d3f73a5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="dvlib" version="26.6.3">
-         <artifact name="dvlib-26.6.3.jar">
-            <sha256 value="a4b01099bd144943889e806e0e02eaaea802df6291294e8b6f1f7405c983f151" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools" name="dvlib" version="30.0.3">
-         <artifact name="dvlib-30.0.3.jar">
-            <sha256 value="5affafcec390041e5afd64cb924153f5e474db47ee8ccc2f555b495083141233" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="dvlib-30.0.3.module">
-            <sha256 value="096da9332d4c9eea1fc2df792c1e288d821572da87dcd2d5c63ecb06e5157884" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools" name="dvlib" version="30.0.4">
-         <artifact name="dvlib-30.0.4.jar">
-            <sha256 value="61edccccecc1ffca47f442326bd7c1d73f7256ef9adaac834c1d639a142e49b9" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="dvlib-30.0.4.module">
-            <sha256 value="cef6a5043a5f43f5c5245e317d92e184c0bc1f22ee459caff9e9971890545ba4" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools" name="dvlib" version="30.2.2">
          <artifact name="dvlib-30.2.2.jar">
             <sha256 value="8f1fa014b70baac7fc4019d7b788280dabadced747cef41e52f4d0c603e7e0b8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="r8" version="3.3.28">
-         <artifact name="r8-3.3.28.jar">
-            <sha256 value="8626ca32fb47aba7fddd2c897615e2e8ffcdb4d4b213572a2aefb3f838f01972" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools" name="r8" version="3.3.75">
          <artifact name="r8-3.3.75.jar">
             <sha256 value="92104f8584add622a08347d95ae27623ef48bfbda6f6c6093e9b8efcc14b883d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="repository" version="26.6.3">
-         <artifact name="repository-26.6.3.jar">
-            <sha256 value="83d7a8aadf6899d3345b03a615da086455d6e38dd0c42c7121bc6bc3cec957a8" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools" name="repository" version="30.0.3">
-         <artifact name="repository-30.0.3.jar">
-            <sha256 value="0a40c6f16c506903ce2c609affd8228aceda73a69d93dfa42d4f02b8491449f6" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="repository-30.0.3.module">
-            <sha256 value="4213434637fde3ed952c8f8f4bc091e8253122d45421a462ef6b5cc1fecc6a46" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools" name="repository" version="30.0.4">
-         <artifact name="repository-30.0.4.jar">
-            <sha256 value="ff77dda7a094a6b2ae5d631ecaca59c26c0673f59b1e5f874352c17e92eb9a1f" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="repository-30.0.4.module">
-            <sha256 value="5263de3eaefa516706cc3fa01fd32b3ec73a758ae938077de2fd8345df8ffd5e" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools" name="repository" version="30.2.2">
          <artifact name="repository-30.2.2.jar">
             <sha256 value="90bbccdd17c95d0cb66771102d750f159b03f8bb36d8ddef99cdd1e03864b1c6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="sdk-common" version="26.6.3">
-         <artifact name="sdk-common-26.6.3.jar">
-            <sha256 value="618a00d8d1c081b87879a7721181f02073058a24aeb57718c63074fc9250e234" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools" name="sdk-common" version="30.0.3">
-         <artifact name="sdk-common-30.0.3.jar">
-            <sha256 value="b45570a380360236ffee0f6bb593d66b673bad3834dfe0d6c9871fa7188ee0eb" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="sdk-common-30.0.3.module">
-            <sha256 value="c04c6220fc887b87e01a6d5cc82486e464c40b6d3cce037e69a01cfba6df9f46" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools" name="sdk-common" version="30.0.4">
-         <artifact name="sdk-common-30.0.4.jar">
-            <sha256 value="b4617630f9c9cc8ad80f1aab980cc560d8f76bd26e84421ea54f38e036b3be48" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="sdk-common-30.0.4.module">
-            <sha256 value="560d4beb819686278082a04b93ca0dd23f35c89dbd48b4e94c33d00f5faaa4c5" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools" name="sdk-common" version="30.2.2">
          <artifact name="sdk-common-30.2.2.jar">
             <sha256 value="f95c9e1c9f78d34e32629408646ebc4c7f3134242e9efa6baf16c13cb5bd43d3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="sdklib" version="26.6.3">
-         <artifact name="sdklib-26.6.3.jar">
-            <sha256 value="7481fb2a2071d64fdb7b11adfc309a434959711223f74c88e82db6ca8f4f2d76" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools" name="sdklib" version="30.0.3">
-         <artifact name="sdklib-30.0.3.jar">
-            <sha256 value="7088f20a414fab170a21e457825e14ebe099f753558e02c8acc12c67eb412162" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="sdklib-30.0.3.module">
-            <sha256 value="feb082147031d135d2bbf64981532593aeb9d36d95f6774e617033dcc21ca006" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools" name="sdklib" version="30.0.4">
-         <artifact name="sdklib-30.0.4.jar">
-            <sha256 value="bcfe68d2ec02569f40978c9380a3302d60f67772c0dea95838f817f5cf3505a8" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="sdklib-30.0.4.module">
-            <sha256 value="c9ffbe53c6f80e1e7e09ce3c2068ea8c3de324a11acc5cea478c41b94250e408" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools" name="sdklib" version="30.2.2">
          <artifact name="sdklib-30.2.2.jar">
             <sha256 value="6a205529e07c7831d2b60bbfc56b82c0e354c8628f5a111bffb7c5f2b930a11c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="testutils" version="26.6.3">
-         <artifact name="testutils-26.6.3.jar">
-            <sha256 value="2a616d777091dee88a6176dd9ad63596ce8c2fa2fd6e4dee6f695145d93b6ba0" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.analytics-library" name="crash" version="30.0.3">
-         <artifact name="crash-30.0.3.jar">
-            <sha256 value="126170ab20b70ca4826ef0767085dfbb9a33daa7a845663528a2ae535c94a766" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="crash-30.0.3.module">
-            <sha256 value="7232c21ac9d7b66a6b50eecf0830b61d946fc89dd7402fa25e63086ffcb20ba6" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.analytics-library" name="crash" version="30.0.4">
-         <artifact name="crash-30.0.4.jar">
-            <sha256 value="2adf06e2bb21afaa8a1dea187ed93e599d982ae05c369c96f896ce495c6ba71c" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="crash-30.0.4.module">
-            <sha256 value="cffb3c987467835280d02f45883877fcecd14d32a625f182857f3c347928e05f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.analytics-library" name="crash" version="30.2.2">
          <artifact name="crash-30.2.2.jar">
             <sha256 value="6da2ea2b538246846560d8bf1d32517040c297edefa0dcfdc22b4a9a954f31ed" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="protos" version="26.6.3">
-         <artifact name="protos-26.6.3.jar">
-            <sha256 value="1fa53be76dce0bb8ed5539caa20486580aeb42aa11aa7a4530c8715af44b3b31" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.analytics-library" name="protos" version="30.0.3">
-         <artifact name="protos-30.0.3.jar">
-            <sha256 value="f62b89dcd9de719c6a7b7e15fb1dd20e45b57222e675cf633607bd0ed6bca7e7" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="protos-30.0.3.module">
-            <sha256 value="c0498541a77efa15e1d829bf49147f7f023a04db5761198705b6abe3017d4833" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.analytics-library" name="protos" version="30.0.4">
-         <artifact name="protos-30.0.4.jar">
-            <sha256 value="c1f0270c758f61db311d1365af2eaab46318c0ecde1d15aed6c20d5b32ed3ade" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="protos-30.0.4.module">
-            <sha256 value="d827711bc72ee86a176ffa23fd4a54b108eab3b33eba9d50435264578f14eb05" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.analytics-library" name="protos" version="30.2.2">
          <artifact name="protos-30.2.2.jar">
             <sha256 value="feb293a4d175a24ce7f98d7f783670d81dab61260cf9bbd3d748e94f95e38892" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="shared" version="26.6.3">
-         <artifact name="shared-26.6.3.jar">
-            <sha256 value="65a1a685fec4546b5b1633abcdeca969cb3752bfcf3080ccfeb5f62b63809249" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.analytics-library" name="shared" version="30.0.3">
-         <artifact name="shared-30.0.3.jar">
-            <sha256 value="05aa9ba3cc890354108521fdf99802565aae5dd6ca44a6ac8bb8d594d1c1cd15" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="shared-30.0.3.module">
-            <sha256 value="cc0bc71bb2384145d844e73d535cfe0ce6b4cc211354f1bddc324fe13a196ece" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.analytics-library" name="shared" version="30.0.4">
-         <artifact name="shared-30.0.4.jar">
-            <sha256 value="91cada37f5035b5d313cce64fde2a3c3a3f58b267edb80b0e3e94372e3bcf2d1" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="shared-30.0.4.module">
-            <sha256 value="10eac198d59f94da5d20cc5242e8e963ab46a2e2a1f400a44eaf2b82690533da" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.analytics-library" name="shared" version="30.2.2">
          <artifact name="shared-30.2.2.jar">
             <sha256 value="2512bf78dc8969b0206841ce996369b5a72d490c42e5c8410c3a62b455b0929b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="tracker" version="26.6.3">
-         <artifact name="tracker-26.6.3.jar">
-            <sha256 value="87cc8e882caac7973dd97cd24c88f2105bf28612513199869918a2b4ff3e5b4a" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.analytics-library" name="tracker" version="30.0.3">
-         <artifact name="tracker-30.0.3.jar">
-            <sha256 value="5d0ef35bf6733e96210b5085a2a202152921bf834d345959dce1ca3369b528df" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="tracker-30.0.3.module">
-            <sha256 value="a5fbd2f421a803c170e12ebe7b1c2efbd5807727e9a4dfcaaaedb4ddfeb0bd40" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.analytics-library" name="tracker" version="30.0.4">
-         <artifact name="tracker-30.0.4.jar">
-            <sha256 value="c5aa6aa1996320d53fc254a5b96c9a13299885af7d438a877c9f9ae7004be534" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="tracker-30.0.4.module">
-            <sha256 value="c287d090368cfedd5d49bdb407ad2d52414f1abce766a6bfa31d599aaf760585" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.analytics-library" name="tracker" version="30.2.2">
          <artifact name="tracker-30.2.2.jar">
             <sha256 value="3a961cd6b0c9445b47c18d0516b534bdf094f93151197896f480f8798697c729" origin="Generated by Gradle"/>
@@ -1609,11 +1060,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="40d46913757ee6ed94f80b4d201cbd769e78d456bc7bebddf617df0e69fa31b0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="aapt2-proto" version="0.4.0">
-         <artifact name="aapt2-proto-0.4.0.jar">
-            <sha256 value="fac0435e08898f89eeeb9ca236bea707155ff816c12205ced285ad53604133ca" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.build" name="aapt2-proto" version="4.1.0-alpha01-6193524">
          <artifact name="aapt2-proto-4.1.0-alpha01-6193524.jar">
             <sha256 value="17e75523e1e92dd4f222c7368ee41df9e964a508232f591e265d0c499baf9dca" origin="Generated by Gradle"/>
@@ -1627,22 +1073,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="22b5d69296c06b99261c2b5485994af1e6e7e02beb6a8d213ce88dae76660755" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="aapt2-proto" version="7.0.3-7396180">
-         <artifact name="aapt2-proto-7.0.3-7396180.jar">
-            <sha256 value="269b9f783576b901afeedc72af910a1346ae02861ccec1394ac7ed9e2e4dc0fa" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="aapt2-proto-7.0.3-7396180.module">
-            <sha256 value="06ca4e66c53725b6fd50a7f4b117adb23a20db88d68733e017eb833ad0e0263e" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="aapt2-proto" version="7.0.4-7396180">
-         <artifact name="aapt2-proto-7.0.4-7396180.jar">
-            <sha256 value="271ffe7537923904637d4c9e9b53e9ddcbe39b5bd7bec824a740004be7ae9a89" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="aapt2-proto-7.0.4-7396180.module">
-            <sha256 value="b19ab91f2e371dfb63773ad0332910ad2596294d718ba7b640857d874fe7e508" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.build" name="aapt2-proto" version="7.2.2-7984345">
          <artifact name="aapt2-proto-7.2.2-7984345.jar">
             <sha256 value="dc903852c4a8ea7e0655200e59caa6a8b88274c1ae382ffc1e337c07b0805be4" origin="Generated by Gradle"/>
@@ -1651,22 +1081,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="db2e14ad1077b226bee91a9a9c41e8afe338ca2e54b6a030fe924c840824f584" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="aaptcompiler" version="7.0.3">
-         <artifact name="aaptcompiler-7.0.3.jar">
-            <sha256 value="3cea0aa31ef7ccbe427441c45f789ed7033498103e68eea6b20d35cf68ce7c10" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="aaptcompiler-7.0.3.module">
-            <sha256 value="021c09dde2aac7bfebbed3721533778395726792109fba2ed4c76edceb94b372" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="aaptcompiler" version="7.0.4">
-         <artifact name="aaptcompiler-7.0.4.jar">
-            <sha256 value="e1081a44c19d32d2396c73e7f8e92cfe156d965f08ed292df02b871a7fd74611" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="aaptcompiler-7.0.4.module">
-            <sha256 value="08a3583ea8c916a1ddfca9706188181baa08550b87c943f9ba2e0737d5d241f5" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.build" name="aaptcompiler" version="7.2.2">
          <artifact name="aaptcompiler-7.2.2.jar">
             <sha256 value="2708b280d0022d208c36fde3fc314b532bc3c050cfb2e72f9d045907489b578a" origin="Generated by Gradle"/>
@@ -1675,64 +1089,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="230c11c6af21737f21740f2546a83ea2883141a705b5c564393392d51074af96" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="apksig" version="7.0.3">
-         <artifact name="apksig-7.0.3.jar">
-            <sha256 value="012337a2803c9a30dfc41dcbc6450686ee9e5f582549f7f126479f743a343ec9" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="apksig-7.0.3.module">
-            <sha256 value="2d9ab4eb62f5510e9a0c0e257c8147ca38d377cc2ea2eff344f77ee92f8ed525" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="apksig" version="7.0.4">
-         <artifact name="apksig-7.0.4.jar">
-            <sha256 value="b3d4dc274f17d84bef3636bd4b47c1a75a95d954408ac7f8d93e5eb4a7edcb99" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="apksig-7.0.4.module">
-            <sha256 value="0b87cdfdbcf6ed9a42174868d496bc88139d38865e3723e215f313a04d181141" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.build" name="apksig" version="7.2.2">
          <artifact name="apksig-7.2.2.jar">
             <sha256 value="417be4b7bd7e94f0327377c42e40bced99325cae60834101019960275748a02f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="apkzlib" version="7.0.3">
-         <artifact name="apkzlib-7.0.3.jar">
-            <sha256 value="b31e53174c92db83c5cc6e7dac6734ea4e907a72e452c2bf1818dfd082c59397" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="apkzlib-7.0.3.module">
-            <sha256 value="c6e3da4224715e14252d6704ed22e2b906483b643de67242ad290502b33ac825" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="apkzlib" version="7.0.4">
-         <artifact name="apkzlib-7.0.4.jar">
-            <sha256 value="5dddda0c5f8728d3bf3be30313261176e75a0c295e8e8cf4b9a5ed2aa1ac0933" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="apkzlib-7.0.4.module">
-            <sha256 value="45f9c720a8fbd4cf91f1776f4acf347eccd3d2b90e648e278819b4cff2e5be9d" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.build" name="apkzlib" version="7.2.2">
          <artifact name="apkzlib-7.2.2.jar">
             <sha256 value="c705d8061b04e914cf75a6d289ee044e895cb1fd2a5c9af343bc8c119aca6de2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="builder" version="7.0.3">
-         <artifact name="builder-7.0.3.jar">
-            <sha256 value="c6952da0094b094c2ba0fe84c675622097c5d9b9f9beb53485b860320540cf1d" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="builder-7.0.3.module">
-            <sha256 value="ffbc1e1b1833c642991f9fb0893123d81c5512fac9f0c67be07cbc305cfab587" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="builder" version="7.0.4">
-         <artifact name="builder-7.0.4.jar">
-            <sha256 value="26332cfc9540694f8904bf5240eb52edab66820cccd617f212c6e6df14259397" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="builder-7.0.4.module">
-            <sha256 value="7c4b7a9d787089869e145b672cfcd56be9f393d2b30dc8e2a1e472fb9d8887e0" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.build" name="builder" version="7.2.2">
          <artifact name="builder-7.2.2.jar">
             <sha256 value="f4c1ae6db2aa4b2dc021db5659c71f6af81157a2975a59da78e811b8b509f1af" origin="Generated by Gradle"/>
@@ -1741,27 +1107,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="71d2f0a1591ad6617909ac2936ecdee3e2efe76c6f9f272c32c2a64fa72f8a2f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="builder-model" version="3.6.3">
-         <artifact name="builder-model-3.6.3.jar">
-            <sha256 value="c6ced852668de036f6f67990473cbd093314f758d607c59061622abe8372590c" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="builder-model" version="7.0.3">
-         <artifact name="builder-model-7.0.3.jar">
-            <sha256 value="483f99d7494a5bed027e1e8d29111384cf535d4842f0be5a79805bd44bb68d4e" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="builder-model-7.0.3.module">
-            <sha256 value="d9e0ec37768015af9385e911523afa08c11b72839e6a08b13dbd7165136bdd56" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="builder-model" version="7.0.4">
-         <artifact name="builder-model-7.0.4.jar">
-            <sha256 value="6ab2f2371f2bcd48a3a623613d0bc00838b5bfb4e6c4e49e324ebcf88f7feb0e" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="builder-model-7.0.4.module">
-            <sha256 value="9a2bbb84bafc8a3ce7494b11d2afa6253d60453894ea9c9ecf6e082776217422" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.build" name="builder-model" version="7.2.2">
          <artifact name="builder-model-7.2.2.jar">
             <sha256 value="2022a6eeff0c61f33828ab686dce947b638d04495902436c021fb5b3bb7e6338" origin="Generated by Gradle"/>
@@ -1770,27 +1115,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="b75e23136a6c751d459adc85966b56b7fb568aa3b4e7c86bd11e09ebd93549af" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="builder-test-api" version="3.6.3">
-         <artifact name="builder-test-api-3.6.3.jar">
-            <sha256 value="d2451b4bc7182135ebcb8110364c2db3cb6af16ce4c828e8ef3b68cf569a0324" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="builder-test-api" version="7.0.3">
-         <artifact name="builder-test-api-7.0.3.jar">
-            <sha256 value="f6de4bc2cef545e8367bf82d7c733829c7be3b0b3b8b09fd8c58f2150e59ab46" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="builder-test-api-7.0.3.module">
-            <sha256 value="5f26f4c9b5d28b905c94fbefe57635ad9c5cd53e86c381df9047bcae1d1e9d78" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="builder-test-api" version="7.0.4">
-         <artifact name="builder-test-api-7.0.4.jar">
-            <sha256 value="cfcf933229e368231a96b79b1ec394d7cbcf822eaf8a3ba44c92ba52d959c90e" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="builder-test-api-7.0.4.module">
-            <sha256 value="ec5fc2e2668382f1cc478b1a180b5e540f8c3c5d0c394f6ef87d5b01b890241c" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.build" name="builder-test-api" version="7.2.2">
          <artifact name="builder-test-api-7.2.2.jar">
             <sha256 value="666ef0e31788df8a00eec2a6d4b978a6269b70b3eaa225ea7ba2bf72687b74e9" origin="Generated by Gradle"/>
@@ -1799,32 +1123,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="2494e39a5767ef580c4290418c6b0800e0f2f9b9bfbd7ee67715fb21dc64299f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="bundletool" version="1.6.0">
-         <artifact name="bundletool-1.6.0.jar">
-            <sha256 value="4e168c9fd5ab86b2553f43fd40891cb70b98f4f0f53fd51552d713079044de64" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.build" name="bundletool" version="1.8.2">
          <artifact name="bundletool-1.8.2.jar">
             <sha256 value="2aad0561cdef3fe286107dff00f4e8c028a451a6c168fb2dd302db763afd4fcc" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="gradle" version="7.0.3">
-         <artifact name="gradle-7.0.3.jar">
-            <sha256 value="7d619007481eb476fbc76d86c9feb5f683a836ea6ca3cbdb52f82286a30aba36" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="gradle-7.0.3.module">
-            <sha256 value="8ba1fc18ffff505b635af55b3f26f4b5aa292acd026fa4d7d3f806df14c973db" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="gradle" version="7.0.4">
-         <artifact name="gradle-7.0.4.jar">
-            <sha256 value="c1c83d2dfad94667fbf4eba02593c1151c64adf4a2c77bb97060908eab604f16" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="gradle-7.0.4.module">
-            <sha256 value="525d2950b2837eff329935b7f8a5276406839e788ef927e076e0049fbc1d4ade" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.build" name="gradle" version="7.2.2">
          <artifact name="gradle-7.2.2.jar">
             <sha256 value="b4f53d3a3ca08d826e5f98b0de70d904b0907dd6acfa8b00a666d5044ce86b3c" origin="Generated by Gradle"/>
@@ -1833,22 +1136,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="93217bf9726e1c7f74163d76106d3c773656471cfeb8ea1b30d052310530a0cb" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="gradle-api" version="7.0.3">
-         <artifact name="gradle-api-7.0.3.jar">
-            <sha256 value="ebe10a58f43035bbcf18c2ab3d8c15a9b27bbd1af5ba83a147ae87ff07045c73" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="gradle-api-7.0.3.module">
-            <sha256 value="8e8cf8f7b3391c9ba00b59a14ed67496f2220ed4e6c4384bfb477b2cf9de6c02" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="gradle-api" version="7.0.4">
-         <artifact name="gradle-api-7.0.4.jar">
-            <sha256 value="057f2d38cdb359f3c9c82ec4eb686e9a9fe509ca6b4a0a5f99565ece1acd887f" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="gradle-api-7.0.4.module">
-            <sha256 value="6e341bd9a15d104b5aed38adf404ba2e38a9715faae23c41b7d7b09597f06f5e" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.build" name="gradle-api" version="7.2.2">
          <artifact name="gradle-api-7.2.2.jar">
             <sha256 value="94e5b786e74e731a23d221f109292a9dcbf3d8ca5d4a7cf2065b418759ae110d" origin="Generated by Gradle"/>
@@ -1857,27 +1144,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="0edef73d4d3e5c8679e4b8fd762b0bb732ec56257d5f8a931563cec97cd5b54f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="manifest-merger" version="26.6.3">
-         <artifact name="manifest-merger-26.6.3.jar">
-            <sha256 value="9481685044f456699de67a896ddc0ad38e7eb68838a764936680a4d55bfeb19c" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="manifest-merger" version="30.0.3">
-         <artifact name="manifest-merger-30.0.3.jar">
-            <sha256 value="72b346ba6318b4b6260e6e49df4bea5da2e12329ab6c2beb2269c49a9f51f178" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="manifest-merger-30.0.3.module">
-            <sha256 value="7a38ea6d1ae6a5af3fa9bdd5adf291405429624a95e0ccf5661d21d4dd31e243" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="manifest-merger" version="30.0.4">
-         <artifact name="manifest-merger-30.0.4.jar">
-            <sha256 value="44339ed30995742f96147891356135210599c96a0a00a62d81465ce2b8ec1f98" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="manifest-merger-30.0.4.module">
-            <sha256 value="1f1db45ea4ad18fcdfe7b4a72a929a25b4e357ec857d570986215633004cfa3d" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.build" name="manifest-merger" version="30.2.2">
          <artifact name="manifest-merger-30.2.2.jar">
             <sha256 value="4518ba42b1890acdfec41cf7ea30212042f33bbeb682f62aa0be06148b69eede" origin="Generated by Gradle"/>
@@ -1901,51 +1167,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="1838f9ee70120e64f45612ca071972ac83ddc118185abffbce3932a4710325eb" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.ddms" name="ddmlib" version="26.6.3">
-         <artifact name="ddmlib-26.6.3.jar">
-            <sha256 value="effa191b23e01d6e96c61eb2d051cea65e4da75d8c17113a90d001fbd7e7a798" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.ddms" name="ddmlib" version="30.0.3">
-         <artifact name="ddmlib-30.0.3.jar">
-            <sha256 value="7a914a68ab93393657297234e2f37b22410ae9a433cba692ce8c727c9607e3bb" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="ddmlib-30.0.3.module">
-            <sha256 value="f60261f01222bd14fe7bafcf9295f4a426831ab83de048484cc96375bb72ef9f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.ddms" name="ddmlib" version="30.0.4">
-         <artifact name="ddmlib-30.0.4.jar">
-            <sha256 value="7f706a995f5b3047d80e28b4edb584b2338b7b47b9629ed1607011f39c17e14c" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="ddmlib-30.0.4.module">
-            <sha256 value="709f09457b788f7723f0951ada16387032e70039dc03cd18401c873fc6aa736d" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.ddms" name="ddmlib" version="30.2.2">
          <artifact name="ddmlib-30.2.2.jar">
             <sha256 value="875b9903278121307298476dcfb2f9961323410dd1cddb9370e5a755d06093d6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.external.com-intellij" name="intellij-core" version="26.6.3">
-         <artifact name="intellij-core-26.6.3.jar">
-            <sha256 value="b89d6ced01dabd7ac822e12bb1f1280299571516935e29678f24676a1df1ed12" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.external.com-intellij" name="intellij-core" version="30.0.3">
-         <artifact name="intellij-core-30.0.3.jar">
-            <sha256 value="1ebe858d3f58eeaa8c06507f8ac0f1c7051e6c61f35a70f3c3967d5734d3abc5" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="intellij-core-30.0.3.module">
-            <sha256 value="2a002fefe18ae167532ea793804143ee2c15d6583a4b86016833bbf959587b14" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.external.com-intellij" name="intellij-core" version="30.0.4">
-         <artifact name="intellij-core-30.0.4.jar">
-            <sha256 value="e5577bfe5be2937212012cda8ead120fc2dd96a3427533b4b4aed2c60fe3e8c4" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="intellij-core-30.0.4.module">
-            <sha256 value="0dc83c3777856b078a8ec41de9fb6f67e371758f27832800e056379631b3db01" origin="Generated by Gradle"/>
+      <component group="com.android.tools.emulator" name="proto" version="30.2.2">
+         <artifact name="proto-30.2.2.jar">
+            <sha256 value="cab182760fdd57c575bf058f3e70e82986af7b12e5d655d40d93db99e85b8f29" origin="Generated manually" />
          </artifact>
       </component>
       <component group="com.android.tools.external.com-intellij" name="intellij-core" version="30.2.2">
@@ -1953,209 +1182,46 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="cdec995f5c1a8839b996188fa8e0212b303021a48d4eed9659fcb5a7df92a364" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.external.com-intellij" name="kotlin-compiler" version="26.6.3">
-         <artifact name="kotlin-compiler-26.6.3.jar">
-            <sha256 value="ab05d36d55e7529b1fe42bbcda262f7ab47c9c4faa9ab40d6678b38b34d9b461" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.external.com-intellij" name="kotlin-compiler" version="30.0.3">
-         <artifact name="kotlin-compiler-30.0.3.jar">
-            <sha256 value="ed00e441f427cb4e0d418287b9da30b12b7f735f9af32e6b5d3dc960b6a742fc" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlin-compiler-30.0.3.module">
-            <sha256 value="e218948e78e3844a87234dcafce2fe99702a803518547a6855c795e76daf8e10" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.external.com-intellij" name="kotlin-compiler" version="30.0.4">
-         <artifact name="kotlin-compiler-30.0.4.jar">
-            <sha256 value="5e2456b33e7879442d10c666c2eae756c3e711d087f7b346b1f2035f0c3fc18d" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlin-compiler-30.0.4.module">
-            <sha256 value="6343d6e25816d42993ce461f3a6fb1835f95cf78d372bf4a0a601d29e7d9f0af" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.external.com-intellij" name="kotlin-compiler" version="30.2.2">
          <artifact name="kotlin-compiler-30.2.2.jar">
             <sha256 value="77e23191adbc7d3235ca69540271edb31f30a9bc9a1e6a6ef255d1a577a595ce" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.external.org-jetbrains" name="uast" version="26.6.3">
-         <artifact name="uast-26.6.3.jar">
-            <sha256 value="e2fb91a91f842102e69822eaaac567b93120f0a67b9c6590f188ec01f4e7a8d9" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.external.org-jetbrains" name="uast" version="30.0.3">
-         <artifact name="uast-30.0.3.jar">
-            <sha256 value="a77801bee6ff509910e459525c9c34d7f04b066ade123547f16f1917548eadea" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="uast-30.0.3.module">
-            <sha256 value="70313ff79b09734c997743987849e9ed8d669c4fc7aca8679ede91bbe17809c1" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.external.org-jetbrains" name="uast" version="30.0.4">
-         <artifact name="uast-30.0.4.jar">
-            <sha256 value="72be32fa6463c307ce52abef1317b73bb515e7ff68475ad555cad37b84c1563d" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="uast-30.0.4.module">
-            <sha256 value="57840e2fe6d23a12941a59517c54fd220897b2ad61a365b5c0b8fc3c46d88730" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.external.org-jetbrains" name="uast" version="30.2.2">
          <artifact name="uast-30.2.2.jar">
             <sha256 value="878f5b04ab3550074882b1698d58596a89fbe2b41e0fec0e0c3fd6aeb89b7900" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.layoutlib" name="layoutlib-api" version="26.6.3">
-         <artifact name="layoutlib-api-26.6.3.jar">
-            <sha256 value="9ed6b16194f959e78ca617abfca35a494db4dcbb0e42def0b33f123d5224cd5e" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.layoutlib" name="layoutlib-api" version="30.0.3">
-         <artifact name="layoutlib-api-30.0.3.jar">
-            <sha256 value="4caa87e9ca2e11315f650d576cd59fec1793373bc3fca3f6d53c029e7534e7c4" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="layoutlib-api-30.0.3.module">
-            <sha256 value="c6c4ab05c591d3d34711d9b8e3dcd69b5fe5eabe93bd59c88710c637e0fc344b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.layoutlib" name="layoutlib-api" version="30.0.4">
-         <artifact name="layoutlib-api-30.0.4.jar">
-            <sha256 value="9ba23153dd4aa795313d8b908cd0acd553ec5e2d7b4a5c5944609b6a47a768d4" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="layoutlib-api-30.0.4.module">
-            <sha256 value="eae1d8f4eb700c5da17ea024e76998fdeff50e50bec0328797bec3c39f724e73" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.layoutlib" name="layoutlib-api" version="30.2.2">
          <artifact name="layoutlib-api-30.2.2.jar">
             <sha256 value="2c7d7945ba2f8d4a482d8e8a5e906923350255fb8b275e5dc6fd0a4a6ee09ab7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint" version="26.6.3">
-         <artifact name="lint-26.6.3.jar">
-            <sha256 value="069acbbcc308165788cd13d44e67162de69dc715644d4b26dd913e7cf9438560" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.lint" name="lint" version="30.0.3">
-         <artifact name="lint-30.0.3.jar">
-            <sha256 value="ee4f11001e0c7e3b776e0d67399ad354b19b0f168822ec2b7db47c0910ed227d" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="lint-30.0.3.module">
-            <sha256 value="c705843191f903b381bfe09e95cfe0f8ef9fdfeabc097fa5313f16e04ebddf91" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.lint" name="lint" version="30.0.4">
-         <artifact name="lint-30.0.4.jar">
-            <sha256 value="05633fd15a0ba41c3748d5b2f086da4cbe249e2a598b5a4950dd56ad403ee8ca" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="lint-30.0.4.module">
-            <sha256 value="fb669e63da2037f61ed5186400cfbd8a4b2e3dd0765f17a18f1a4688dc6d69a8" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.lint" name="lint" version="30.2.2">
          <artifact name="lint-30.2.2.jar">
             <sha256 value="0282dd1831bc449b635c98c2a5060572a4366685e34b2955b8b2ab271c5e3570" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-api" version="26.6.3">
-         <artifact name="lint-api-26.6.3.jar">
-            <sha256 value="1902bdbcbad5ec50aa432ffaae7dc2bd0f2e1ce246ce538820a0f094e371780b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.lint" name="lint-api" version="30.0.3">
-         <artifact name="lint-api-30.0.3.jar">
-            <sha256 value="bcecbd2f752a6560096a9029a47d1de6bd788a51bab505c5ebfba6a18524b983" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="lint-api-30.0.3.module">
-            <sha256 value="2ce618ac6219a9719c1d64b1e5322e2f8be40322527683e51965c97f1b26ffa2" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.lint" name="lint-api" version="30.0.4">
-         <artifact name="lint-api-30.0.4.jar">
-            <sha256 value="ebbdcbed4149b8a781262473feaa113166750ca3042735fd9fcd79f8e9103037" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="lint-api-30.0.4.module">
-            <sha256 value="d608cfcb438bb10a558d757683ecc21a48cfcb8178484ec9e95001d309ade2ca" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.lint" name="lint-api" version="30.2.2">
          <artifact name="lint-api-30.2.2.jar">
             <sha256 value="7c76cb21662660fa7ffe79afc44b59bf13ec2cf5e640d40e2c2d3e5a2b0cd4c9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-checks" version="26.6.3">
-         <artifact name="lint-checks-26.6.3.jar">
-            <sha256 value="d6a1eccec58c01f3c8056baa7790221f57b36e34b749e78f5c9d0f4c932144b7" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.lint" name="lint-checks" version="30.0.3">
-         <artifact name="lint-checks-30.0.3.jar">
-            <sha256 value="25a7cd42dc3ad502337f131fb8b7e873c53301db0a67b1c64dd4ae7a8eb66cec" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="lint-checks-30.0.3.module">
-            <sha256 value="4edaa2adabde4fe159c39ab4279ccda7a0516d6b3635b815de8db27682b0e1b1" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.lint" name="lint-checks" version="30.0.4">
-         <artifact name="lint-checks-30.0.4.jar">
-            <sha256 value="7bd817ff4060fdb13750c5a45daccd768b47a1363607da3ee9eceba46c99d569" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="lint-checks-30.0.4.module">
-            <sha256 value="2a0213378b24588938cf0c1fabeb0734b368cbe6dbb60ce39d41e145733921d3" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.lint" name="lint-checks" version="30.2.2">
          <artifact name="lint-checks-30.2.2.jar">
             <sha256 value="c50975fed874d92d95e48123eb68251ce5155f8942f62ee6e772388464c2a4d5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-gradle" version="30.0.3">
-         <artifact name="lint-gradle-30.0.3.jar">
-            <sha256 value="94544d6147a809bf2fd3440e51f28a4e42e547d74aab53eefd74938cdad42c26" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="lint-gradle-30.0.3.module">
-            <sha256 value="af14e74b95bf39823a852e0bf00d1d488ab1959db9af239c043e257e8d3e5d99" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.lint" name="lint-gradle" version="30.0.4">
-         <artifact name="lint-gradle-30.0.4.jar">
-            <sha256 value="d36e8f776f7bcd46a4f609d4aedffe0e364caeb257d25d8b69e7ef487909da02" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="lint-gradle-30.0.4.module">
-            <sha256 value="7645cd335c9ba1af624f18aefdd921bd17facdbab60ba218913fe3c7d2277982" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.lint" name="lint-gradle" version="30.2.2">
          <artifact name="lint-gradle-30.2.2.jar">
             <sha256 value="13d3d5e84eb449d6a8a4def9bda674ebcc0ee4b27327fa8555fafa181bdf7875" origin="Custom"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-model" version="30.0.3">
-         <artifact name="lint-model-30.0.3.jar">
-            <sha256 value="0b940a7f575c2ff5cbd038260f41dde686a93c672213881ead3ce8af3513b396" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="lint-model-30.0.3.module">
-            <sha256 value="85e5c9fe28d413212210ed0740a4cb076712e60d4643875a22d70ce44b4a0394" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.lint" name="lint-model" version="30.0.4">
-         <artifact name="lint-model-30.0.4.jar">
-            <sha256 value="fb7561562b7d3d3edf015c12367f267804a9824083a9e10944daf71473ce9bc5" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="lint-model-30.0.4.module">
-            <sha256 value="55cd6eae16ba0f78ca520e98f206f5b427aeaa8f443f4b3f6ce84e812418231f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.lint" name="lint-model" version="30.2.2">
          <artifact name="lint-model-30.2.2.jar">
             <sha256 value="b7e988df12d6241e8f06f4d353790d01e268e955b2b7b35286d0fa5233e8a045" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-tests" version="26.6.3">
-         <artifact name="lint-tests-26.6.3.jar">
-            <sha256 value="fa1e4f54814526815b7e6b9d7aaf34447c41fcc9379a86bb958e29e6979db63b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.lint" name="lint-tests" version="30.2.2">
          <artifact name="lint-tests-30.2.2.jar">
             <sha256 value="baf519a77ae8f094ad9f7023d58339640bc7cf16d09bdae75b2137ee1ce8c63b" origin="Generated by Gradle"/>
@@ -2166,6 +1232,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="f6854905cfd56c4525eb022fc11648054efa812fa1615964a8ec8c117af392c6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-device-provider-ddmlib" version="30.2.2">
+         <artifact name="android-device-provider-ddmlib-30.2.2.jar">
+            <sha256 value="d5dfb5749b211a89146e95a18483f5b3729048323281f425176ba83f4dba63bd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-device-provider-ddmlib-30.2.2.module">
+            <sha256 value="a14d8608c7d266067829a8f866d11185e66baa085d9574a560296c7a0c6b835f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-device-provider-ddmlib-proto" version="30.2.2">
          <artifact name="android-device-provider-ddmlib-proto-30.2.2.jar">
             <sha256 value="22f0c58716f74bc1ab0f09db7017b291225fdacd729ed9c288a3056061936dd2" origin="Generated by Gradle"/>
@@ -2174,20 +1248,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="15467e68d66c067bd2ff12ee6a26db6854da57531d877c003a04e74b9a9cdb90" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-device-provider-gradle-proto" version="30.0.3">
-         <artifact name="android-device-provider-gradle-proto-30.0.3.jar">
-            <sha256 value="8a63c141a6a1e4d4e1f7000e723879cddc03ffdb1f3ebb966fb939d9e9f06dee" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-device-provider-gradle" version="30.2.2">
+         <artifact name="android-device-provider-gradle-30.2.2.jar">
+            <sha256 value="df7425b586d61d8a49f8804e582da238cadaf495f3cc61b2122549d635dce97d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-device-provider-gradle-proto-30.0.3.module">
-            <sha256 value="544c8cae97ab3fda84add64ea5a842170b7a1dbb577924cd5f8457ec8a265f66" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.utp" name="android-device-provider-gradle-proto" version="30.0.4">
-         <artifact name="android-device-provider-gradle-proto-30.0.4.jar">
-            <sha256 value="e8e81318e285af480d9b5b9ec306cedf307b56cf81bad74923fb83f05c0d72ed" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="android-device-provider-gradle-proto-30.0.4.module">
-            <sha256 value="5120c6e7c0879f338a47265b8cd2b52291ffca18461ee8b7d1c39c176c917585" origin="Generated by Gradle"/>
+         <artifact name="android-device-provider-gradle-30.2.2.module">
+            <sha256 value="ded794aae84ecd9f0204c8ff2fc0129fe6dbb7e4efefc127c836e54d22472fb9" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.tools.utp" name="android-device-provider-gradle-proto" version="30.2.2">
@@ -2198,6 +1264,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="8794185dd016144c4643edc8b60ab8be1cf0bde1e3a65415134aecc9403aa524" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output" version="30.2.2">
+         <artifact name="android-test-plugin-host-additional-test-output-30.2.2.jar">
+            <sha256 value="f2d8ecd58abad30a65dd05ec6cb5b484d20bcb754e7b9d935f616867b54b9664" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-test-plugin-host-additional-test-output-30.2.2.module">
+            <sha256 value="d27309ab7bbfcb78e3664e9ab606551a507a6c98227b19249ed7659732b12b95" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output-proto" version="30.2.2">
          <artifact name="android-test-plugin-host-additional-test-output-proto-30.2.2.jar">
             <sha256 value="c68433063cf8372c3c494c1d6d982bc86902b581904e7bf79fc2bfd658520dd8" origin="Generated by Gradle"/>
@@ -2206,6 +1280,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="3020a300094a1063fea6bf86255a3e261078c80c8978d53e57bd35a93201a86d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage" version="30.2.2">
+         <artifact name="android-test-plugin-host-coverage-30.2.2.jar">
+            <sha256 value="0efc6c4662f061770d2a97d7e50b0d458ae0777d45cc11e29e8bc6ca022927c9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-test-plugin-host-coverage-30.2.2.module">
+            <sha256 value="2dcdd08a7fecd1b2ab0f66d427222a1ed540e3d3cbcfd74909e6dda62ec8f697" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-coverage-proto" version="30.2.2">
          <artifact name="android-test-plugin-host-coverage-proto-30.2.2.jar">
             <sha256 value="00dab33f9b1aa13cb654a45bf47363a157f90a43f54ab3e5dd0aa4a21d3120d8" origin="Generated by Gradle"/>
@@ -2214,20 +1296,36 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="7ed155d9ea78442f8443aea17cebf686248815b61f6f3d8fd75e18133040fc4d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-retention-proto" version="30.0.3">
-         <artifact name="android-test-plugin-host-retention-proto-30.0.3.jar">
-            <sha256 value="cdab897a017a8c219e538d26d9d7cb0a765ac2f3b7962858982adbf3b2cb63a9" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info" version="30.2.2">
+         <artifact name="android-test-plugin-host-device-info-30.2.2.jar">
+            <sha256 value="1ad132515ed4bdb221fb61d586a497ac955daee37397f186bc1bbbfc0dd29433" origin="Generated manually" />
          </artifact>
-         <artifact name="android-test-plugin-host-retention-proto-30.0.3.module">
-            <sha256 value="29515916bfa3dfb0b83c4525bb3763513b0868ee0f5da62896783627893658ee" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-device-info-30.2.2.module">
+            <sha256 value="43d4b4e3b9d56be8eb814d66012067aaa6d6dc8a6354cf3dfd7aee0d6265528a" origin="Generated manually" />
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-retention-proto" version="30.0.4">
-         <artifact name="android-test-plugin-host-retention-proto-30.0.4.jar">
-            <sha256 value="16cd6e076cb3e7111b5fe255e3a22217afea74a0566e6aebf475bd9bc605e82f" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info-proto" version="30.2.2">
+         <artifact name="android-test-plugin-host-device-info-proto-30.2.2.jar">
+            <sha256 value="b7841f4c51d74282281a449460e9effc00afbe1cc474ca0e167f43f22702939e" origin="Generated manually" />
          </artifact>
-         <artifact name="android-test-plugin-host-retention-proto-30.0.4.module">
-            <sha256 value="40d3d8471005a378d148d8f39482cfb0047a882aabb574a057f43707bd23e9a5" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-device-info-proto-30.2.2.module">
+            <sha256 value="65063895657eeb89addd5565c01663525f603fa1a9ed65340802a9b2ab394ad9" origin="Generated manually" />
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat" version="30.2.2">
+         <artifact name="android-test-plugin-host-logcat-30.2.2.jar">
+            <sha256 value="f4c200202bd728500208ce9828e59bedfbda8d7c5c1bf6e50cb3ca32b5466fb8" origin="Generated manually" />
+         </artifact>
+         <artifact name="android-test-plugin-host-logcat-30.2.2.module">
+            <sha256 value="7d0939b4af3dfbf52c6d8705a6df6c2e0ed32a8c90e43ebfefabf8293b947dee" origin="Generated manually" />
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-retention" version="30.2.2">
+         <artifact name="android-test-plugin-host-retention-30.2.2.jar">
+            <sha256 value="0cdc180ccab9c3f29c5b5ab7bcb20647a689b6d59ceea32f7446b2d4e0ed8950" origin="Generated manually" />
+         </artifact>
+         <artifact name="android-test-plugin-host-retention-30.2.2.module">
+            <sha256 value="63e7e7329ef74deabc47e52dc23075831bea65745482335f62978912b0269e7a" origin="Generated manually" />
          </artifact>
       </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-retention-proto" version="30.2.2">
@@ -2238,20 +1336,12 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="ea6d15a95cb3f7c47acd6480d4bb4922c48a0db97c5e699e0d058d53feb35ce3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle-proto" version="30.0.3">
-         <artifact name="android-test-plugin-result-listener-gradle-proto-30.0.3.jar">
-            <sha256 value="4066b56d177f295cecbec99813cf58ab8c5f34c3eff8f97ae93162b0aa7b75e0" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle" version="30.2.2">
+         <artifact name="android-test-plugin-result-listener-gradle-30.2.2.jar">
+            <sha256 value="e8a9b582b35d204d189de48f9b2abffa3233cafdc5b93bc9539cfe04077ec14c" origin="Generated manually" />
          </artifact>
-         <artifact name="android-test-plugin-result-listener-gradle-proto-30.0.3.module">
-            <sha256 value="9d0533829f1a916577a31a991d41b51c1095b8dfdb3cb053f90c73462ebc4561" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle-proto" version="30.0.4">
-         <artifact name="android-test-plugin-result-listener-gradle-proto-30.0.4.jar">
-            <sha256 value="949bfc55d19acf00a3c7d22b22ed67f7383c9aab3fabffdcacfd56d7de352c46" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="android-test-plugin-result-listener-gradle-proto-30.0.4.module">
-            <sha256 value="4a664f89f69750e9f106326313463b369a021c29545b0148918066bbbad72892" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-result-listener-gradle-30.2.2.module">
+            <sha256 value="48df7f4a5da5bf8fcff1690ce49fd8a738e549214b9e4d7204468dfab0fb7baa" origin="Generated manually" />
          </artifact>
       </component>
       <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle-proto" version="30.2.2">
@@ -2267,11 +1357,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="5da6e2e3e0551d61a3ea7014f04312276549e3dd739cf637996e4cf43c5535b9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.beust" name="jcommander" version="1.64">
-         <artifact name="jcommander-1.64.jar">
-            <sha256 value="156be736199c990321d9ff77090b199629cfc9865e2d6c13f7cd291bb1641817" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.beust" name="jcommander" version="1.78">
          <artifact name="jcommander-1.78.jar">
             <sha256 value="7891debb84b5f83e9bd57593ebece3399abbe0fd938cf306b3534c57913b9615" origin="Generated by Gradle"/>
@@ -2523,21 +1608,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="51dc02ad2f8d1d9dff7b5b52c4df2c6c12ef7df55d752e919d5cb4dd6002ecd0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.android.gms" name="play-services-base" version="16.0.1">
-         <artifact name="play-services-base-16.0.1.aar">
-            <sha256 value="aca10c780c3219bc50f3db06734f4ab88badd3113c564c0a3156ff8ff674655b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.google.android.gms" name="play-services-base" version="17.5.0">
          <artifact name="play-services-base-17.5.0.aar">
             <sha256 value="198c9e2115f5ce5f91140cd9b481dc6d64dd634ac2d6c6525567dc5fe00065cb" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.android.gms" name="play-services-basement" version="17.0.0">
-         <artifact name="play-services-basement-17.0.0.aar">
-            <sha256 value="d324a1785bbc48bfe3639fc847cfd3cf43d49e967b5caf2794240a854557a39c" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.google.android.gms" name="play-services-basement" version="17.5.0">
          <artifact name="play-services-basement-17.5.0.aar">
             <sha256 value="362301c0da1c765cbbdcf8ea866b6cb62bc130c86d2aa7cc9e9c18a6e51ea79d" origin="Generated by Gradle"/>
@@ -2553,11 +1628,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="8987c6c303eaaa9c10c403822cf5ae188ee1ce61c3056eb3be2ca4aaecc80b5f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.android.gms" name="play-services-maps" version="16.1.0">
-         <artifact name="play-services-maps-16.1.0.aar">
-            <sha256 value="ff50cae9e4059416202375597d99cdc8ddefd9cea3f1dc2ff53779a3a12eb480" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.google.android.gms" name="play-services-maps" version="17.0.0">
          <artifact name="play-services-maps-17.0.0.aar">
             <sha256 value="f9e479bc57ff423959c6dd9d08d463c677f440e29d90de795418ea27da6c67fb" origin="Generated by Gradle"/>
@@ -2568,11 +1638,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="e8ae5b40512b71e2258bfacd8cd3da398733aa4cde3b32d056093f832b83a6fe" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.android.gms" name="play-services-tasks" version="17.0.0">
-         <artifact name="play-services-tasks-17.0.0.aar">
-            <sha256 value="2e6d1738b73647f3fe7a038b9780b97717b3746eae258009197e36e7bf3112a5" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.google.android.gms" name="play-services-tasks" version="17.2.0">
          <artifact name="play-services-tasks-17.2.0.aar">
             <sha256 value="a131d126145dfe87de04fa904f9ce91753b2d3273851b7d084666a71255792a8" origin="Generated by Gradle"/>
@@ -2611,31 +1676,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="fedd59b0b4986c342f6ab2d182f2a4ee9fceb2c7e2d5bdc4dc764c92394a23d3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.code.findbugs" name="jsr305" version="2.0.1">
-         <artifact name="jsr305-2.0.1.jar">
-            <sha256 value="1e7f53fa5b8b5c807e986ba335665da03f18d660802d8bf061823089d1bee468" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.google.code.findbugs" name="jsr305" version="3.0.2">
          <artifact name="jsr305-3.0.2.jar">
             <sha256 value="766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.code.gson" name="gson" version="2.8.5">
-         <artifact name="gson-2.8.5.jar">
-            <sha256 value="233a0149fc365c9f6edbd683cfe266b19bdc773be98eabdaf6b3c924b48e7d81" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.google.code.gson" name="gson" version="2.8.6">
          <artifact name="gson-2.8.6.jar">
             <sha256 value="c8fb4839054d280b3033f800d1f5a97de2f028eb8ba2eb458ad287e536f3f25f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.code.gson" name="gson" version="2.8.9">
-         <artifact name="gson-2.8.9.jar">
-            <sha256 value="d3999291855de495c94c743761b8ab5176cfeabe281a5ab0d8e8d45326fd703e" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.google.code.gson" name="gson" version="2.9.0">
          <artifact name="gson-2.9.0.jar">
             <sha256 value="c96d60551331a196dac54b745aa642cd078ef89b6f267146b705f2c2cbef052d" origin="Generated by Gradle"/>
@@ -2651,16 +1701,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="f1dd23f8ae34a8e91366723991ead0d6499d1a3e9163ce550c200b02d76a872b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.errorprone" name="error_prone_annotations" version="2.2.0">
-         <artifact name="error_prone_annotations-2.2.0.jar">
-            <sha256 value="6ebd22ca1b9d8ec06d41de8d64e0596981d9607b42035f9ed374f9de271a481a" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.google.errorprone" name="error_prone_annotations" version="2.3.1">
-         <artifact name="error_prone_annotations-2.3.1.jar">
-            <sha256 value="10a5949aa0f95c8de4fd47edfe20534d2acefd8c224f8afea1f607e112816120" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.google.errorprone" name="error_prone_annotations" version="2.3.4">
          <artifact name="error_prone_annotations-2.3.4.jar">
             <sha256 value="baf7d6ea97ce606c53e11b6854ba5f2ce7ef5c24dddf0afa18d1260bd25b002c" origin="Generated by Gradle"/>
@@ -2840,9 +1880,24 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="dc335931c36500406a98b1fa9a3da0b02075c98818f81e711ee210245cf317f9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.testing.platform" name="core-proto" version="0.0.8-alpha04">
-         <artifact name="core-proto-0.0.8-alpha04.jar">
-            <sha256 value="d2bc7a461351e748444ec816c8350dd908046fa346af60399694a98327d60245" origin="Generated by Gradle"/>
+      <component group="com.google.testing.platform" name="android-device-provider-local" version="0.0.8-alpha07">
+         <artifact name="android-device-provider-local-0.0.8-alpha07.jar">
+            <sha256 value="e3438a2b4e664434e79d8f4998ca34ceb9cbf9cea9f8b061d9a8b3e7f4ae53af" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.testing.platform" name="android-driver-instrumentation" version="0.0.8-alpha07">
+         <artifact name="android-driver-instrumentation-0.0.8-alpha07.jar">
+            <sha256 value="f22f504047649b3629c535c317312ee8838949568f983551636ec65d16bd4e7a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.testing.platform" name="android-test-plugin" version="0.0.8-alpha07">
+         <artifact name="android-test-plugin-0.0.8-alpha07.jar">
+            <sha256 value="0da8b65d8bb0c45a8c4c359ce9125ea2f5bf553a64f8c16421c33623461f1f50" origin="Generated manually" />
+         </artifact>
+      </component>
+      <component group="com.google.testing.platform" name="core" version="0.0.8-alpha07">
+         <artifact name="core-0.0.8-alpha07.jar">
+            <sha256 value="67def226f0d56ec093292d250bded3d7728cfa9f433cc6d44a1ccd25a87afd6b" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.google.testing.platform" name="core-proto" version="0.0.8-alpha07">
@@ -2850,6 +1905,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="4645833caf5cf615d5ddb01a48f2188ec988370f103969e2fb931f8319bf3c0c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.testing.platform" name="launcher" version="0.0.8-alpha07">
+         <artifact name="launcher-0.0.8-alpha07.jar">
+            <sha256 value="3c590e8d9f2b601a1c2e6ffe83a8cecd2d53286eeced7fec5ce40837d6adfe8f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.truth" name="truth" version="0.44">
          <artifact name="truth-0.44.jar">
             <sha256 value="a9e6796786c9c77a5fe19b08e72fe0a620d53166df423d8861af9ebef4dc4247" origin="Generated by Gradle"/>
@@ -3033,11 +2093,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="d71d80e00717a096784482aee21001a9d299fec3833e4ebd87739ed36cf77c54" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.squareup" name="javapoet" version="1.12.1">
-         <artifact name="javapoet-1.12.1.jar">
-            <sha256 value="83f0fd4baebec3bf29ee3ad2c024b3065ddef825a5aa29f7dcf5c189f9fa2962" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.squareup" name="javapoet" version="1.13.0">
          <artifact name="javapoet-1.13.0.jar">
             <sha256 value="4c7517e848a71b36d069d12bb3bf46a70fd4cda3105d822b0ed2e19c00b69291" origin="Generated by Gradle"/>
@@ -3053,14 +2108,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="fcfb09fb0ea0aa97d3cfe7ea792398081348e468f126b3603cb3803f240197f0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.squareup" name="kotlinpoet" version="1.7.2">
-         <artifact name="kotlinpoet-1.7.2.jar">
-            <sha256 value="4d22b70c4b77fc0aa499158e7bb085af9882ffbdc69331325e7869aebe4fb69d" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlinpoet-1.7.2.module">
-            <sha256 value="cc63d5a48ab572312ba22d6005c1c36bb29c173c261a7c2cf3be619b33fb0c6a" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.squareup" name="kotlinpoet" version="1.8.0">
          <artifact name="kotlinpoet-1.8.0.jar">
             <sha256 value="a4f7f1f1306a97740b2c18c6089cddf65626764c4cd848aa83363681268e57f0" origin="Generated by Gradle"/>
@@ -4356,6 +3403,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="c885dd0281076c5843826de317e3cbcdc3d8859dbeef53ae1cfacd1b9c60f96e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-jvm" version="1.5.2">
+         <artifact name="kotlinx-coroutines-core-jvm-1.5.2.jar">
+            <sha256 value="2314c48aa1a39c05c11f3b385cdf3c56b1745f064314e4feabecebc1572b3ac1" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlinx-coroutines-core-jvm-1.5.2.module">
+            <sha256 value="e229f81e6bc098067936a4b8264ea48fbe728ffc50faf4a78e0002793a6cd8ff" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-jvm" version="1.6.1">
          <artifact name="kotlinx-coroutines-core-jvm-1.6.1.jar">
             <sha256 value="3a93ffd052844643c0fef950ae5578db47cccbe9e7176d681333182e232bb0f1" origin="Generated by Gradle"/>
diff --git a/qr/lib/build.gradle b/qr/lib/build.gradle
index 0ec4450ea..1afced463 100644
--- a/qr/lib/build.gradle
+++ b/qr/lib/build.gradle
@@ -6,13 +6,11 @@ dependencies {
     implementation libs.androidx.camera.lifecycle
     implementation libs.androidx.camera.view
     implementation libs.androidx.lifecycle.common.java8
+    implementation libs.androidx.lifecycle.livedata.core
 
+    implementation libs.google.guava.android
     implementation libs.google.zxing.android.integration
     implementation libs.google.zxing.core
 
     implementation libs.rxjava3.rxjava
-
-    // Included to force proper versions for verification and match main app
-    implementation 'androidx.lifecycle:lifecycle-livedata:2.5.1'
-    implementation 'com.google.guava:guava:30.0-android'
 }
\ No newline at end of file
diff --git a/spinner/app/build.gradle b/spinner/app/build.gradle
index 562e93828..c99aa4e7e 100644
--- a/spinner/app/build.gradle
+++ b/spinner/app/build.gradle
@@ -46,9 +46,8 @@ android {
 dependencies {
     coreLibraryDesugaring libs.android.tools.desugar
 
-    implementation "androidx.activity:activity-ktx:1.2.2"
-
     implementation libs.androidx.core.ktx
+    implementation libs.androidx.activity.ktx
     implementation libs.androidx.appcompat
     implementation libs.material.material
     implementation libs.androidx.constraintlayout
diff --git a/spinner/lib/build.gradle b/spinner/lib/build.gradle
index f8e36c79e..f263354e0 100644
--- a/spinner/lib/build.gradle
+++ b/spinner/lib/build.gradle
@@ -29,8 +29,7 @@ ktlint {
 }
 
 dependencies {
-    // Can't use the newest version because it hits some weird NoClassDefFoundException
-    implementation 'com.github.jknack:handlebars:4.0.7'
+    implementation libs.jknack.handlebars
 
     implementation libs.androidx.appcompat
     implementation libs.material.material
@@ -38,5 +37,5 @@ dependencies {
     implementation project(':core-util')
     testImplementation testLibs.junit.junit
 
-    implementation 'org.nanohttpd:nanohttpd-webserver:2.3.1'
+    implementation libs.nanohttpd.webserver
 }
\ No newline at end of file