Merge branch 'update-dependencies-droid-1990'

11 files changed, 210 insertions, 202 deletions

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index a88b9ddcb8..d40b7bd8b2 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -337,7 +337,7 @@ tasks.register("ensureValidVersionCode") {
     }
 }
 
-tasks.create("printVersion") {
+tasks.register("printVersion") {
     doLast {
         println("versionCode=${project.android.defaultConfig.versionCode}")
         println("versionName=${project.android.defaultConfig.versionName}")
diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
index 50f37d11d8..dbbf39e108 100644
--- a/android/gradle/libs.versions.toml
+++ b/android/gradle/libs.versions.toml
@@ -22,19 +22,19 @@ androidx-test = "1.6.1"
 androidx-testmonitor = "1.7.2"
 androidx-testorchestrator = "1.5.1"
 androidx-testrunner = "1.6.2"
-androidx-uiautomator = "2.4.0-alpha01"
+androidx-uiautomator = "2.4.0-alpha02"
 androidx-tv = "1.0.0"
 
 # Arrow
-arrow = "2.1.0"
+arrow = "2.1.1"
 
 # Compose
 compose = "1.8.0"
-compose-destinations = "2.1.0"
+compose-destinations = "2.2.0"
 compose-constraintlayout = "1.1.1"
 compose-material3 = "1.3.2"
 compose-material-icons-extended = "1.7.8"
-drawablepainter = "0.37.2"
+drawablepainter = "0.37.3"
 
 # Update suppression for 'InvalidPackage' in config/lint.xml
 grpc = "1.72.0"
@@ -53,9 +53,9 @@ ktor = "3.0.3"
 # Bump kotlin and kotlin-ksp together, find matching release here:
 # https://github.com/google/ksp/releases
 kotlin = "2.1.20"
-kotlin-ksp = "2.1.20-2.0.0"
+kotlin-ksp = "2.1.20-2.0.1"
 kotlinx = "1.10.2"
-kotlinx-serialization = "2.1.20"
+kotlinx-serialization = "1.8.1"
 
 # Protobuf
 protobuf-gradle-plugin = "0.9.5"
@@ -152,7 +152,6 @@ kotlin-native-prebuilt = { module = "org.jetbrains.kotlin:kotlin-native-prebuilt
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx" }
-kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
 
 # Ktor
 ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
@@ -191,7 +190,7 @@ kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref =
 kotlin-ksp = { id = "com.google.devtools.ksp", version.ref = "kotlin-ksp" }
 
 # Kotlinx
-kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinx-serialization" }
+kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 
 # Protobuf
 protobuf-core = { id = "com.google.protobuf", version.ref = "protobuf-gradle-plugin" }
diff --git a/android/gradle/verification-metadata.keys.xml b/android/gradle/verification-metadata.keys.xml
index e108e91a04..0d2c93d1d0 100644
--- a/android/gradle/verification-metadata.keys.xml
+++ b/android/gradle/verification-metadata.keys.xml
@@ -44,6 +44,7 @@
             <trusting group="androidx.datastore"/>
             <trusting group="androidx.navigation"/>
             <trusting group="^androidx[.]compose($|([.].*))" regex="true"/>
+            <trusting group="^androidx[.]test($|([.].*))" regex="true"/>
             <trusting group="^com[.]android($|([.].*))" regex="true"/>
          </trusted-key>
          <trusted-key id="0F07D1201BDDAB67CFB84EB479752DB6C966F0B8" group="com.google.android" name="annotations" version="4.1.1.4"/>
@@ -105,7 +106,10 @@
          <trusted-key id="600EA202B1EC682F4A788E5AAC7A514BC9F9BB70" group="io.opencensus"/>
          <trusted-key id="60200AC4AE761F1614D6C46766D68DAA073BE985" group="org.slf4j"/>
          <trusted-key id="648190996EC0930A6D7D49A978178478013521D0" group="com.facebook"/>
-         <trusted-key id="64B9B09F164AA0BF88742EB61188B69F6D6259CA" group="com.google.accompanist" name="accompanist-drawablepainter" version="0.37.2"/>
+         <trusted-key id="64B9B09F164AA0BF88742EB61188B69F6D6259CA">
+            <trusting group="com.google.accompanist" name="accompanist-drawablepainter" version="0.37.2"/>
+            <trusting group="com.google.accompanist" name="accompanist-drawablepainter" version="0.37.3"/>
+         </trusted-key>
          <trusted-key id="694621A7227D8D5289699830ABE9F3126BB741C1" group="^com[.]google($|([.].*))" regex="true"/>
          <trusted-key id="696B6199A2A9D8C29CE78CC0D041CAD2E452550F" group="com.google.protobuf"/>
          <trusted-key id="6CE63E2E1685215A995BB3020B99A4AB5DB59AA2" group="io.arrow-kt"/>
@@ -148,6 +152,7 @@
             <trusting group="androidx.annotation"/>
             <trusting group="androidx.appcompat"/>
             <trusting group="androidx.collection"/>
+            <trusting group="androidx.concurrent"/>
             <trusting group="androidx.core"/>
             <trusting group="androidx.databinding"/>
             <trusting group="androidx.fragment"/>
diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml
index b77adc58ad..88cb8dae0a 100644
--- a/android/gradle/verification-metadata.xml
+++ b/android/gradle/verification-metadata.xml
@@ -4,7 +4,7 @@
    https://docs.gradle.org/current/userguide/dependency_verification.html
 
    The easiest way to update this file is to run the following script:
-   <repository-root>/android/scripts/update-lockfile.sh
+   <repository-root>/android/scripts/lockfile -u
 
    The following trust group is only used for GitHub Actions: com.github.burrunan.multicache
 
@@ -1240,6 +1240,14 @@
             <sha256 value="77639a0b051e22510bad93affcea0ebd781ef124bf9b7621a95749937bcfcdfd" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.concurrent" name="concurrent-futures" version="1.2.0">
+         <artifact name="concurrent-futures-1.2.0.jar">
+            <sha256 value="4810315a798690b5d3bb40c92bcd41c045fd2c36bbfc50b27cbac3d6a0eda190" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="concurrent-futures-1.2.0.module">
+            <sha256 value="afd7094d3a07422be2e991bc87048542ae9724a5c42bd54b5cae3029c7970a1d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.concurrent" name="concurrent-futures-ktx" version="1.1.0">
          <artifact name="concurrent-futures-ktx-1.1.0.jar">
             <sha256 value="1968bf52039e38636aa6f114cd17d7256919d1e8997417716fef9d1da1f24d85" origin="Generated by Gradle"/>
@@ -1248,6 +1256,14 @@
             <sha256 value="69b79724566d49140846700690b8d2165231c577e93e66726a443e8f976bbe19" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.concurrent" name="concurrent-futures-ktx" version="1.2.0">
+         <artifact name="concurrent-futures-ktx-1.2.0.jar">
+            <sha256 value="e1f3e17bb4358ccd6c77ca45f70635c9aba237261f19eaa4f64a0218c00e2a3e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="concurrent-futures-ktx-1.2.0.module">
+            <sha256 value="823f469acd984adfd30b3d0a577eb4f7796a03742a526ef70c1583b594b43b80" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.constraintlayout" name="constraintlayout-compose" version="1.1.1">
          <artifact name="constraintlayout-compose-1.1.1.module">
             <sha256 value="0e855b3cf7210648017ddaa17e7d133e84de9111f52536d8056d89e3b6ebbe5e" origin="Generated by Gradle"/>
@@ -1967,44 +1983,44 @@
             <sha256 value="11f735cb3b55c458d470bed9e25254375b518b4b1bad6926783a7026db0f5025" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.navigation" name="navigation-common" version="2.8.8">
-         <artifact name="navigation-common-2.8.8.aar">
-            <sha256 value="c7a9851d33f2c71728220b14b0f03825720ead4ca7973fb87f6569e336b89204" origin="Generated by Gradle"/>
+      <component group="androidx.navigation" name="navigation-common" version="2.8.9">
+         <artifact name="navigation-common-2.8.9.aar">
+            <sha256 value="3541faa3a231c5834149648870e57e3385ce5be31ba659b70ab278319f65b9ff" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="navigation-common-2.8.8.module">
-            <sha256 value="409931bf6327bd9ffbda7879f423a53f068b2291524eeb7075754535d94cd69c" origin="Generated by Gradle"/>
+         <artifact name="navigation-common-2.8.9.module">
+            <sha256 value="3863de56ae29e7b291b5ced2baff99074030e6c279818cc921990b72faab09c8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.navigation" name="navigation-common-ktx" version="2.8.8">
-         <artifact name="navigation-common-ktx-2.8.8.aar">
-            <sha256 value="526207fa71b2ec9d40635b3bac79868184d998ea4a77ed86726d935d098a2f12" origin="Generated by Gradle"/>
+      <component group="androidx.navigation" name="navigation-common-ktx" version="2.8.9">
+         <artifact name="navigation-common-ktx-2.8.9.aar">
+            <sha256 value="aaa35fa240544d1d2ff459c5c31c147637105370a8ef403071ec5ca060029cf4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="navigation-common-ktx-2.8.8.module">
-            <sha256 value="e12111e4dcb0d3f2de2bec26da2a4ae51f6b13eb4443b6ed2d220954cddb4fa6" origin="Generated by Gradle"/>
+         <artifact name="navigation-common-ktx-2.8.9.module">
+            <sha256 value="adf807e2610c10fda0582459816199a68be0b2bdd1d5d5cd00bc08be7d4461ea" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.navigation" name="navigation-compose" version="2.8.8">
-         <artifact name="navigation-compose-2.8.8.aar">
-            <sha256 value="b4f5774748acac050c3ad9eff3d38215bff5d284b2fc8853e18f87743aed0593" origin="Generated by Gradle"/>
+      <component group="androidx.navigation" name="navigation-compose" version="2.8.9">
+         <artifact name="navigation-compose-2.8.9.aar">
+            <sha256 value="d805b7340a2c1794a8baa93d0623ae502e22921679a3aa8422a1a6b855bad4c2" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="navigation-compose-2.8.8.module">
-            <sha256 value="b03a27eb5b0480bb277174330d0c54ec877d9e5e4f6a252bce2536f698a8a6a1" origin="Generated by Gradle"/>
+         <artifact name="navigation-compose-2.8.9.module">
+            <sha256 value="f3f1ccaeda11d6121bc170c3c2df2d5deed5eb79bfbe463f011fab1bc94d64ea" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.navigation" name="navigation-runtime" version="2.8.8">
-         <artifact name="navigation-runtime-2.8.8.aar">
-            <sha256 value="a0da9bad3eac93890fd7fd77238f137ae27f34b9372487d8edcd1d8cfabad9ea" origin="Generated by Gradle"/>
+      <component group="androidx.navigation" name="navigation-runtime" version="2.8.9">
+         <artifact name="navigation-runtime-2.8.9.aar">
+            <sha256 value="3f24fb9da8786c6c5e356a86d77f63e2ce3473851cfc28d931f15157a0c35a5c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="navigation-runtime-2.8.8.module">
-            <sha256 value="1cad971642021cc95208b08d9c7bccae7463bec4ba5449fe468984f00c8347c6" origin="Generated by Gradle"/>
+         <artifact name="navigation-runtime-2.8.9.module">
+            <sha256 value="59553eba4a8bb9b92c3a82367c5dc34f9c442fcc04b7a903f84647352d1c97a4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.navigation" name="navigation-runtime-ktx" version="2.8.8">
-         <artifact name="navigation-runtime-ktx-2.8.8.aar">
-            <sha256 value="cbed4ff0153b63a08053c94652e0aa793fbd9bb617b9b60d84681eef8c7c05ca" origin="Generated by Gradle"/>
+      <component group="androidx.navigation" name="navigation-runtime-ktx" version="2.8.9">
+         <artifact name="navigation-runtime-ktx-2.8.9.aar">
+            <sha256 value="62a9f256528e8505f276f06e5a7bea3ae4b3c56a13aabf54ff69e410750aa3cb" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="navigation-runtime-ktx-2.8.8.module">
-            <sha256 value="5513bcfe4a59ffb9a419236bb38cdc758bcd1d4e6ce632f974758983c6702172" origin="Generated by Gradle"/>
+         <artifact name="navigation-runtime-ktx-2.8.9.module">
+            <sha256 value="2421e09be7bf3da2c520155e670385712f5194a529dc71cb657e04ea53912619" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.profileinstaller" name="profileinstaller" version="1.3.1">
@@ -2078,6 +2094,11 @@
             <sha256 value="7a7af31c21785ddb7c4319c838847e6d4d9b5bb531f3a951481ec3b98780bf51" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.test" name="core" version="1.7.0-alpha03">
+         <artifact name="core-1.7.0-alpha03.aar">
+            <sha256 value="c216cf35afe5230bbcc679b406e274c8e0d48bdfa29ab4c27330bc8b04ab205c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.test" name="monitor" version="1.7.1">
          <artifact name="monitor-1.7.1.aar">
             <sha256 value="b31e7d7a3564f9d5504c86bed9bfb8fee429feb3d1b81ffd1f2c149948c51d19" origin="Generated by Gradle"/>
@@ -2088,6 +2109,11 @@
             <sha256 value="868cc120d10d024b886fa157e1e1eaee0e6a8e5d55e7f765ef41d8fc0fea775b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.test" name="monitor" version="1.8.0-alpha03">
+         <artifact name="monitor-1.8.0-alpha03.aar">
+            <sha256 value="54d1e9c728765060e48035c5f9771e62b14dc78c3e4c0313ec9812cc0e98268b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.test" name="orchestrator" version="1.5.1">
          <artifact name="orchestrator-1.5.1.apk">
             <sha256 value="417ec891e0f548870ab15675b7610061af04ddd3fd17f5a5954b9c00fb38ba4f" origin="Generated by Gradle"/>
@@ -2133,12 +2159,12 @@
             <sha256 value="69893d87f3682a2abf95757bfa57c062a491d34f316cb55dc99a022e9c1dbbbe" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.test.uiautomator" name="uiautomator" version="2.4.0-alpha01">
-         <artifact name="uiautomator-2.4.0-alpha01.aar">
-            <sha256 value="fb3f792d4bb5c0a099ab5bdc106c006098164e004829a4142496beadfa73339b" origin="Generated by Gradle"/>
+      <component group="androidx.test.uiautomator" name="uiautomator" version="2.4.0-alpha02">
+         <artifact name="uiautomator-2.4.0-alpha02.aar">
+            <sha256 value="d9c74d8ce031e4d5e2d8f39705ab3b8cf8b6d1ddf0e13df191ebae2b8a7f4169" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="uiautomator-2.4.0-alpha01.module">
-            <sha256 value="107a94cadd0967dc182265280202350e9cbe38854544088e350cd97013344b75" origin="Generated by Gradle"/>
+         <artifact name="uiautomator-2.4.0-alpha02.module">
+            <sha256 value="af726a4b23e0f9e681eaab882e04fa5b465991c4d97b6703c2cda849b4bed08c" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.tracing" name="tracing" version="1.0.0">
@@ -2783,12 +2809,12 @@
             <sha256 value="a8e32e17575d0188c1f3e2e57bb95db09793883c8853fde828b63ecb1f99a63a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.accompanist" name="accompanist-drawablepainter" version="0.37.2">
-         <artifact name="accompanist-drawablepainter-0.37.2.aar">
-            <sha256 value="f65d76ba4d169186d79015603b680571224c1df7727864b8a796315a960595a8" origin="Generated by Gradle"/>
+      <component group="com.google.accompanist" name="accompanist-drawablepainter" version="0.37.3">
+         <artifact name="accompanist-drawablepainter-0.37.3.aar">
+            <sha256 value="0453c4c54ec3ef13ae18b83300f1d2a078b1ca92d3a3781437516630e3b850df" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="accompanist-drawablepainter-0.37.2.module">
-            <sha256 value="c4cd79129d9809d40296a8ead6b33770287e192daa5ce1e316fab6a53bc64976" origin="Generated by Gradle"/>
+         <artifact name="accompanist-drawablepainter-0.37.3.module">
+            <sha256 value="33f3b5ff498a4aca7453735c731ef3a3e5f714191d1232a28de83f76d342d556" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.google.android" name="annotations" version="4.1.1.4">
@@ -2896,22 +2922,14 @@
             <sha256 value="f1dd23f8ae34a8e91366723991ead0d6499d1a3e9163ce550c200b02d76a872b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.devtools.ksp" name="symbol-processing" version="2.1.20-2.0.0">
-         <artifact name="symbol-processing-2.1.20-2.0.0.jar">
-            <sha256 value="92e919b76b9c18bda92c26856724bc61a6c441523abe1281905bd2b1827d303f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.google.devtools.ksp" name="symbol-processing-aa-embeddable" version="2.1.20-2.0.0">
-         <artifact name="symbol-processing-aa-embeddable-2.1.20-2.0.0.jar">
-            <sha256 value="1134f5607f6a6a3e120bc05d329c0fd693fd68900ef255dac8a47d7932c399d0" origin="Generated by Gradle"/>
+      <component group="com.google.devtools.ksp" name="symbol-processing" version="2.1.20-2.0.1">
+         <artifact name="symbol-processing-2.1.20-2.0.1.jar">
+            <sha256 value="b2ddd2f3b6306ccbb4c5b7619783f641bc7b2e93dca1ac9608dafa581e0d7300" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.devtools.ksp" name="symbol-processing-api" version="2.1.10-1.0.31">
-         <artifact name="symbol-processing-api-2.1.10-1.0.31.jar">
-            <sha256 value="3170c52186cb2096a47f538f09dd41e49ca1b3334d69ea83d6493d6f0365b7b4" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="symbol-processing-api-2.1.10-1.0.31.module">
-            <sha256 value="6445d14b0910800b7efb62c7b0722abaed3373a143fc3fc0111cd6952173ed38" origin="Generated by Gradle"/>
+      <component group="com.google.devtools.ksp" name="symbol-processing-aa-embeddable" version="2.1.20-2.0.1">
+         <artifact name="symbol-processing-aa-embeddable-2.1.20-2.0.1.jar">
+            <sha256 value="ed26e97d80f51df9e9dcf1b72eb15401b092fb219258f5a25f5c5e5def4ac551" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.google.devtools.ksp" name="symbol-processing-api" version="2.1.20-2.0.0">
@@ -2922,25 +2940,33 @@
             <sha256 value="6f67242a8b0b8b6d23c9d1e8243f896837e563a900487c11f05e18d31690cf19" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.devtools.ksp" name="symbol-processing-cmdline" version="2.1.20-2.0.0">
-         <artifact name="symbol-processing-cmdline-2.1.20-2.0.0.jar">
-            <sha256 value="130e5cc0cad7d7a3d81ab467e7e08f6d27c396e848d9a2120a23b495923013cc" origin="Generated by Gradle"/>
+      <component group="com.google.devtools.ksp" name="symbol-processing-api" version="2.1.20-2.0.1">
+         <artifact name="symbol-processing-api-2.1.20-2.0.1.jar">
+            <sha256 value="8ecdaf607a1059a637f1ab84f0cc82a57af221aaa81728bf9ca18ffbc7aef830" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="symbol-processing-api-2.1.20-2.0.1.module">
+            <sha256 value="8d5396747de2037f44d15bf490a8d2288da194134bd43d34e4f2414fa0bca663" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.devtools.ksp" name="symbol-processing-cmdline" version="2.1.20-2.0.1">
+         <artifact name="symbol-processing-cmdline-2.1.20-2.0.1.jar">
+            <sha256 value="6236ef4783b661e2bdded86d0d44fb517b9e67c43f2744b0837bd02b1e904a70" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.devtools.ksp" name="symbol-processing-common-deps" version="2.1.20-2.0.0">
-         <artifact name="symbol-processing-common-deps-2.1.20-2.0.0.jar">
-            <sha256 value="b07d097e3cf8415ce03d683ca42b133b9d6581d0dedd039a470df0c269b5cd3d" origin="Generated by Gradle"/>
+      <component group="com.google.devtools.ksp" name="symbol-processing-common-deps" version="2.1.20-2.0.1">
+         <artifact name="symbol-processing-common-deps-2.1.20-2.0.1.jar">
+            <sha256 value="c1fa8ecc497a021b1c45e465ba756f33efcc537867d858a65c6ae59384bec07f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="symbol-processing-common-deps-2.1.20-2.0.0.module">
-            <sha256 value="a583b986875031f2b8bb6e6e3473c6c6c8d02998b6231725e794c170ed7d4f8e" origin="Generated by Gradle"/>
+         <artifact name="symbol-processing-common-deps-2.1.20-2.0.1.module">
+            <sha256 value="f89d4a7e76bebadd5b8c0f3560e9d2d2cfbbdac6cbd2ba63ef8b1861eaef89d9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.devtools.ksp" name="symbol-processing-gradle-plugin" version="2.1.20-2.0.0">
-         <artifact name="symbol-processing-gradle-plugin-2.1.20-2.0.0.jar">
-            <sha256 value="91f76e9bb20abbd2679f4e83ccf5e31f7eaa50c01261eb6d8ec2415ecf9ada3e" origin="Generated by Gradle"/>
+      <component group="com.google.devtools.ksp" name="symbol-processing-gradle-plugin" version="2.1.20-2.0.1">
+         <artifact name="symbol-processing-gradle-plugin-2.1.20-2.0.1.jar">
+            <sha256 value="fd03b1dca64a343ae6d3e05f52640680ca631523b704a15b37387c8e6decb4c0" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="symbol-processing-gradle-plugin-2.1.20-2.0.0.module">
-            <sha256 value="f28b1d7b565e836850c713f3efe1127f795ed411745ef1fc4712fd5f22277d3a" origin="Generated by Gradle"/>
+         <artifact name="symbol-processing-gradle-plugin-2.1.20-2.0.1.module">
+            <sha256 value="84a99e5cfee8a68b917f44d1496339f20fbbb19c574af8008542ad2b398af8d9" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.google.errorprone" name="error_prone_annotations" version="2.18.0">
@@ -3493,132 +3519,132 @@
             <sha256 value="edcefb0416af86c7848ef10c7d4417d3db2f32bdf5854864aca9d05d76eb6ae5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.arrow-kt" name="arrow-annotations" version="2.1.0">
-         <artifact name="arrow-annotations-2.1.0.module">
-            <sha256 value="b2fe7ec1f16feb60247e1f719036bca7033ca367e1210db6e42bc6c5b00f38ca" origin="Generated by Gradle"/>
+      <component group="io.arrow-kt" name="arrow-annotations" version="2.1.1">
+         <artifact name="arrow-annotations-2.1.1.module">
+            <sha256 value="bc2b756432cf450ea1998c9f396f0239f3cba42f108a61bf184e0eba7f17ff47" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="arrow-annotations-metadata-2.1.0.jar">
+         <artifact name="arrow-annotations-metadata-2.1.1.jar">
             <sha256 value="a50ba24a9dd3005df36f2d4492e1e15c51e671645c3fac6f11c785df41e607a3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.arrow-kt" name="arrow-annotations-android" version="2.1.0">
-         <artifact name="arrow-annotations-android-2.1.0.module">
-            <sha256 value="25b235b013fb707e00765c6c4421c8cb9aeeebf90d446f6d8ee091b0f6b3d8fd" origin="Generated by Gradle"/>
+      <component group="io.arrow-kt" name="arrow-annotations-android" version="2.1.1">
+         <artifact name="arrow-annotations-android-2.1.1.module">
+            <sha256 value="efa9f23730531080fe1c0ba5d139ecf8b37d6c1f472fa6b9669819e36a2f4a91" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="arrow-annotations-release.aar">
-            <sha256 value="9d76dc6e8d53b9f96f70942b6fbafcedff65f43409c56249b75b64de54fd40a2" origin="Generated by Gradle"/>
+            <sha256 value="4844f8c6041235980e0b6338ea79a9686e678025c58a76c9d94efb45807b7057" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.arrow-kt" name="arrow-annotations-jvm" version="2.1.0">
-         <artifact name="arrow-annotations-jvm-2.1.0.jar">
-            <sha256 value="9153ef899a167b63177859a21479a4528323a4e1565fb522f2dd33e25960ece6" origin="Generated by Gradle"/>
+      <component group="io.arrow-kt" name="arrow-annotations-jvm" version="2.1.1">
+         <artifact name="arrow-annotations-jvm-2.1.1.jar">
+            <sha256 value="147a03b61eb03f5f22a51c003a9b466fa527bb5604908427201fe159ef0b35b4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="arrow-annotations-jvm-2.1.0.module">
-            <sha256 value="80880aeab6e47c4e8a76b7941df58abb0042a9bbf36dc96bb3bc4b8e6765d92b" origin="Generated by Gradle"/>
+         <artifact name="arrow-annotations-jvm-2.1.1.module">
+            <sha256 value="0128bcdb4b3174230fd5ee75bed83b0b4a4ca7d729249a530c14748c7c43c756" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.arrow-kt" name="arrow-atomic" version="2.1.0">
-         <artifact name="arrow-atomic-2.1.0.module">
-            <sha256 value="68444e938c4d2e6b7bf72d3eb8db1bbc6f24b0f52c1e58d90ded9ed7eb4c0b5a" origin="Generated by Gradle"/>
+      <component group="io.arrow-kt" name="arrow-atomic" version="2.1.1">
+         <artifact name="arrow-atomic-2.1.1.module">
+            <sha256 value="d30190a9ae863a8d8d57b0d174353891f5c56b468d09e5f1037415340ec51116" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="arrow-atomic-metadata-2.1.0.jar">
-            <sha256 value="afe7b1549317940906105d872ae63f88d3ab89c63340ca6a6c13d789a9bf0082" origin="Generated by Gradle"/>
+         <artifact name="arrow-atomic-metadata-2.1.1.jar">
+            <sha256 value="93b55dc6ac0ccba81327294a39a9bc31e2abd5960471487c939047a65887ecb6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.arrow-kt" name="arrow-atomic-android" version="2.1.0">
-         <artifact name="arrow-atomic-android-2.1.0.module">
-            <sha256 value="e06104c7ffc54016c580e71c43459cf789843b7cc4348bc3bf817f0790198421" origin="Generated by Gradle"/>
+      <component group="io.arrow-kt" name="arrow-atomic-android" version="2.1.1">
+         <artifact name="arrow-atomic-android-2.1.1.module">
+            <sha256 value="ed50693e79a0e05359b483777aa371a0ea6224c00b4e6aca993aff08f5b72e7f" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="arrow-atomic-release.aar">
-            <sha256 value="bc92fa3cd0eb3b6c617602d474400c0ac923aa3cb8412ea5c21070ad1aa281b4" origin="Generated by Gradle"/>
+            <sha256 value="c6f96d10e8fd2a6c687f32b79f02d58169d026c013cd197000642167630bb266" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.arrow-kt" name="arrow-atomic-jvm" version="2.1.0">
-         <artifact name="arrow-atomic-jvm-2.1.0.jar">
-            <sha256 value="7660f606b099e9bb9335d5f410d25379681fb8281056292f1b461add401842bf" origin="Generated by Gradle"/>
+      <component group="io.arrow-kt" name="arrow-atomic-jvm" version="2.1.1">
+         <artifact name="arrow-atomic-jvm-2.1.1.jar">
+            <sha256 value="50b4267e8fc09a0a5009cd0eeedf7de81a6e399b09132fb6eba60fa56e7f36be" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="arrow-atomic-jvm-2.1.0.module">
-            <sha256 value="ab50f32c0c81d2caba21ba6252229e5fd71f8cf9ea175c6ad35913d1408232f9" origin="Generated by Gradle"/>
+         <artifact name="arrow-atomic-jvm-2.1.1.module">
+            <sha256 value="5eaeb0e1ef76b5f7bd295d5f37c816c162937975aec428f2b4c445931fcbf0ce" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.arrow-kt" name="arrow-core" version="2.1.0">
-         <artifact name="arrow-core-2.1.0.module">
-            <sha256 value="0bb12a8f64b11094cf372e6a6b57f353ca87085a70c6e518b5e597f64abf6042" origin="Generated by Gradle"/>
+      <component group="io.arrow-kt" name="arrow-core" version="2.1.1">
+         <artifact name="arrow-core-2.1.1.module">
+            <sha256 value="e9ca3f79cdca4d6d9bdd7068f9be7709299e1bb4ba78856fca8bb3b6e5906457" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="arrow-core-metadata-2.1.0.jar">
-            <sha256 value="c8ffe05f7999a846e84997a817167bd8b1abb9c092a5be077aa33bab1579aad4" origin="Generated by Gradle"/>
+         <artifact name="arrow-core-metadata-2.1.1.jar">
+            <sha256 value="93867fc3b8104e698a3a3f852565f0820af217fd481eff1d7733c1ed5248b0cb" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.arrow-kt" name="arrow-core-android" version="2.1.0">
-         <artifact name="arrow-core-android-2.1.0.module">
-            <sha256 value="d7e905c08fc09ee174f6dc052836d6eb3f95c69b9f0228fc25edacda468a36ea" origin="Generated by Gradle"/>
+      <component group="io.arrow-kt" name="arrow-core-android" version="2.1.1">
+         <artifact name="arrow-core-android-2.1.1.module">
+            <sha256 value="98b2fce7c89c021a9fdd50d6ed4331fceb532829a0b09182fbeca4a3cefaa88c" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="arrow-core-release.aar">
-            <sha256 value="33669b027ae86bf93cd1f164cc5cd7737b8b8efc3c56869b4321c0224c85a697" origin="Generated by Gradle"/>
+            <sha256 value="955d7c9a116eb1f795fbbc654356f20d9903fe8e51fddfa4ac683f425f30b391" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.arrow-kt" name="arrow-core-jvm" version="2.1.0">
-         <artifact name="arrow-core-jvm-2.1.0.jar">
-            <sha256 value="2aad6edd09924d277dc331f35f245117ee186e4021eee31b405c7d4d809b7d6c" origin="Generated by Gradle"/>
+      <component group="io.arrow-kt" name="arrow-core-jvm" version="2.1.1">
+         <artifact name="arrow-core-jvm-2.1.1.jar">
+            <sha256 value="d0a7297dee2eb10b44ff3fb3bf8c8b88b3e3987081bc41c5ef054d9e417f8aa9" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="arrow-core-jvm-2.1.0.module">
-            <sha256 value="bf5241bb2b22e6a2e414f6a618d4b337b7c486635b77ca6100c41feccd273042" origin="Generated by Gradle"/>
+         <artifact name="arrow-core-jvm-2.1.1.module">
+            <sha256 value="7f42f0d23ff29d84cebc3536196ff2246f3a86f240d994faccada59e2ac3c000" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.arrow-kt" name="arrow-optics" version="2.1.0">
-         <artifact name="arrow-optics-2.1.0.module">
-            <sha256 value="455c4bc32512efd2b849b348233701af276622347df8e62fe591348201a13396" origin="Generated by Gradle"/>
+      <component group="io.arrow-kt" name="arrow-optics" version="2.1.1">
+         <artifact name="arrow-optics-2.1.1.module">
+            <sha256 value="8289a1a81dfb15e79952a7eb2c68b80f6ad7b5ec0e8e518e62ccc9bc61784ffd" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="arrow-optics-metadata-2.1.0.jar">
+         <artifact name="arrow-optics-metadata-2.1.1.jar">
             <sha256 value="90ff8d7f9a18f9b645debbfb4a9ad7ce29011e2b15eed3c91ed8e991f23a930c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.arrow-kt" name="arrow-optics-android" version="2.1.0">
-         <artifact name="arrow-optics-android-2.1.0.module">
-            <sha256 value="ef0cb86d43feca5b56a0efb4e4f6db0f9a7802447cdb72cef261e5edd9af5723" origin="Generated by Gradle"/>
+      <component group="io.arrow-kt" name="arrow-optics-android" version="2.1.1">
+         <artifact name="arrow-optics-android-2.1.1.module">
+            <sha256 value="516cba120f26163aa8b206c1c341d9d656510c44d39894d66712698ea2c75e7b" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="arrow-optics-release.aar">
-            <sha256 value="2b3658a46942ca9b36be5e0478428a6e37af0e088cec8c089f79dd4491b6353f" origin="Generated by Gradle"/>
+            <sha256 value="1cc4b00a028f7c2531310bd35493dc395bd49fd8e8e03a6722fe8b64d88e96be" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.arrow-kt" name="arrow-optics-jvm" version="2.1.0">
-         <artifact name="arrow-optics-jvm-2.1.0.jar">
-            <sha256 value="a0c2211880e173cca03060971a73cf368286fd9ddf0afb55c997424b014b8f7d" origin="Generated by Gradle"/>
+      <component group="io.arrow-kt" name="arrow-optics-jvm" version="2.1.1">
+         <artifact name="arrow-optics-jvm-2.1.1.jar">
+            <sha256 value="96f0729df501afa8b22fbbd8561e9fbb809c093c7b47a3070908be220c43cb78" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="arrow-optics-jvm-2.1.0.module">
-            <sha256 value="24fec4bbc9e9e1499d2a220458d9205e6500059659346480b763ec96c0bed2d7" origin="Generated by Gradle"/>
+         <artifact name="arrow-optics-jvm-2.1.1.module">
+            <sha256 value="a0e53caf36cc5f0253c52ae6c5ae9f26b37b2ffd9a4fbcc977467075aef53216" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.arrow-kt" name="arrow-optics-ksp-plugin" version="2.1.0">
-         <artifact name="arrow-optics-ksp-plugin-2.1.0.jar">
-            <sha256 value="af86a096b69c8ebc805fb6bb8e19736e57339ebc1bf62ca508ce5357aab21cc1" origin="Generated by Gradle"/>
+      <component group="io.arrow-kt" name="arrow-optics-ksp-plugin" version="2.1.1">
+         <artifact name="arrow-optics-ksp-plugin-2.1.1.jar">
+            <sha256 value="cd004fd9bf79a401a7656b1dade0a8d9e2aebf2b6ab491b9d4f2edf586f2002b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="arrow-optics-ksp-plugin-2.1.0.module">
-            <sha256 value="6b91ce7cbf171049afa20c41aee73aa819ff6f561c1f66f21ab016768ffcbb78" origin="Generated by Gradle"/>
+         <artifact name="arrow-optics-ksp-plugin-2.1.1.module">
+            <sha256 value="75bb5abd8ca029f6ff9ed26020e4181190d8ecbef3667c0815e89d4defa4952f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.arrow-kt" name="arrow-resilience" version="2.1.0">
-         <artifact name="arrow-resilience-2.1.0.module">
-            <sha256 value="a28f1c1aa097eb29fa405ed4fd04073706b50eb9fa00f8f01eda3ed4ab769b4d" origin="Generated by Gradle"/>
+      <component group="io.arrow-kt" name="arrow-resilience" version="2.1.1">
+         <artifact name="arrow-resilience-2.1.1.module">
+            <sha256 value="f87645db64996f0c2a2ac51ce95563a2e495aa4a59128497a446e62674483d29" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="arrow-resilience-metadata-2.1.0.jar">
-            <sha256 value="2514ebe8d692d93d2c535c4c4fadbdab9069f12b836c230a286f544f1277e9f5" origin="Generated by Gradle"/>
+         <artifact name="arrow-resilience-metadata-2.1.1.jar">
+            <sha256 value="f64d53983ef75fd03feb537f98bf3403a61228b8130d955e9e7f4faedf668f8a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.arrow-kt" name="arrow-resilience-android" version="2.1.0">
-         <artifact name="arrow-resilience-android-2.1.0.module">
-            <sha256 value="3347ac86e0435056b898ffe83169b5a69839400058a692060dfec1bf0ad2ee53" origin="Generated by Gradle"/>
+      <component group="io.arrow-kt" name="arrow-resilience-android" version="2.1.1">
+         <artifact name="arrow-resilience-android-2.1.1.module">
+            <sha256 value="788feb2643f70fd6b168751441d5f801ee98a7207b7a0e4d49637365fa9cfd0c" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="arrow-resilience-release.aar">
-            <sha256 value="5171ad28a273467c026acdbe2ee794099cb1d80b287b25925c68a0fcc0360af0" origin="Generated by Gradle"/>
+            <sha256 value="7e8fc5b06232fc41879c8e726b33ad7489c3d9e4855c40a77f5e03dfba62cb5e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.arrow-kt" name="arrow-resilience-jvm" version="2.1.0">
-         <artifact name="arrow-resilience-jvm-2.1.0.jar">
-            <sha256 value="a53071b69247668028df6d8f216d2ad3f42c1376c417aff42ab863e98d226dcf" origin="Generated by Gradle"/>
+      <component group="io.arrow-kt" name="arrow-resilience-jvm" version="2.1.1">
+         <artifact name="arrow-resilience-jvm-2.1.1.jar">
+            <sha256 value="ea1e7c1d3298b07926fbd9d7db6a38de268fa6138f3e31b6b0815707c81ab065" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="arrow-resilience-jvm-2.1.0.module">
-            <sha256 value="560279f76a4768e1341ad676e250ec904df4508ed3b9aa7b95e3fcbc8e0ed841" origin="Generated by Gradle"/>
+         <artifact name="arrow-resilience-jvm-2.1.1.module">
+            <sha256 value="81e377250a99a7fa8a4660d4ff778ad3843c6df841b2cb5af58681fa6158d6dc" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.exoquery" name="pprint-kotlin" version="1.1.0">
@@ -3655,28 +3681,28 @@
             <sha256 value="964c69e3a23a892db2778ae6806aa1d42f81230032bd8e4982dc8620582ee6b7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.github.raamcosta.compose-destinations" name="codegen" version="2.1.0">
-         <artifact name="codegen-2.1.0.jar">
-            <sha256 value="ead8a72ffe6b9a3b6357de7fd029017e28ce66f38f3d41646129c30651499911" origin="Generated by Gradle"/>
+      <component group="io.github.raamcosta.compose-destinations" name="codegen" version="2.2.0">
+         <artifact name="codegen-2.2.0.jar">
+            <sha256 value="bc54890c2adb6db63c02666e834ccef550b25f2c2f0c1be1f7460443507196f5" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="codegen-2.1.0.module">
-            <sha256 value="c5817c2edf156c202612d9f8ed698913c2041cb38b6470d8ff7c7262812a443f" origin="Generated by Gradle"/>
+         <artifact name="codegen-2.2.0.module">
+            <sha256 value="fa2e7b56ca0b49390072a578ac56afa391c0c5ed392d1f2aa3f803981a5d58da" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.github.raamcosta.compose-destinations" name="core" version="2.1.0">
-         <artifact name="core-2.1.0.aar">
-            <sha256 value="a243655ce9dc9a4187f6d595196c805f280dedfee2f9e0c7c781092afc9bb072" origin="Generated by Gradle"/>
+      <component group="io.github.raamcosta.compose-destinations" name="core" version="2.2.0">
+         <artifact name="core-2.2.0.aar">
+            <sha256 value="c5548dcedeabb4a035f5fc7cda7986e459fdfde5d8a4167646f4f39d03600371" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="core-2.1.0.module">
-            <sha256 value="3ce99875bf9160356d90cb6611b4f853f1d7dc575497b1a187cc43e20dc1e8b5" origin="Generated by Gradle"/>
+         <artifact name="core-2.2.0.module">
+            <sha256 value="1cf181a56588e8befbc05b34ff8f6bd83cdef784a8283f204dbb0074f8075071" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.github.raamcosta.compose-destinations" name="ksp" version="2.1.0">
-         <artifact name="ksp-2.1.0.jar">
-            <sha256 value="b47a370cd4200764afee3490d5ac25e129d2f4b1477f2d0cacdd5c79104f784a" origin="Generated by Gradle"/>
+      <component group="io.github.raamcosta.compose-destinations" name="ksp" version="2.2.0">
+         <artifact name="ksp-2.2.0.jar">
+            <sha256 value="63ce1829b3aa1348ab4d3f5f20da0f23d771ce8a0c68dc15a806fe09af1ad841" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="ksp-2.1.0.module">
-            <sha256 value="1d9e85863ed9f1e829f36ea850713a89a10b4d7845b367719fa23e12fb8230c0" origin="Generated by Gradle"/>
+         <artifact name="ksp-2.2.0.module">
+            <sha256 value="c3661212e59101b43cddd7a15f2249bde93bee75ad37b79bc43029335c51ede9" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.gitlab.arturbosch.detekt" name="detekt-api" version="1.23.8">
@@ -5492,17 +5518,6 @@
             <sha256 value="81fd6d181012487ee3246eff4e2bacb64b58c46e5b5aa72971a4ddf1bd1541ed" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.1.10">
-         <artifact name="kotlin-stdlib-2.1.10-all.jar">
-            <sha256 value="a7412f66d71bcd2721c398307972fbb5f9409f945643eee05d1080b289a339cb" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlin-stdlib-2.1.10.jar">
-            <sha256 value="5f2ac1ca8dc8b37a3f4314e716d36969ebf0227a75181d32699d0a8f645b1c21" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlin-stdlib-2.1.10.module">
-            <sha256 value="8d2c1d717c73546d56382d136c8650b59a7159940172263818934ace44cb048d" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.1.20">
          <artifact name="kotlin-stdlib-2.1.20-all.jar">
             <sha256 value="81e07de34e84b29e14f3fdef902f4bc4cf1d5da959b867df683fbe1cc54ce1e1" origin="Generated by Gradle"/>
@@ -5544,11 +5559,6 @@
             <sha256 value="6f5df8af633600a6b9cfb0fcc764af3d5119f376677677b91b6aee816b1d30ab" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="2.1.10">
-         <artifact name="kotlin-stdlib-common-2.1.10.module">
-            <sha256 value="7e0ba5dd49599ce276c286be334858f251284a20f76db9bc0f5da0fbc99bb5f5" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="2.1.20">
          <artifact name="kotlin-stdlib-common-2.1.20.module">
             <sha256 value="94d0ad2b2319b85c40351cf9ee7077da12dd3850392e6cf10a3fe8159fbc73f7" origin="Generated by Gradle"/>
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
index 9bbc975c74..1b33c55baa 100644
--- a/android/gradle/wrapper/gradle-wrapper.jar
+++ b/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 36e4933e1d..247cf2a9f5 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionSha256Sum=61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/android/gradlew b/android/gradlew
index faf93008b7..23d15a9367 100755
--- a/android/gradlew
+++ b/android/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/android/gradlew.bat b/android/gradlew.bat
index 9d21a21834..db3a6ac207 100644
--- a/android/gradlew.bat
+++ b/android/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/firewall/FirewallClient.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/firewall/FirewallClient.kt
index 3e2a35971a..3d6264047b 100644
--- a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/firewall/FirewallClient.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/firewall/FirewallClient.kt
@@ -13,10 +13,7 @@ import io.ktor.http.URLProtocol
 import io.ktor.http.contentType
 import io.ktor.serialization.kotlinx.json.json
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.modules.SerializersModule
-import kotlinx.serialization.modules.contextual
 import net.mullvad.mullvadvpn.test.e2e.BuildConfig
-import net.mullvad.mullvadvpn.test.e2e.serializer.NanoSecondsTimestampSerializer
 
 class FirewallClient(private val httpClient: HttpClient = defaultHttpClient()) {
     suspend fun createRule(rule: DropRule) {
@@ -50,12 +47,9 @@ private fun defaultHttpClient(): HttpClient =
         install(ContentNegotiation) {
             json(
                 Json {
+                    ignoreUnknownKeys = true
                     isLenient = true
                     prettyPrint = true
-
-                    serializersModule = SerializersModule {
-                        contextual(NanoSecondsTimestampSerializer)
-                    }
                 }
             )
         }
diff --git a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/packetCapture/Packet.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/packetCapture/Packet.kt
index cd6b2b855e..d39067e9c8 100644
--- a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/packetCapture/Packet.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/packetCapture/Packet.kt
@@ -1,9 +1,9 @@
 package net.mullvad.mullvadvpn.test.e2e.router.packetCapture
 
 import java.time.ZonedDateTime
-import kotlinx.serialization.Contextual
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import net.mullvad.mullvadvpn.test.e2e.serializer.NanoSecondsTimestampSerializer
 import net.mullvad.mullvadvpn.test.e2e.serializer.PacketSerializer
 
 @Serializable(with = PacketSerializer::class)
@@ -13,13 +13,19 @@ sealed interface Packet {
 }
 
 @Serializable
-data class RxPacket(@SerialName("timestamp") @Contextual override val date: ZonedDateTime) :
-    Packet {
+data class RxPacket(
+    @SerialName("timestamp")
+    @Serializable(with = NanoSecondsTimestampSerializer::class)
+    override val date: ZonedDateTime
+) : Packet {
     @SerialName("from_peer") override val fromPeer: Boolean = false
 }
 
 @Serializable
-data class TxPacket(@SerialName("timestamp") @Contextual override val date: ZonedDateTime) :
-    Packet {
+data class TxPacket(
+    @SerialName("timestamp")
+    @Serializable(with = NanoSecondsTimestampSerializer::class)
+    override val date: ZonedDateTime
+) : Packet {
     @SerialName("from_peer") override val fromPeer: Boolean = true
 }
diff --git a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/packetCapture/PacketCapture.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/packetCapture/PacketCapture.kt
index 7854170114..5122227d3a 100644
--- a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/packetCapture/PacketCapture.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/packetCapture/PacketCapture.kt
@@ -20,11 +20,8 @@ import java.util.UUID
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.modules.SerializersModule
-import kotlinx.serialization.modules.contextual
 import net.mullvad.mullvadvpn.test.e2e.BuildConfig
 import net.mullvad.mullvadvpn.test.e2e.misc.Networking
-import net.mullvad.mullvadvpn.test.e2e.serializer.NanoSecondsTimestampSerializer
 import net.mullvad.mullvadvpn.test.e2e.serializer.PacketCaptureSessionSerializer
 import org.junit.jupiter.api.fail
 
@@ -68,12 +65,9 @@ private fun defaultHttpClient(): HttpClient =
         install(ContentNegotiation) {
             json(
                 Json {
+                    ignoreUnknownKeys = true
                     isLenient = true
                     prettyPrint = true
-
-                    serializersModule = SerializersModule {
-                        contextual(NanoSecondsTimestampSerializer)
-                    }
                 }
             )
         }