From 3568339ba1858e1bed059466882ddbc6f74f1550 Mon Sep 17 00:00:00 2001
From: Jonatan Rhodin <jonatan.rhodin@mullvad.net>
Date: Mon, 23 Sep 2024 11:05:25 +0200
Subject: [PATCH 1/2] Update agp to 8.6.1

---
 android/gradle.properties                |   1 -
 android/gradle/libs.versions.toml        |   4 +-
 android/gradle/verification-metadata.xml | 530 +++++++++--------------
 3 files changed, 215 insertions(+), 320 deletions(-)

diff --git a/android/gradle.properties b/android/gradle.properties
index 324e171187d3..74c277e3a155 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -3,4 +3,3 @@ android.nonTransitiveRClass=false
 android.useAndroidX=true
 kotlin.code.style=official
 org.gradle.jvmargs=-Xmx8192M -Dkotlin.daemon.jvm.options\="-Xmx8192M"
-android.experimental.lint.version = 8.4.0
diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
index 9d5d8b2ea92f..589ef5448e26 100644
--- a/android/gradle/libs.versions.toml
+++ b/android/gradle/libs.versions.toml
@@ -3,8 +3,8 @@
 # The android-gradle-aapt plugin version must be in sync with the android plugin version.
 # Required for Gradle metadata verification to work properly, see:
 # https://github.com/gradle/gradle/issues/19228
-android-gradle-plugin = "8.3.0"
-android-gradle-aapt = "10880808"
+android-gradle-plugin = "8.6.1"
+android-gradle-aapt = "11315950"
 android-billingclient = "7.0.0"
 android-volley = "1.2.1"
 
diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml
index b6ff9d018a7c..10b902e95f88 100644
--- a/android/gradle/verification-metadata.xml
+++ b/android/gradle/verification-metadata.xml
@@ -1188,14 +1188,14 @@
             <sha256 value="903034d5152dd2e0162b1468ea25a22e1ca384006b3d282d5a143cc760321a01" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.databinding" name="databinding-common" version="8.3.0">
-         <artifact name="databinding-common-8.3.0.jar">
+      <component group="androidx.databinding" name="databinding-common" version="8.6.1">
+         <artifact name="databinding-common-8.6.1.jar">
             <sha256 value="66cab82639dac0f6c2433464c093b074d608c4bb887ec38a9b8bc4ac98126732" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.databinding" name="databinding-compiler-common" version="8.3.0">
-         <artifact name="databinding-compiler-common-8.3.0.jar">
-            <sha256 value="456006224e620e38bd5d61b2ee8517d606a9953974e8d32da1616f1b48be7330" origin="Generated by Gradle"/>
+      <component group="androidx.databinding" name="databinding-compiler-common" version="8.6.1">
+         <artifact name="databinding-compiler-common-8.6.1.jar">
+            <sha256 value="f61b78591752694b960d5fe8f97fde49a2fb3911647ffabd6d7d569237fc7362" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.drawerlayout" name="drawerlayout" version="1.0.0">
@@ -2234,13 +2234,13 @@
             <sha256 value="ddd43652b0b5d9f9c8b8d3def9ed5767d39a34a5af43be28e0c438e8e86caef9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android" name="signflinger" version="8.3.0">
-         <artifact name="signflinger-8.3.0.jar">
+      <component group="com.android" name="signflinger" version="8.6.1">
+         <artifact name="signflinger-8.6.1.jar">
             <sha256 value="c1dca2c683634ee1a294298f9c7179578af6a86e080bdc40f961915bc5c8142f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android" name="zipflinger" version="8.3.0">
-         <artifact name="zipflinger-8.3.0.jar">
+      <component group="com.android" name="zipflinger" version="8.6.1">
+         <artifact name="zipflinger-8.6.1.jar">
             <sha256 value="81dd485618a509a3235929b9eb13091d884452661de6ce5a45cc38b1c555421c" origin="Generated by Gradle"/>
          </artifact>
       </component>
@@ -2254,231 +2254,162 @@
             <sha256 value="bfb7416b270b2a15ddb09fe0c3a9f9a4edeadb348c875104c615dce9766924ba" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.databinding" name="baseLibrary" version="8.3.0">
-         <artifact name="baseLibrary-8.3.0.jar">
+      <component group="com.android.databinding" name="baseLibrary" version="8.6.1">
+         <artifact name="baseLibrary-8.6.1.jar">
             <sha256 value="794113709dab21b06c262b3795e73cb708fbacae61715f34361e1af6237a1870" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="annotations" version="31.3.0">
-         <artifact name="annotations-31.3.0.jar">
-            <sha256 value="ee3bfd9cdb5012bdb61520f8654a785577e9bb337e5939c5c6149a446684ee16" origin="Generated by Gradle"/>
+      <component group="com.android.tools" name="annotations" version="31.6.1">
+         <artifact name="annotations-31.6.1.jar">
+            <sha256 value="b25995fa7b220d35fbb8e325df071f8291691bfbaff9734c98e38f45ec2a73ee" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="annotations" version="31.4.0">
-         <artifact name="annotations-31.4.0.jar">
-            <sha256 value="25e8825547de7146d08fa18f04ef934ee1e6aec52e4c97ffa510a8f0f44b07a0" origin="Generated by Gradle"/>
+      <component group="com.android.tools" name="common" version="31.6.1">
+         <artifact name="common-31.6.1.jar">
+            <sha256 value="4921a6610bf28f02911eb7d6e1ba498db98884e5f233e55272619a0841bd4c79" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="common" version="31.3.0">
-         <artifact name="common-31.3.0.jar">
-            <sha256 value="803fc4e4cc5e66c5db094071f4ccdb447ff154072154168eba2c49116f59b8d0" origin="Generated by Gradle"/>
+      <component group="com.android.tools" name="dvlib" version="31.6.1">
+         <artifact name="dvlib-31.6.1.jar">
+            <sha256 value="5ccc490258202850630c59eecb9d29a6c849bb17f10f4ca9017db649f72e481f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="common" version="31.4.0">
-         <artifact name="common-31.4.0.jar">
-            <sha256 value="d7ce03f7ae4a8b7ad17d5fb61a3beac15c73aff818eac51dedf8e35c204162f3" origin="Generated by Gradle"/>
+      <component group="com.android.tools" name="play-sdk-proto" version="31.6.1">
+         <artifact name="play-sdk-proto-31.6.1.jar">
+            <sha256 value="2a0ff337c71b9bfb2a8d8d4fcdf63096b0b25203f764d6143fa2c24957abba7e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="dvlib" version="31.3.0">
-         <artifact name="dvlib-31.3.0.jar">
-            <sha256 value="0cb57c126ed95657ae1e0974af092b401a52b76d5683f7ccbe1f8f21af06794e" origin="Generated by Gradle"/>
+      <component group="com.android.tools" name="repository" version="31.6.1">
+         <artifact name="repository-31.6.1.jar">
+            <sha256 value="169c2e7a77aa30978879dbf8b30436671165872fcbdfdda6c735aaddb6710340" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="dvlib" version="31.4.0">
-         <artifact name="dvlib-31.4.0.jar">
-            <sha256 value="bf962bea906e1dc8a3273b8129999eaea3bb16fcb2b9deea1450dc6fb2ef9073" origin="Generated by Gradle"/>
+      <component group="com.android.tools" name="sdk-common" version="31.6.1">
+         <artifact name="sdk-common-31.6.1.jar">
+            <sha256 value="ad66eec685eebe2e6ae4303e70c89f72317fa7d8cc2b39e36fdfa8645a2260fd" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="play-sdk-proto" version="31.4.0">
-         <artifact name="play-sdk-proto-31.4.0.jar">
-            <sha256 value="68840b9dc064724dbe12844e0c59e325ac4dfaa818bf3262635bd5254010a29c" origin="Generated by Gradle"/>
+      <component group="com.android.tools" name="sdklib" version="31.6.1">
+         <artifact name="sdklib-31.6.1.jar">
+            <sha256 value="31a2e1410bacd7e8a4647e397ccf914b686b3232296e4229128e3bad96706e24" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools" name="repository" version="31.3.0">
-         <artifact name="repository-31.3.0.jar">
-            <sha256 value="df2533e154b736a0a95e4804893aa59099552842bf9635cda3751be9e894a0e2" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools" name="repository" version="31.4.0">
-         <artifact name="repository-31.4.0.jar">
-            <sha256 value="df2533e154b736a0a95e4804893aa59099552842bf9635cda3751be9e894a0e2" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools" name="sdk-common" version="31.3.0">
-         <artifact name="sdk-common-31.3.0.jar">
-            <sha256 value="81e5391e6b93c8237eda17bb24b26a9b28d5abe7217a5553da2dabf1bd00656d" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools" name="sdk-common" version="31.4.0">
-         <artifact name="sdk-common-31.4.0.jar">
-            <sha256 value="f38eba4bbfb6d541dc8c2be38c31e7389d0acdc354b234f258b6ee89e8ddce6d" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools" name="sdklib" version="31.3.0">
-         <artifact name="sdklib-31.3.0.jar">
-            <sha256 value="4826724b88f6c9ecbf1ad93a1b4edfd80941cef9d54093d645cf0796238dd0b2" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools" name="sdklib" version="31.4.0">
-         <artifact name="sdklib-31.4.0.jar">
-            <sha256 value="7d05caeddb635d87d04b4de70f9ee78a247514665ab57f25c07d2ba4e7af0f5b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.analytics-library" name="crash" version="31.3.0">
-         <artifact name="crash-31.3.0.jar">
+      <component group="com.android.tools.analytics-library" name="crash" version="31.6.1">
+         <artifact name="crash-31.6.1.jar">
             <sha256 value="2c5c26420967675c074bc7140831fe3bff5bbabc7fbbc08ba29fdc3eadcc9510" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="protos" version="31.3.0">
-         <artifact name="protos-31.3.0.jar">
-            <sha256 value="b3bb4f776c7da4e49d127063b978e4175de5402e8ecc35e983cfc7311e195898" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.analytics-library" name="protos" version="31.4.0">
-         <artifact name="protos-31.4.0.jar">
-            <sha256 value="c2bb6199304d595cb9b60f282d1bb5016c838809b33c90bf8aaf9a769a58115b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.analytics-library" name="shared" version="31.3.0">
-         <artifact name="shared-31.3.0.jar">
-            <sha256 value="1ddf8b7c36aa336d8d982516b2a503c922e18e9972967b0d2a2ee43561bb97c9" origin="Generated by Gradle"/>
+      <component group="com.android.tools.analytics-library" name="protos" version="31.6.1">
+         <artifact name="protos-31.6.1.jar">
+            <sha256 value="0cd13ddedc22dfe3535a4c6adc564d1fc380f695dd1fd74cf02130c510cfb573" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="shared" version="31.4.0">
-         <artifact name="shared-31.4.0.jar">
-            <sha256 value="971e224c62bb2f05ca8f4f37ed29ac8f91914b39eb8ac620ba92a2e0ea38bc7d" origin="Generated by Gradle"/>
+      <component group="com.android.tools.analytics-library" name="shared" version="31.6.1">
+         <artifact name="shared-31.6.1.jar">
+            <sha256 value="188ec3cb881ed655df9311cc58701dcb32997365004e8aa6854acfb60f6e35e1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="tracker" version="31.3.0">
-         <artifact name="tracker-31.3.0.jar">
-            <sha256 value="961a4be424dc9d16ba85d81d4560d731ba5fdf52ddb033903e533ea871e48a47" origin="Generated by Gradle"/>
+      <component group="com.android.tools.analytics-library" name="tracker" version="31.6.1">
+         <artifact name="tracker-31.6.1.jar">
+            <sha256 value="7e8f45aada8beda71c2976c15f1a316eaa00fd4a9683221311ced2bdbc026408" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.analytics-library" name="tracker" version="31.4.0">
-         <artifact name="tracker-31.4.0.jar">
-            <sha256 value="542c6c0070a7df6254050532f2a14aa9db5553a0fc2cb203fdba7b721523e716" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="aapt2" version="8.6.1-11315950">
+         <artifact name="aapt2-8.6.1-11315950-linux.jar">
+            <sha256 value="955f14e61cac2e1d70a4703b1aa539ca4f348469ac64a155dcce47bda3de52c8" origin="Generated by Gradle"/>
          </artifact>
-      </component>
-      <component group="com.android.tools.build" name="aapt2" version="8.3.0-10880808">
-         <artifact name="aapt2-8.3.0-10880808-linux.jar">
-            <sha256 value="d5c7a4bbf71f483c99f808c7ce74e4f1bc859e71a9411dfd33cf5de6e5a2dcfa" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="aapt2-8.3.0-10880808-osx.jar">
-            <sha256 value="26f829814e45066e61dcd5fdbb3936207e866e58eb4fe2bda67e76c82b401ad6" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="aapt2-8.3.0-10880808-windows.jar">
-            <sha256 value="f62f50a652d102bc91d6f3102e4c7b46a20a566a9cb1b72d41b54afd1c8c2efe" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="aapt2-proto" version="8.3.0-10880808">
-         <artifact name="aapt2-proto-8.3.0-10880808.jar">
-            <sha256 value="d5f3da080c9b8d92aef8e92583f269a8304ccea4540cc27498d63804ee47b756" origin="Generated by Gradle"/>
+         <artifact name="aapt2-8.6.1-11315950-osx.jar">
+            <sha256 value="3efea26673d50fc3f2df69bb17f0cdc29967ce7b0865d208485292d1153a07e3" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-proto-8.3.0-10880808.module">
-            <sha256 value="aa77cd924d5a6b365cc7cff5926458c0d87d6d5710612b04f506f5c09ea12dc7" origin="Generated by Gradle"/>
+         <artifact name="aapt2-8.6.1-11315950-windows.jar">
+            <sha256 value="d7911de3afa8d5de1f1213f5244de7144093442d4fc20c8eb75d188ebe132ea5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="aapt2-proto" version="8.4.0-11315950">
-         <artifact name="aapt2-proto-8.4.0-11315950.jar">
-            <sha256 value="f2832942e1de78a4544d671850d35e4b6e9b0342c1dc216c081707fb98b0dfbe" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="aapt2-proto" version="8.6.1-11315950">
+         <artifact name="aapt2-proto-8.6.1-11315950.jar">
+            <sha256 value="f79359a88ad1734f249aadca886807b215f26055549c22f34dcea9a2313d14ea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aapt2-proto-8.4.0-11315950.module">
-            <sha256 value="15c5e990f6404c9ec52ed3561c1dc454175089ae5ad14037f2759af14f994959" origin="Generated by Gradle"/>
+         <artifact name="aapt2-proto-8.6.1-11315950.module">
+            <sha256 value="949219215cea9fea44496ce16ec3c4733ae3f16a79753eecc0add24b11bc8b43" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="aaptcompiler" version="8.3.0">
-         <artifact name="aaptcompiler-8.3.0.jar">
-            <sha256 value="4e496723b3d1616785fb883328d9ea6bc02c92a11690b7f02ae51e639a5a5491" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="aaptcompiler" version="8.6.1">
+         <artifact name="aaptcompiler-8.6.1.jar">
+            <sha256 value="7e19ff3d47c3bd9b392596d71522af724053ef2a5ffe26b39f5b30e81e8883a1" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="aaptcompiler-8.3.0.module">
-            <sha256 value="35364a28201b38717f90c27e91c44cf73e1ec9c707e02542db3930ee393b78a3" origin="Generated by Gradle"/>
+         <artifact name="aaptcompiler-8.6.1.module">
+            <sha256 value="d22531adb533621f030b850cc72ce01816c5e2a11c29f10faf486217014b38ed" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="apksig" version="8.3.0">
-         <artifact name="apksig-8.3.0.jar">
-            <sha256 value="468ee1852fa12461c6629608fe47be70e50f60be7c4744bb7f62ca48e85c0a6c" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="apksig" version="8.6.1">
+         <artifact name="apksig-8.6.1.jar">
+            <sha256 value="c070ed1394629d74641aa0906f60b2ffa1ee77e6366a1f93437f59717b1aeb89" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="apkzlib" version="8.3.0">
-         <artifact name="apkzlib-8.3.0.jar">
+      <component group="com.android.tools.build" name="apkzlib" version="8.6.1">
+         <artifact name="apkzlib-8.6.1.jar">
             <sha256 value="1c1a67d6f4f186427ac166ebaa0dd867f595d5144fc925252b05ffb9d1a156b7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="builder" version="8.3.0">
-         <artifact name="builder-8.3.0.jar">
-            <sha256 value="88b5a476fb1433ef73de51bc233bba890977e8692393353d0c192e2e090fcd80" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="builder" version="8.6.1">
+         <artifact name="builder-8.6.1.jar">
+            <sha256 value="bc4ee949f4ee95381c835487ebb6b1964889d6104b032397967d88b4f206e48d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-8.3.0.module">
-            <sha256 value="ed616ba10473ba54b47e0ecd659a8aecb34fed73a40ba97abead0fe38e0b354b" origin="Generated by Gradle"/>
+         <artifact name="builder-8.6.1.module">
+            <sha256 value="458858250f513bffdb686aced000a8dacdef912bd091795b405d774e9b9949fa" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="builder-model" version="8.3.0">
-         <artifact name="builder-model-8.3.0.jar">
-            <sha256 value="48cebf9813f97b6649585ad29d2b90c2c356ad608d2dbfc0e843fc019c4f14c6" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="builder-model" version="8.6.1">
+         <artifact name="builder-model-8.6.1.jar">
+            <sha256 value="516e0ff378141532683fb3b16cb0e71517bf8b35388c27976fa90687289a8458" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-model-8.3.0.module">
-            <sha256 value="b5db86a2a1800614cdf2fff96850c986a913ec29a14529e7d9d211410aa64e3f" origin="Generated by Gradle"/>
+         <artifact name="builder-model-8.6.1.module">
+            <sha256 value="a1e06a5bccb233e76fad4f37f0e351c04b6f9ceb3e3d188dc0c592698241b4ea" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="builder-model" version="8.4.0">
-         <artifact name="builder-model-8.4.0.jar">
-            <sha256 value="0ad5a52ef979140c3ddeab546c0c7e5abf02b8fbf5f8a2fbffeee54ef3eac39d" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="builder-test-api" version="8.6.1">
+         <artifact name="builder-test-api-8.6.1.jar">
+            <sha256 value="8e80a157d368adf01629f5a306c78fed1fb1dcceee61c45795ae207d91bdab4c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="builder-model-8.4.0.module">
-            <sha256 value="aa3ed4955f7b03e78db970ea8cd5bc0bf975644f41215a7b489c8bbd8a20ef25" origin="Generated by Gradle"/>
+         <artifact name="builder-test-api-8.6.1.module">
+            <sha256 value="742bcac6b559d1b5ee9f3c62366b44257a050cc77f39252b875efaf73c30f64b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="builder-test-api" version="8.3.0">
-         <artifact name="builder-test-api-8.3.0.jar">
-            <sha256 value="ca8065f9f26960455982beb48b74cd36b2aa4927ed8aef345cc761000416367f" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="builder-test-api-8.3.0.module">
-            <sha256 value="1bfaa565348548b3800eea9dbc51a24d02067faa226e65f2ed7497a995b1abb6" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="bundletool" version="1.15.6">
-         <artifact name="bundletool-1.15.6.jar">
-            <sha256 value="f66992e537adb12ffa6d181cdc536d564b1c4b4b4c5972b4891706c6533a4641" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.build" name="gradle" version="8.3.0">
-         <artifact name="gradle-8.3.0.jar">
-            <sha256 value="2373ffe9dd5928b2d3f2696d4d4d5f061d24d49582850dd9f05d9740f9c360d9" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="gradle-8.3.0.module">
-            <sha256 value="931ecb1149a631bbe89abc11e4a26e4962fe337a95896a0b4c4cecd83b84ea01" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="bundletool" version="1.16.0">
+         <artifact name="bundletool-1.16.0.jar">
+            <sha256 value="1ea2bf5274bbac7a3bb5618521d2fa11fb04e900e33a8a646029ec6332fc08c8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="gradle-api" version="8.3.0">
-         <artifact name="gradle-api-8.3.0.jar">
-            <sha256 value="1771f97fb74b7d799b8da8de9e4bee2ae75e58b472721596662c46799dc86bae" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="gradle" version="8.6.1">
+         <artifact name="gradle-8.6.1.jar">
+            <sha256 value="9697733a215f2ed42e5b2fc4053484ec832eab29584ebced94d92c91090051c1" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-api-8.3.0.module">
-            <sha256 value="0a275310949234de2179a28afd8e136fc855b7afc11c8f3f155c8242d5bfa316" origin="Generated by Gradle"/>
+         <artifact name="gradle-8.6.1.module">
+            <sha256 value="2988bbfa1dd0797c4d5642c8481e5130030db9329a84a69c3e854a9a99940505" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="gradle-settings-api" version="8.3.0">
-         <artifact name="gradle-settings-api-8.3.0.jar">
-            <sha256 value="3df4a3d8947ca5e7f1bdeef99969b49e3a1a0d25c776d2c86100741274186f73" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="gradle-api" version="8.6.1">
+         <artifact name="gradle-api-8.6.1.jar">
+            <sha256 value="07f76bf2f8f7b2f376cc86eabd4f8a8279182b6570f440e7843d066f02c5f556" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="gradle-settings-api-8.3.0.module">
-            <sha256 value="2d0954f86ec8e84929a67bf0f4ed99dd55eb93a0f56782e279f9eaad539d3e29" origin="Generated by Gradle"/>
+         <artifact name="gradle-api-8.6.1.module">
+            <sha256 value="2995d8aade215eea0e420e4f33dbf644a0b8a47c64693e407c2cc5745adaecb3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="manifest-merger" version="31.3.0">
-         <artifact name="manifest-merger-31.3.0.jar">
-            <sha256 value="726b07b4b1036e50d0f50e5e4cb54c2881140d9b1ca77b18e0bf47ad788ce8d8" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="gradle-settings-api" version="8.6.1">
+         <artifact name="gradle-settings-api-8.6.1.jar">
+            <sha256 value="7ca7dbd0be9120478990e25fb83cf083a3fc79bca9644e247cc5546358ce2982" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="manifest-merger-31.3.0.module">
-            <sha256 value="fdb038141e495e8211df2a6be90ed6e9d9b48966b817f008137512da8778ccf1" origin="Generated by Gradle"/>
+         <artifact name="gradle-settings-api-8.6.1.module">
+            <sha256 value="ab3343832b233380134a11533a545a2a8fb718b6e8483c6d92630411335907be" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.build" name="manifest-merger" version="31.4.0">
-         <artifact name="manifest-merger-31.4.0.jar">
-            <sha256 value="3439ddad91cf62aa5617af1c3ac2849e35878b487e972dfda26f07236a07e031" origin="Generated by Gradle"/>
+      <component group="com.android.tools.build" name="manifest-merger" version="31.6.1">
+         <artifact name="manifest-merger-31.6.1.jar">
+            <sha256 value="aa963d4af45ab031c570783ce9286d2111eeb0b8c3bdf44e48ca90714cccb754" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="manifest-merger-31.4.0.module">
-            <sha256 value="16c01f544b86e9df7fdaae7ab1c736079b265f24a0c6263bc42bccf585e633ba" origin="Generated by Gradle"/>
+         <artifact name="manifest-merger-31.6.1.module">
+            <sha256 value="5ab814c5c62ae80a601e938b53139c10f14a89c30a5563c50ac452787371b0f6" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.tools.build" name="transform-api" version="2.0.0-deprecated-use-gradle-api">
@@ -2502,219 +2433,199 @@
             <sha256 value="36c25576b19993df360170528cc62b7246c37776d6158154a67cdf8fc2d58e13" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.ddms" name="ddmlib" version="31.3.0">
-         <artifact name="ddmlib-31.3.0.jar">
-            <sha256 value="88afc3e88f0b27dff3d4686765d140cb172161a710708e1861dda6fd689c117c" origin="Generated by Gradle"/>
+      <component group="com.android.tools.ddms" name="ddmlib" version="31.6.1">
+         <artifact name="ddmlib-31.6.1.jar">
+            <sha256 value="c571c0224fe3e7e6607196d95cc3142fdc19f013e8f1510f68c7b4a686c53809" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.ddms" name="ddmlib" version="31.4.0">
-         <artifact name="ddmlib-31.4.0.jar">
-            <sha256 value="f98b88cfe0fe729d755f0bf6d5fc21e20f89aea9e630860dc0f75dcbec6fec0b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.emulator" name="proto" version="31.3.0">
-         <artifact name="proto-31.3.0.jar">
+      <component group="com.android.tools.emulator" name="proto" version="31.6.1">
+         <artifact name="proto-31.6.1.jar">
             <sha256 value="5994f35bcfe498aee92a82340b7600902439b1aa153b9398591105c4e00bb994" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.external.com-intellij" name="intellij-core" version="31.4.0">
-         <artifact name="intellij-core-31.4.0.jar">
-            <sha256 value="025e5a282d9fb83a4e6073ff4ccd5a28e38f8a322a856d4aa29e4ad00bd377f4" origin="Generated by Gradle"/>
+      <component group="com.android.tools.external.com-intellij" name="intellij-core" version="31.6.1">
+         <artifact name="intellij-core-31.6.1.jar">
+            <sha256 value="4805b8e2ef4ba140b7b3d77ea619a752ff112bbd88a01a59219e04c01f76365d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.external.com-intellij" name="kotlin-compiler" version="31.4.0">
-         <artifact name="kotlin-compiler-31.4.0.jar">
-            <sha256 value="fd45a1e4a45c51b46920445586f71c92a8801cb0880bcc0f485144ffbfbc284f" origin="Generated by Gradle"/>
+      <component group="com.android.tools.external.com-intellij" name="kotlin-compiler" version="31.6.1">
+         <artifact name="kotlin-compiler-31.6.1.jar">
+            <sha256 value="e9b4614ceddf7bad65fd547e9136f870379cf0e23be45616ca7bdebadb7702e4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.external.org-jetbrains" name="uast" version="31.4.0">
-         <artifact name="uast-31.4.0.jar">
-            <sha256 value="0df6547b37453f5ad2006179cd65b0ab7109b8f67b837d739509b2ff4f8310b3" origin="Generated by Gradle"/>
+      <component group="com.android.tools.external.org-jetbrains" name="uast" version="31.6.1">
+         <artifact name="uast-31.6.1.jar">
+            <sha256 value="f85e9b1673cc78353c21592407f02448dc7178b127eef2d8e1afa0addea161fb" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.layoutlib" name="layoutlib-api" version="31.3.0">
-         <artifact name="layoutlib-api-31.3.0.jar">
-            <sha256 value="3c9064c3c3ab0e73f3a5953d1c11c57dbf57a3297957c1d7d460c92e14cf34b2" origin="Generated by Gradle"/>
+      <component group="com.android.tools.layoutlib" name="layoutlib-api" version="31.6.1">
+         <artifact name="layoutlib-api-31.6.1.jar">
+            <sha256 value="98bae36ff051e114dd4eef5effa80fbe5e552944f4233ce892160da2cd9eeaed" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.layoutlib" name="layoutlib-api" version="31.4.0">
-         <artifact name="layoutlib-api-31.4.0.jar">
-            <sha256 value="3c9064c3c3ab0e73f3a5953d1c11c57dbf57a3297957c1d7d460c92e14cf34b2" origin="Generated by Gradle"/>
+      <component group="com.android.tools.lint" name="lint" version="31.6.1">
+         <artifact name="lint-31.6.1.jar">
+            <sha256 value="9b5a4f5c1c40753739f72500394d296f1142e58bd3406bd0c698ccb4b165b4b6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint" version="31.4.0">
-         <artifact name="lint-31.4.0.jar">
-            <sha256 value="4c8bbdfaa4fcddd5e8b8f3e9606057a1e5dd6ed8013a7bbc9ae2d4a7d950152c" origin="Generated by Gradle"/>
+      <component group="com.android.tools.lint" name="lint-api" version="31.6.1">
+         <artifact name="lint-api-31.6.1.jar">
+            <sha256 value="19d0976922d5685cbdf2a8497f323823004c85d97f23807b86388e2816259083" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-api" version="31.4.0">
-         <artifact name="lint-api-31.4.0.jar">
-            <sha256 value="03046cddd2df9b0d25ae1f5260102922b9efc8118ad1c2566443a04e3008ee55" origin="Generated by Gradle"/>
+      <component group="com.android.tools.lint" name="lint-checks" version="31.6.1">
+         <artifact name="lint-checks-31.6.1.jar">
+            <sha256 value="a173f51fb5e4f3234c0b84941b0482cd597b07a7a22e921308039c8d0cf8c69d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-checks" version="31.4.0">
-         <artifact name="lint-checks-31.4.0.jar">
-            <sha256 value="51ad2a41dcf521ad7bb0de716ab7f13a065e3cafe69e9d94c95b54f8589992c6" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.lint" name="lint-gradle" version="31.4.0">
-         <artifact name="lint-gradle-31.4.0.jar">
+      <component group="com.android.tools.lint" name="lint-gradle" version="31.6.1">
+         <artifact name="lint-gradle-31.6.1.jar">
             <sha256 value="ec188c62447a6c7cd781072577b04470d7a8c321de926a95f5c7f92342060fbe" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-model" version="31.3.0">
-         <artifact name="lint-model-31.3.0.jar">
-            <sha256 value="243bb5e90bef1f94b419506bc9c236e86cecd977220e89ddb9e9f973b9e56ce1" origin="Generated by Gradle"/>
+      <component group="com.android.tools.lint" name="lint-model" version="31.6.1">
+         <artifact name="lint-model-31.6.1.jar">
+            <sha256 value="3bb6186f775dce7a106391e24bcc3c8d270bccdf2f551b92161c6adc0bc2ecde" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-model" version="31.4.0">
-         <artifact name="lint-model-31.4.0.jar">
-            <sha256 value="ae5b38460f3a59c0725930d779dbbb3372f08031a1a41faa59d9f8500b3e4641" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.android.tools.lint" name="lint-typedef-remover" version="31.3.0">
-         <artifact name="lint-typedef-remover-31.3.0.jar">
+      <component group="com.android.tools.lint" name="lint-typedef-remover" version="31.6.1">
+         <artifact name="lint-typedef-remover-31.6.1.jar">
             <sha256 value="5b4f485215ca4d86ef2319fc398b5f2251e62f5446bc5fd0e00653648ddde318" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.lint" name="lint-typedef-remover" version="31.4.0">
-         <artifact name="lint-typedef-remover-31.4.0.jar">
-            <sha256 value="5b4f485215ca4d86ef2319fc398b5f2251e62f5446bc5fd0e00653648ddde318" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-device-provider-ddmlib" version="31.6.1">
+         <artifact name="android-device-provider-ddmlib-31.6.1.jar">
+            <sha256 value="6e1c56df820d30f689f9fca6111868e615ba5d41ed3fa5ea194b57a12d1af26c" origin="Generated by Gradle"/>
          </artifact>
-      </component>
-      <component group="com.android.tools.utp" name="android-device-provider-ddmlib" version="31.3.0">
-         <artifact name="android-device-provider-ddmlib-31.3.0.jar">
-            <sha256 value="a71fc178f2f361463d4290a73e123fe9aa74eb8450c303dcb863e08d02b83b7e" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="android-device-provider-ddmlib-31.3.0.module">
-            <sha256 value="a9fa5f722bb457a5991ad56c592b2cb6e9b80b34027175c20ad4edfe619e163e" origin="Generated by Gradle"/>
+         <artifact name="android-device-provider-ddmlib-31.6.1.module">
+            <sha256 value="05d8b86dd24ac960eca6d32a74ce21ac8e9e2fcd8104617f727228f3ba668632" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-device-provider-ddmlib-proto" version="31.3.0">
-         <artifact name="android-device-provider-ddmlib-proto-31.3.0.jar">
+      <component group="com.android.tools.utp" name="android-device-provider-ddmlib-proto" version="31.6.1">
+         <artifact name="android-device-provider-ddmlib-proto-31.6.1.jar">
             <sha256 value="da9f3f3dae26544c90668549584765d5854a87c425d2cfe577cd34d3600ea097" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-device-provider-gradle" version="31.3.0">
-         <artifact name="android-device-provider-gradle-31.3.0.jar">
-            <sha256 value="ad742e94bafe84216cfa313bfc01d222e7ab33d7527db2baba48b83fed5afb05" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-device-provider-gradle" version="31.6.1">
+         <artifact name="android-device-provider-gradle-31.6.1.jar">
+            <sha256 value="144a4e7db2aac9f987441c1f96acd576603a05fe356ebcc80732b46e782c44ba" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-device-provider-gradle-31.3.0.module">
-            <sha256 value="e743e81e2a10dc21bf1ee78a7c26cc80824a60a4e2b27bd8b43bf43943eca7a8" origin="Generated by Gradle"/>
+         <artifact name="android-device-provider-gradle-31.6.1.module">
+            <sha256 value="332f465d5e0eccb2165a1dd501e6c022805d467d7a5f3f4e38e140f763ea818e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-device-provider-gradle-proto" version="31.3.0">
-         <artifact name="android-device-provider-gradle-proto-31.3.0.jar">
+      <component group="com.android.tools.utp" name="android-device-provider-gradle-proto" version="31.6.1">
+         <artifact name="android-device-provider-gradle-proto-31.6.1.jar">
             <sha256 value="ad2342bb1d6f95563400a322493ea1c229cb93df3944f1261b7399f718494049" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output" version="31.3.0">
-         <artifact name="android-test-plugin-host-additional-test-output-31.3.0.jar">
-            <sha256 value="30a538d5d624e75cd8a957f1e9351db12347c43a59cb22c24c2a5ac9108a0298" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output" version="31.6.1">
+         <artifact name="android-test-plugin-host-additional-test-output-31.6.1.jar">
+            <sha256 value="d4b94f218c7cd5c5d25e2aa664daabd5425e4691cfdf32efc57017f465dfc91e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-additional-test-output-31.3.0.module">
-            <sha256 value="1ec5ac70d915d700c2909b1e8848c281b0406e581ebd9725212692e98d89a9e2" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-additional-test-output-31.6.1.module">
+            <sha256 value="90115f71144d5fa21c4c5299a0f77eb0006bb1c7147f772a5f524cfdf949af7b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output-proto" version="31.3.0">
-         <artifact name="android-test-plugin-host-additional-test-output-proto-31.3.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output-proto" version="31.6.1">
+         <artifact name="android-test-plugin-host-additional-test-output-proto-31.6.1.jar">
             <sha256 value="38450694de6328c2c4cba696f9c04ecdd5ce6952355f68c3a22f9541d1d6546f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer" version="31.3.0">
-         <artifact name="android-test-plugin-host-apk-installer-31.3.0.jar">
-            <sha256 value="8b7dc5bdc10f177f82ca89885eaa3eeac19db4ac54eccb21091bd155f6ca0309" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer" version="31.6.1">
+         <artifact name="android-test-plugin-host-apk-installer-31.6.1.jar">
+            <sha256 value="cc57d107017d5321cd1966dafe12a3a7bd326aea2457fa0120519d073f8aa735" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-apk-installer-31.3.0.module">
-            <sha256 value="63ae877e87c04b34273c7a2ccad970160827b56ce58073391b01ded1c806e00a" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-apk-installer-31.6.1.module">
+            <sha256 value="0955ae7d8066580b0ab0c2e0101570976c3e0deef42dc16bffe5329c95a747f3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer-proto" version="31.3.0">
-         <artifact name="android-test-plugin-host-apk-installer-proto-31.3.0.jar">
-            <sha256 value="df8a31a9a5e05f6915cf55123bbfd36ad73229686bb13c6f40e951ec933c21bf" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer-proto" version="31.6.1">
+         <artifact name="android-test-plugin-host-apk-installer-proto-31.6.1.jar">
+            <sha256 value="543eb6c8d72b2ed7451f8e939d5d80890566f14bc26b7df9c8347506b258d7ae" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage" version="31.3.0">
-         <artifact name="android-test-plugin-host-coverage-31.3.0.jar">
-            <sha256 value="87cb362de7c5fd4a86e99819a1dfb1e22a9fe6edda2460eb4ae9eca347cb5183" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage" version="31.6.1">
+         <artifact name="android-test-plugin-host-coverage-31.6.1.jar">
+            <sha256 value="55f1467879ff32fa8d6631faf3246d0d998a8abd81e6b08444a8564c3ea0107f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-coverage-31.3.0.module">
-            <sha256 value="44900f9ca77dc4130d859bfdba638f5f64e3b005532f5e5a994e51df39b200f9" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-coverage-31.6.1.module">
+            <sha256 value="173b0d06e573658fefc6f0628bde2b5570c4341876a7686f6b2e4247837e70b7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage-proto" version="31.3.0">
-         <artifact name="android-test-plugin-host-coverage-proto-31.3.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage-proto" version="31.6.1">
+         <artifact name="android-test-plugin-host-coverage-proto-31.6.1.jar">
             <sha256 value="efb4d7014aaa7355246a07c2e437a2231fb252540ff1bce6872c88dc8da89d12" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info" version="31.3.0">
-         <artifact name="android-test-plugin-host-device-info-31.3.0.jar">
-            <sha256 value="40a6c9ef6971fee24bd06f06d8a6c7f77c076930f6e277aed651b625e9762007" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info" version="31.6.1">
+         <artifact name="android-test-plugin-host-device-info-31.6.1.jar">
+            <sha256 value="76bdd8d0b26ecc159729b8962b506dbf7465f11edf8d90e8755748232e5cf48b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-device-info-31.3.0.module">
-            <sha256 value="42c6623b2892ada2215ab954b800bafb3f8894e092c36d85186b3dda01db5fc6" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-device-info-31.6.1.module">
+            <sha256 value="99ba45e34bcbbc0a2cad910b06f3af430104276da3c7b6aa4a6d575f99df601e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info-proto" version="31.3.0">
-         <artifact name="android-test-plugin-host-device-info-proto-31.3.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info-proto" version="31.6.1">
+         <artifact name="android-test-plugin-host-device-info-proto-31.6.1.jar">
             <sha256 value="4f5eccc1d47a981b3ff120e98a3de0988214108fe9dc7b068e95a6b686ada495" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control" version="31.3.0">
-         <artifact name="android-test-plugin-host-emulator-control-31.3.0.jar">
-            <sha256 value="49e7d144620c1f0c1ee507fc74677f48cbd78d42a6cb277a7ee48c6993ad3513" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control" version="31.6.1">
+         <artifact name="android-test-plugin-host-emulator-control-31.6.1.jar">
+            <sha256 value="96b825bb80355d96ef8a582ee60983a5ceee270a29a133ad8ab8096838f72e6d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-emulator-control-31.3.0.module">
-            <sha256 value="17abd77b18474966e1194ceb05a605d89edb3e9acf274e582e9fe00b653ddab1" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-emulator-control-31.6.1.module">
+            <sha256 value="7d6cb82d151c3de93245d87c1c217ef54ac76927d2e74a4ae327372c78b4b542" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control-proto" version="31.3.0">
-         <artifact name="android-test-plugin-host-emulator-control-proto-31.3.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control-proto" version="31.6.1">
+         <artifact name="android-test-plugin-host-emulator-control-proto-31.6.1.jar">
             <sha256 value="aedec5ec4627d898cccdf42d8038db20eba4495753c53d1b0b378734491caf5f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat" version="31.3.0">
-         <artifact name="android-test-plugin-host-logcat-31.3.0.jar">
-            <sha256 value="ec0fea6ccf09f1971e471b9f62045294b479341c6bf2ce276dd76be817033fb4" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat" version="31.6.1">
+         <artifact name="android-test-plugin-host-logcat-31.6.1.jar">
+            <sha256 value="d6c8f75a0897106e52a7c65601f53d9b7ca09c7f1933a7ec514fb35e6ed5109d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-logcat-31.3.0.module">
-            <sha256 value="1c6576d2d1c37b93d50bf263d138ba5d22e94a9991ba859f9a12d8d34672fd7a" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-logcat-31.6.1.module">
+            <sha256 value="bb9cacee8bfba1d18b62c9b65343ab60c48208e87613a8f3f39e481797724e52" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat-proto" version="31.3.0">
-         <artifact name="android-test-plugin-host-logcat-proto-31.3.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat-proto" version="31.6.1">
+         <artifact name="android-test-plugin-host-logcat-proto-31.6.1.jar">
             <sha256 value="9129024bd8e38353bca3eb26dfd8e3628e058d57d6e9d8451ffc35f016751e63" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-retention" version="31.3.0">
-         <artifact name="android-test-plugin-host-retention-31.3.0.jar">
-            <sha256 value="fd056e3b430d4f14afb9d298954558567babf73fb8bef3203d575bc1605a0a0e" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-retention" version="31.6.1">
+         <artifact name="android-test-plugin-host-retention-31.6.1.jar">
+            <sha256 value="2db60f60bc9383e35ffba5d4e1fd0d9c5e22152a17d6fdbbc4ac3cdc4e59be0f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-retention-31.3.0.module">
-            <sha256 value="e29c940eb116e72e25f90d4ed79c5713fc79793e72be173563c2d61b454396bc" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-retention-31.6.1.module">
+            <sha256 value="7899ea0e70302e868915ac031072102bc334cc2df42c198fea918ad7275692b8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-retention-proto" version="31.3.0">
-         <artifact name="android-test-plugin-host-retention-proto-31.3.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-host-retention-proto" version="31.6.1">
+         <artifact name="android-test-plugin-host-retention-proto-31.6.1.jar">
             <sha256 value="3db8ed38ef49b694caea466ae22e3b36cedc9557b3589d0e07c0cdd83294591c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle" version="31.3.0">
-         <artifact name="android-test-plugin-result-listener-gradle-31.3.0.jar">
-            <sha256 value="70105f8ed9b97ba5fff191a7052aad68ad9f9723cfd755d55983927b34c805b2" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle" version="31.6.1">
+         <artifact name="android-test-plugin-result-listener-gradle-31.6.1.jar">
+            <sha256 value="099af6aa4ba4e88c130a63a43fc8b539448eaaefaca33df2e5f57c100b406be4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-result-listener-gradle-31.3.0.module">
-            <sha256 value="63d840c51a4505ee17cfe7b2a39270658afe16ca5813558cc9ef2b5cd9ca6583" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-result-listener-gradle-31.6.1.module">
+            <sha256 value="e763cfc7b58fd4c4fe02a34e3a4d7a30dcd4c2b8ed2c94926c7c4a3d360e8dea" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle-proto" version="31.3.0">
-         <artifact name="android-test-plugin-result-listener-gradle-proto-31.3.0.jar">
+      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle-proto" version="31.6.1">
+         <artifact name="android-test-plugin-result-listener-gradle-proto-31.6.1.jar">
             <sha256 value="cbdf71bca60e14c30e7b2cf4b90f0f0a3e8c138f7cadd874b0d9c0ae082e0274" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="utp-common" version="31.3.0">
-         <artifact name="utp-common-31.3.0.jar">
-            <sha256 value="110f4689ae0a501787687fc96d2995f79378aa44528e9428b5b033d3aaa6cf51" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="utp-common" version="31.6.1">
+         <artifact name="utp-common-31.6.1.jar">
+            <sha256 value="595702fb80bcd4373a1b9b438e5977687cba3c5fba6fa1a2936beef79b13ee9d" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.volley" name="volley" version="1.2.1">
@@ -4570,9 +4481,9 @@
             <sha256 value="e08028131375b357d1d28734e9a4fb4216da84b240641cb3ef7e7c7d628223fc" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.bitbucket.b_c" name="jose4j" version="0.7.0">
-         <artifact name="jose4j-0.7.0.jar">
-            <sha256 value="eb14f69c0395d4a106c6c46fe6dff080c4608ccabc99b1f03933d374383d9bbe" origin="Generated by Gradle"/>
+      <component group="org.bitbucket.b_c" name="jose4j" version="0.9.5">
+         <artifact name="jose4j-0.9.5.jar">
+            <sha256 value="808fb3166f3e67dad9811c331029ab1681242fd52b735bc3f33f281167fcc72e" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.bouncycastle" name="bcpg-jdk18on" version="1.71">
@@ -4580,26 +4491,11 @@
             <sha256 value="57f9ab76a8358abbea90ba1ef8e553b8ae3d07b2337078a4ca20b1cbd48b4ec5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.bouncycastle" name="bcpkix-jdk15on" version="1.67">
-         <artifact name="bcpkix-jdk15on-1.67.jar">
-            <sha256 value="efbca754880ce3922ca47a43c1f0b72c45731450a0ef193b9db33bf4bb38ce5f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.bouncycastle" name="bcpkix-jdk18on" version="1.77">
          <artifact name="bcpkix-jdk18on-1.77.jar">
             <sha256 value="1ac7fe8efd5b2f38cdc165be5a0675734fe44808dab92707201f03a535d6f1b8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.bouncycastle" name="bcprov-jdk15on" version="1.67">
-         <artifact name="bcprov-jdk15on-1.67.jar">
-            <sha256 value="fa0041a36f9f20af3c6b8dbf6eb49a969e2c9cc029049d61acc526ba3247b3ef" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.bouncycastle" name="bcprov-jdk18on" version="1.71">
-         <artifact name="bcprov-jdk18on-1.71.jar">
-            <sha256 value="f3433a97d780fe9fa3dc3d562a41decd59b2e617ce884de9060349ac14750045" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.bouncycastle" name="bcprov-jdk18on" version="1.77">
          <artifact name="bcprov-jdk18on-1.77.jar">
             <sha256 value="dabb98c24d72c9b9f585633d1df9c5cd58d9ad373d0cd681367e6a603a495d58" origin="Generated by Gradle"/>

From e95642136871c5027c6793b0e0f3cbfe30859bfd Mon Sep 17 00:00:00 2001
From: Jonatan Rhodin <jonatan.rhodin@mullvad.net>
Date: Mon, 23 Sep 2024 17:13:49 +0200
Subject: [PATCH 2/2] Add suppressions for unintended CVEs

---
 android/build.gradle.kts                      |  6 ++-
 ...dependency-check-suppression-agp-fixes.xml | 40 +++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 android/config/dependency-check-suppression-agp-fixes.xml

diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index a136aa6fd847..f62e00c87eaf 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -109,7 +109,11 @@ allprojects {
 
     configure<org.owasp.dependencycheck.gradle.extension.DependencyCheckExtension> {
         failBuildOnCVSS = 0F // All severity levels
-        suppressionFile = "${rootProject.projectDir}/config/dependency-check-suppression.xml"
+        suppressionFiles =
+            listOf(
+                "${rootProject.projectDir}/config/dependency-check-suppression.xml",
+                "${rootProject.projectDir}/config/dependency-check-suppression-agp-fixes.xml",
+            )
     }
 
     configure<com.ncorti.ktfmt.gradle.KtfmtExtension> {
diff --git a/android/config/dependency-check-suppression-agp-fixes.xml b/android/config/dependency-check-suppression-agp-fixes.xml
new file mode 100644
index 000000000000..9f402e1ca900
--- /dev/null
+++ b/android/config/dependency-check-suppression-agp-fixes.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
+    <suppress until="2024-12-01Z">
+        <notes><![CDATA[
+        This and all other supressions in this file are for dependencies only used for tests.
+        These should be excluded by the plugin but this behaviour is broken.
+        Added here until we can fix the plugin behaviour.
+        ]]></notes>
+        <packageUrl regex="true">^pkg:maven/io\.netty/.*@.*$</packageUrl>
+        <cve>CVE-2022-41881</cve>
+        <cve>CVE-2023-44487</cve>
+        <cve>CVE-2023-34462</cve>
+        <cve>CVE-2022-24823</cve>
+        <cve>CVE-2024-29025</cve>
+        <cve>CVE-2022-41915</cve>
+    </suppress>
+    <suppress until="2024-12-01Z">
+        <notes><![CDATA[
+        This and all other supressions in this file are for dependencies only used for tests.
+        These should be excluded by the plugin but this behaviour is broken.
+        Added here until we can fix the plugin behaviour.
+        ]]></notes>
+        <packageUrl regex="true">^pkg:maven/com\.google\.protobuf/.*@.*$</packageUrl>
+        <cve>CVE-2024-7254</cve>
+        <cve>CVE-2022-3171</cve>
+        <cve>CVE-2022-3510</cve>
+        <cve>CVE-2021-22569</cve>
+    </suppress>
+    <suppress until="2024-12-01Z">
+        <notes><![CDATA[
+        This and all other supressions in this file are for dependencies only used for tests.
+        These should be excluded by the plugin but this behaviour is broken.
+        Added here until we can fix the plugin behaviour.
+        ]]></notes>
+        <packageUrl regex="true">^pkg:maven/com.google.guava/guava@.*$</packageUrl>
+        <cve>CVE-2023-2976</cve>
+        <cve>CVE-2020-8908</cve>
+    </suppress>
+</suppressions>
+