Merge branch 'update-dependencies-droid-2070'

27 files changed, 530 insertions, 447 deletions

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 1ac3434489..32ed53060b 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -3,6 +3,7 @@ import com.github.triplet.gradle.androidpublisher.ReleaseStatus
 import java.io.FileInputStream
 import java.util.Properties
 import org.gradle.internal.extensions.stdlib.capitalized
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.application)
@@ -139,19 +140,18 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
-        allWarningsAsErrors = true
-        freeCompilerArgs =
-            listOf(
-                // Opt-in option for Koin annotation of KoinComponent.
-                "-opt-in=kotlin.RequiresOptIn"
-            )
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get())
+            allWarningsAsErrors = true
+            freeCompilerArgs =
+                listOf(
+                    // Opt-in option for Koin annotation of KoinComponent.
+                    "-opt-in=kotlin.RequiresOptIn"
+                )
+        }
     }
 
-    // Suppressing since we don't seem have much of an option than using this api. The impact should
-    // also be limited to tests.
-    @Suppress("UnstableApiUsage")
     testOptions {
         unitTests.all { test ->
             test.testLogging {
diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
index f13860ee84..b1ef2bde46 100644
--- a/android/gradle/libs.versions.toml
+++ b/android/gradle/libs.versions.toml
@@ -15,16 +15,19 @@ ndk = "27.2.12479018"
 # https://github.com/gradle/gradle/issues/19228
 # Find the relevant AAPT version here:
 # https://mvnrepository.com/artifact/com.android.tools.build/aapt2
+
+# Do not upgrade to 8.11.0, it will give off incorrect lint warning about 'MemberExtensionConflict'.
+# See https://issuetracker.google.com/issues/427761232 fixed in 8.12.0-alpha08
 android-gradle-plugin = "8.10.1"
 android-gradle-aapt = "12782657"
-android-billingclient = "7.1.1"
+android-billingclient = "8.0.0"
 
 # AndroidX
 androidx-activitycompose = "1.10.1"
 androidx-appcompat = "1.7.1"
 androidx-ktx = "1.16.0"
 androidx-credentials = "1.5.0"
-androidx-coresplashscreen = "1.1.0-rc01"
+androidx-coresplashscreen = "1.2.0-rc01"
 androidx-datastore = "1.1.7"
 androidx-espresso = "3.6.1"
 androidx-lifecycle = "2.9.1"
@@ -53,7 +56,7 @@ grpc-kotlin-jar = "1.4.1:jdk8@jar"
 
 junit = "5.13.1"
 junit5-android = "1.8.0"
-junit5-android-plugin = "1.13.0.0"
+junit5-android-plugin = "1.13.1.0"
 
 # Koin
 koin = "4.1.0"
@@ -66,8 +69,8 @@ ktor = "3.0.3"
 # Kotlin
 # Bump kotlin and kotlin-ksp together, find matching release here:
 # https://github.com/google/ksp/releases
-kotlin = "2.1.21"
-kotlin-ksp = "2.1.21-2.0.2"
+kotlin = "2.2.0"
+kotlin-ksp = "2.2.0-2.0.2"
 kotlinx = "1.10.2"
 kotlinx-serialization = "1.8.1"
 
@@ -85,11 +88,10 @@ dependency-versions = "0.52.0"
 detekt = "1.23.8"
 kermit = "2.0.6"
 konsist = "0.17.3"
-ktfmt = "0.22.0"
+ktfmt = "0.23.0"
 leakcanary = "2.14"
 
-# Mockk 1.14.0 is broken with value classes, avoid updating
-mockk = "1.14.2"
+mockk = "1.14.4"
 mockwebserver = "4.12.0"
 play-publisher = "3.12.1"
 turbine = "1.2.1"
diff --git a/android/gradle/verification-keyring.keys b/android/gradle/verification-keyring.keys
index edc67d58e7..1b9a22982f 100644
--- a/android/gradle/verification-keyring.keys
+++ b/android/gradle/verification-keyring.keys
@@ -96,6 +96,19 @@ SQQYEQIACQUCSagpTwIbDAAKCRADdM8ujdG9/auQAKCCtFUmslioIPSjZkWVLJpo
 -----END PGP PUBLIC KEY BLOCK-----
 
 
+pub    04C8C902FEFB1A01
+sub    741DB70D5BD02528
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEaFhhgRYJKwYBBAHaRw8BAQdA8Tl+3HkVTIQq7QvPzpgZV6i7/z0LabiWTt3G
+fH8CKuy4OARoWGGBEgorBgEEAZdVAQUBAQdAaPAe0Es6+EY3/PwrQP5FynZnJL4x
+BR9vZ6+Z3pYRaxYDAQgHiH4EGBYKACYWIQSvdRKvZv5ABNhN7IoEyMkC/vsaAQUC
+aFhhgQIbDAUJBaOagAAKCRAEyMkC/vsaAX4YAP9RAqd/WoIBEi2Ix9DMStr1mOCF
+xF+S3TSFWPLVVVoo+gD9FGYeKnDDga+F1O3zW0ghkiaYxdpuD21/ySNA0+W3/gc=
+=LFrf
+-----END PGP PUBLIC KEY BLOCK-----
+
+
 pub    056ACA74D46000BF
 uid    Norman Maurer <norman@apache.org>
 
diff --git a/android/gradle/verification-metadata.keys.xml b/android/gradle/verification-metadata.keys.xml
index 40558fdb0f..5e8e8ea39d 100644
--- a/android/gradle/verification-metadata.keys.xml
+++ b/android/gradle/verification-metadata.keys.xml
@@ -91,7 +91,10 @@
          <trusted-key id="350C5D75D04AA599CBAD22348D5059F2B1927A9A" group="com.lemonappdev" name="konsist" version="0.17.3"/>
          <trusted-key id="3E46916ED513BEFDEAA9A14AA6BC6A2C25A6479C" group="app.cash.turbine"/>
          <trusted-key id="41CD49B4EF5876F9E9F691DABAC30622339994C4" group="org.jspecify" name="jspecify" version="1.0.0"/>
-         <trusted-key id="447C96E2C6AE137D1DC239B85A456ADE180A42C5" group="com.ncorti.ktfmt.gradle" name="plugin" version="0.22.0"/>
+         <trusted-key id="447C96E2C6AE137D1DC239B85A456ADE180A42C5">
+            <trusting group="com.ncorti.ktfmt.gradle" name="plugin" version="0.22.0"/>
+            <trusting group="com.ncorti.ktfmt.gradle" name="plugin" version="0.23.0"/>
+         </trusted-key>
          <trusted-key id="47504B76CF89C15C0512D9AFE16AB52D79FD224F" group="^com[.]google($|([.].*))" regex="true"/>
          <trusted-key id="475F3B8E59E6E63AA78067482C7B12F2A511E325" group="org.slf4j"/>
          <trusted-key id="47BF592261CD1A8A69B703B4E0CB7823CFD00FBF" group="com.jakewharton.android.repackaged" name="dalvik-dx" version="9.0.0_r3"/>
@@ -173,6 +176,7 @@
          <trusted-key id="A7892505CF1A58076453E52D7999BEFBA1039E8B" group="net.bytebuddy"/>
          <trusted-key id="A9F885A21BA0EFB7D0991E6CCAF5EC5919FEA27D" group="commons-digester" name="commons-digester" version="2.1"/>
          <trusted-key id="AA70C7C433D501636392EC02153E7A3C2B4E5118" group="org.eclipse.ee4j" name="project"/>
+         <trusted-key id="AF7512AF66FE4004D84DEC8A04C8C902FEFB1A01" group="io.mockk"/>
          <trusted-key id="B02335AA54CCF21E52BBF9ABD9C565AA72BA2FDD">
             <trusting group="com.google.protobuf"/>
             <trusting group="io.grpc"/>
@@ -290,14 +294,6 @@
             <sha256 value="0361d1526a4d7501255e19779e09e93cdbd07fee0e2f5c50b7a137432d510119" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="androidx.annotation" name="annotation-jvm" version="1.6.0">
-         <artifact name="annotation-jvm-1.6.0.jar">
-            <sha256 value="60b10b5ef5769b79570172e015b8159405c92f034ba88b9391a977589c9deb4e" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-         <artifact name="annotation-jvm-1.6.0.module">
-            <sha256 value="3f5a8faa19de667e63dca9730ff8ef0e478e4bafb5feeb8258e5c086246dc90c" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="androidx.arch.core" name="core-common" version="2.1.0">
          <artifact name="core-common-2.1.0.jar">
             <sha256 value="fe1237bf029d063e7f29fe39aeaf73ef74c8b0a3658486fc29d3c54326653889" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -743,16 +739,6 @@
             <sha256 value="147af4e14a1984010d8f155e5e19d781f03c1d70dfed02a8e0d18428b8fc8682" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
-      <component group="com.android.billingclient" name="billing" version="7.1.1">
-         <artifact name="billing-7.1.1.aar">
-            <sha256 value="ac1d32fa0077c11ad262dd048dde43261fc3059040f152058d21c94603b96505" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
-      <component group="com.android.billingclient" name="billing-ktx" version="7.1.1">
-         <artifact name="billing-ktx-7.1.1.aar">
-            <sha256 value="5918cea85e0c23e777921462442da6e8e1711c626e433d582f104adc3d142035" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="com.android.tools.build" name="bundletool" version="1.18.0">
          <artifact name="bundletool-1.18.0.jar">
             <sha256 value="b07f346383bac7d5ddbba2794ddc770565a83ae691d80332264d42dd9bfb4507" origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml
index c5e2bb3547..97c1b353fb 100644
--- a/android/gradle/verification-metadata.xml
+++ b/android/gradle/verification-metadata.xml
@@ -210,14 +210,6 @@
             <sha256 value="2ac2f7106e12f263425b4a4dfc80989447fb895675fe902d86759aa74fd12b7d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.annotation" name="annotation-jvm" version="1.6.0">
-         <artifact name="annotation-jvm-1.6.0.jar">
-            <sha256 value="60b10b5ef5769b79570172e015b8159405c92f034ba88b9391a977589c9deb4e" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="annotation-jvm-1.6.0.module">
-            <sha256 value="3f5a8faa19de667e63dca9730ff8ef0e478e4bafb5feeb8258e5c086246dc90c" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="androidx.annotation" name="annotation-jvm" version="1.7.0-beta01">
          <artifact name="annotation-jvm-1.7.0-beta01.jar">
             <sha256 value="e36b8e4b8393a4adc74e3d4ab22ad5a36396f0cea2e40b5734eae14937dfd224" origin="Generated by Gradle"/>
@@ -255,6 +247,11 @@
             <sha256 value="8bbf16792c81cc2dd083681783a5382f573007eee8157182932f1b454e2b7f04" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.appcompat" name="appcompat-resources" version="1.7.0">
+         <artifact name="appcompat-resources-1.7.0.module">
+            <sha256 value="d7cca0b553ec109ef20ac70ae6438f584fc6bb5eb269a7f5b4098e02c6d687f9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.appcompat" name="appcompat-resources" version="1.7.1">
          <artifact name="appcompat-resources-1.7.1.aar">
             <sha256 value="8e2db31224ca53b108c784da2b361959062716d416b210cfef3d5a3828306df0" origin="Generated by Gradle"/>
@@ -1366,12 +1363,12 @@
             <sha256 value="4d46646066c794f2812d5b33a9422d37e4f918c4d809cd1fb2579c7022ef2818" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.core" name="core-splashscreen" version="1.1.0-rc01">
-         <artifact name="core-splashscreen-1.1.0-rc01.aar">
-            <sha256 value="3b14be0db541a7847d072bd78ba0818d7ca7b4fb6a2214943bf4fe16921dc6c3" origin="Generated by Gradle"/>
+      <component group="androidx.core" name="core-splashscreen" version="1.2.0-rc01">
+         <artifact name="core-splashscreen-1.2.0-rc01.aar">
+            <sha256 value="0586f60c55ffead9c93495e5bc43d97f68da8a001d8fa60db6a3a7cfee5de78c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="core-splashscreen-1.1.0-rc01.module">
-            <sha256 value="4d7e4a3ee0b721e5e371fa01def735559ad3a4a66d24a84587117d7a1e5f5cbe" origin="Generated by Gradle"/>
+         <artifact name="core-splashscreen-1.2.0-rc01.module">
+            <sha256 value="c34157f932c92e5fb3562e610d43c06c3699f77352827c4df73b4259797fc86e" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.core" name="core-viewtree" version="1.0.0">
@@ -2632,14 +2629,14 @@
             <sha256 value="ba1f32aa255abe4dab66571dd9195305d3027f261f9f4f465898b30cdffd09b3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.billingclient" name="billing" version="7.1.1">
-         <artifact name="billing-7.1.1.aar">
-            <sha256 value="ac1d32fa0077c11ad262dd048dde43261fc3059040f152058d21c94603b96505" origin="Generated by Gradle"/>
+      <component group="com.android.billingclient" name="billing" version="8.0.0">
+         <artifact name="billing-8.0.0.aar">
+            <sha256 value="76b3d92c30d2d5e8d22599f8d9c6d46cda031f3477fcdf2732fe1a88748c4f75" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.billingclient" name="billing-ktx" version="7.1.1">
-         <artifact name="billing-ktx-7.1.1.aar">
-            <sha256 value="5918cea85e0c23e777921462442da6e8e1711c626e433d582f104adc3d142035" origin="Generated by Gradle"/>
+      <component group="com.android.billingclient" name="billing-ktx" version="8.0.0">
+         <artifact name="billing-ktx-8.0.0.aar">
+            <sha256 value="0179e3b9d0789672f722ef496413517ed742390c191f2763452412796e394c30" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.databinding" name="baseLibrary" version="8.10.1">
@@ -3016,9 +3013,15 @@
             <sha256 value="cde678a64b13041cdd2cc9dad1685990a1d090fb04ff5da2261ff75a83598106" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.facebook" name="ktfmt" version="0.54">
-         <artifact name="ktfmt-0.54.jar">
-            <sha256 value="7c9438ef23e0705c67b61907447e8a1384b136ff9b4a1e78f64657a32ae3f1f1" origin="Generated by Gradle"/>
+      <component group="com.facebook" name="ktfmt" version="0.55">
+         <artifact name="ktfmt-0.55-with-dependencies.jar">
+            <sha256 value="d13324023754112797d828e2f92117196190f7617d16ad1d1765e5be768cc5c2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktfmt-0.55.jar">
+            <sha256 value="0eeb50b94ec74a8a77e02b27bac7ff7e2af3ad19197e662829f0e6fe93b6c757" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktfmt-0.55.module">
+            <sha256 value="8e4ad1bb56c3abe6eca8a0c4f8158693403d7eb04054b5783ee5c05bee3cd713" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.github.ben-manes" name="gradle-versions-plugin" version="0.52.0">
@@ -3199,14 +3202,14 @@
             <sha256 value="1fa226d2b4a02cc80950fa4d49a4a235cc8eced499b581fc358a55446a83f579" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.devtools.ksp" name="symbol-processing" version="2.1.21-2.0.2">
-         <artifact name="symbol-processing-2.1.21-2.0.2.jar">
-            <sha256 value="88deb54240dda8691237fb9d49bd24ab32934af42831014040889be8782baf93" origin="Generated by Gradle"/>
+      <component group="com.google.devtools.ksp" name="symbol-processing" version="2.2.0-2.0.2">
+         <artifact name="symbol-processing-2.2.0-2.0.2.jar">
+            <sha256 value="3f7c408454fb34691c463ca1bbfb3d0cbcaece3c1689a65fffb207cb3263d2ce" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.devtools.ksp" name="symbol-processing-aa-embeddable" version="2.1.21-2.0.2">
-         <artifact name="symbol-processing-aa-embeddable-2.1.21-2.0.2.jar">
-            <sha256 value="ed23ab53bcd44a9aa7a9ef1743d4ceccd7bc91875439d60621052a462ce3712e" origin="Generated by Gradle"/>
+      <component group="com.google.devtools.ksp" name="symbol-processing-aa-embeddable" version="2.2.0-2.0.2">
+         <artifact name="symbol-processing-aa-embeddable-2.2.0-2.0.2.jar">
+            <sha256 value="f550f35fa17a1852916b3c801af4458ccd9244836c5aefe7f43878c40253573e" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.google.devtools.ksp" name="symbol-processing-api" version="2.1.20-2.0.1">
@@ -3225,33 +3228,33 @@
             <sha256 value="14ecb4776a8071e86129833319431399b2a69e6e9bfedcb2992538bdaca6cfc0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.devtools.ksp" name="symbol-processing-api" version="2.1.21-2.0.2">
-         <artifact name="symbol-processing-api-2.1.21-2.0.2.jar">
+      <component group="com.google.devtools.ksp" name="symbol-processing-api" version="2.2.0-2.0.2">
+         <artifact name="symbol-processing-api-2.2.0-2.0.2.jar">
             <sha256 value="588d17c4ea982b11028c2c82cb1d7300d269023a8068009f9ae9fb2c9c20c6d9" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="symbol-processing-api-2.1.21-2.0.2.module">
-            <sha256 value="763cb8bfabf57ae1ac3c5c69baed6cf6a849eaa90b1222d87e8ddf754222168e" origin="Generated by Gradle"/>
+         <artifact name="symbol-processing-api-2.2.0-2.0.2.module">
+            <sha256 value="7b591ce216aff3b9ef2dc5ba61a2482dfdb20a80a0b872aa7817e217a19412da" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.devtools.ksp" name="symbol-processing-cmdline" version="2.1.21-2.0.2">
-         <artifact name="symbol-processing-cmdline-2.1.21-2.0.2.jar">
-            <sha256 value="5273a4d04a2fdfc5e2ca8b1b8ae4838fdd72f62fcb8862ccfb617bc08082cc04" origin="Generated by Gradle"/>
+      <component group="com.google.devtools.ksp" name="symbol-processing-cmdline" version="2.2.0-2.0.2">
+         <artifact name="symbol-processing-cmdline-2.2.0-2.0.2.jar">
+            <sha256 value="5166f69f838f9c0eb303c1b255ff9edca022303f56c419c92c4f98c177874c6a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.devtools.ksp" name="symbol-processing-common-deps" version="2.1.21-2.0.2">
-         <artifact name="symbol-processing-common-deps-2.1.21-2.0.2.jar">
+      <component group="com.google.devtools.ksp" name="symbol-processing-common-deps" version="2.2.0-2.0.2">
+         <artifact name="symbol-processing-common-deps-2.2.0-2.0.2.jar">
             <sha256 value="3d642180be184646ece9c6e7184900d92f84f8080dab838a6db69c0f8acdd6e9" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="symbol-processing-common-deps-2.1.21-2.0.2.module">
-            <sha256 value="32a14d9f61e120f8dcd1ab4ed558e5097390d5a271d2ed059bd8ea30777126ef" origin="Generated by Gradle"/>
+         <artifact name="symbol-processing-common-deps-2.2.0-2.0.2.module">
+            <sha256 value="feb301f26dd927787a2853864c2aa16c11f9f2d28cf00ecdaf998bbd94a90471" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.google.devtools.ksp" name="symbol-processing-gradle-plugin" version="2.1.21-2.0.2">
-         <artifact name="symbol-processing-gradle-plugin-2.1.21-2.0.2.jar">
-            <sha256 value="61b64ddc6e5bd35647b58c10fa442b093fc0d82d1102b9e90730e733ff06e735" origin="Generated by Gradle"/>
+      <component group="com.google.devtools.ksp" name="symbol-processing-gradle-plugin" version="2.2.0-2.0.2">
+         <artifact name="symbol-processing-gradle-plugin-2.2.0-2.0.2.jar">
+            <sha256 value="0e1b179e49a1242764ba5aff3894a3601bfd8d06c593c53f0784e5eab7d280d4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="symbol-processing-gradle-plugin-2.1.21-2.0.2.module">
-            <sha256 value="29c7c0470b935de899f38723df7799d662c7964e5fa369fffaae69602ab3f008" origin="Generated by Gradle"/>
+         <artifact name="symbol-processing-gradle-plugin-2.2.0-2.0.2.module">
+            <sha256 value="fec6d5fae36eb19496e8cf41ca20fcac8e87ae92a37dbb9b8fc79dff9ceb4e29" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.google.errorprone" name="error_prone_annotations" version="2.18.0">
@@ -3526,12 +3529,12 @@
             <sha256 value="84b26973004dad1f990279400f29bbc7130cda8e1e9925239ebb71f42bb5f1d4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.ncorti.ktfmt.gradle" name="plugin" version="0.22.0">
-         <artifact name="plugin-0.22.0.jar">
-            <sha256 value="547cbe949294cd15da68f860a13999abb78a9e9f15a3a3fca0a98b6a06c88279" origin="Generated by Gradle"/>
+      <component group="com.ncorti.ktfmt.gradle" name="plugin" version="0.23.0">
+         <artifact name="plugin-0.23.0.jar">
+            <sha256 value="5e0222807bca37f35340f8ff30161cfa014f5cbef4fad875fda353e7bdd2383d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="plugin-0.22.0.module">
-            <sha256 value="8481dd3407fe26ca4aff310b43b45bcbaa7b1e55bb597bf5c33419ee9c3b30c3" origin="Generated by Gradle"/>
+         <artifact name="plugin-0.23.0.module">
+            <sha256 value="29ad6120fba60f3979804f1db0d7c5ba35b7e08d788a69d86dcf42a50ab5a1ce" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.squareup" name="javapoet" version="1.10.0">
@@ -3791,12 +3794,12 @@
             <sha256 value="c3c14748e2d78db58df88808740711bd643b32c45ffa7b8a739f00fb467cd7d7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="de.mannodermaus.gradle.plugins" name="android-junit5" version="1.13.0.0">
-         <artifact name="android-junit5-1.13.0.0.jar">
-            <sha256 value="9440d2f30f3f57cd74a6546f739a23839a84fd0ff3f58bb4e542fc7cc5ed3c71" origin="Generated by Gradle"/>
+      <component group="de.mannodermaus.gradle.plugins" name="android-junit5" version="1.13.1.0">
+         <artifact name="android-junit5-1.13.1.0.jar">
+            <sha256 value="a9842515242319af833f714602de6df7d9663aedf9e5a8c5b5876fc2309222ab" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-junit5-1.13.0.0.module">
-            <sha256 value="c11880efa623f9627ccdd890b8f1d9fbc097b03de188b5b1fa46e1ea516efc3b" origin="Generated by Gradle"/>
+         <artifact name="android-junit5-1.13.1.0.module">
+            <sha256 value="8acc2bd098554c9f713d0bdb7f3b3b1627e390a59449d3a4de9ed2de16a00f98" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="de.mannodermaus.junit5" name="android-test-compose" version="1.8.0">
@@ -3989,6 +3992,11 @@
             <sha256 value="2dfe9f7b88f728e1ad485ab9717af06a559e025ecd5f019be8b532e9352b9875" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.github.java-diff-utils" name="java-diff-utils" version="4.12">
+         <artifact name="java-diff-utils-4.12.jar">
+            <sha256 value="9990a2039778f6b4cc94790141c2868864eacee0620c6c459451121a901cd5b5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.github.java-diff-utils" name="java-diff-utils" version="4.15">
          <artifact name="java-diff-utils-4.15.jar">
             <sha256 value="964c69e3a23a892db2778ae6806aa1d42f81230032bd8e4982dc8620582ee6b7" origin="Generated by Gradle"/>
@@ -4833,100 +4841,100 @@
             <sha256 value="180fc3e25de24c284fbf41ba0f3b3ded56e8f37995f4ce74a5d22f899c3fc988" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk" version="1.14.2">
-         <artifact name="mockk-1.14.2.module">
-            <sha256 value="c5ce5c00011ed449c39285334381e874c84572e06af03ae5babd6f65bbeda44f" origin="Generated by Gradle"/>
+      <component group="io.mockk" name="mockk" version="1.14.4">
+         <artifact name="mockk-1.14.4.module">
+            <sha256 value="cd22835160e970ee58ad48b1ecb006074f2c8a29edbf086a2610831b699d75dc" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-metadata-1.14.2.jar">
-            <sha256 value="f634a6723d70211de75070491bc7062b042f8dc01bcd3b88487fcb1a5b6d1c1c" origin="Generated by Gradle"/>
+         <artifact name="mockk-metadata-1.14.4.jar">
+            <sha256 value="089e24417bf9f6c34eec5720eebb2cbcc82ea2855ecef90133eb17e1079d5868" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk-agent" version="1.14.2">
-         <artifact name="mockk-agent-1.14.2.module">
-            <sha256 value="e2c69f323fe8e524931e4842f414b7c7cde073ff6c47809a34a6954b0c57b3eb" origin="Generated by Gradle"/>
+      <component group="io.mockk" name="mockk-agent" version="1.14.4">
+         <artifact name="mockk-agent-1.14.4.module">
+            <sha256 value="c98bf4ece7b767c85d280021c96f8342f464286409500d3b8e02ef627a632c34" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-agent-metadata-1.14.2.jar">
-            <sha256 value="b5a3d62e5446d89a2a8ede3a05664f3f90e9d1373305fcd046e706dd9fae3c00" origin="Generated by Gradle"/>
+         <artifact name="mockk-agent-metadata-1.14.4.jar">
+            <sha256 value="089e24417bf9f6c34eec5720eebb2cbcc82ea2855ecef90133eb17e1079d5868" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk-agent-android" version="1.14.2">
-         <artifact name="mockk-agent-android-1.14.2.aar">
-            <sha256 value="09ecaedf5fef5abf1a78573f1e8ac64bf034be3a32a6d9e6c09d93bac24fdf3b" origin="Generated by Gradle"/>
+      <component group="io.mockk" name="mockk-agent-android" version="1.14.4">
+         <artifact name="mockk-agent-android-1.14.4.aar">
+            <sha256 value="ba64dcf0185e6a2a02c934598d69a39e4c90e6af1de05b9fd415079e46cd3508" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-agent-android-1.14.2.module">
-            <sha256 value="ec105dd8670e16ab3df1d0c99d78da7197ae70cbdc18a2360f70de350513cb5f" origin="Generated by Gradle"/>
+         <artifact name="mockk-agent-android-1.14.4.module">
+            <sha256 value="6e5029c054d35ba71411e7f01aedb46609d379fd63bbe07361c84b39eabce7e5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk-agent-api" version="1.14.2">
-         <artifact name="mockk-agent-api-1.14.2.module">
-            <sha256 value="821ce2b06ff89726439c308d9b9f227a03bb82906d8633d5c6f436ec412346fc" origin="Generated by Gradle"/>
+      <component group="io.mockk" name="mockk-agent-api" version="1.14.4">
+         <artifact name="mockk-agent-api-1.14.4.module">
+            <sha256 value="f8e00ca019ccf3fd4098e3cbf0dd71115071f3cf210fa12ff449bd499d20e5c3" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-agent-api-metadata-1.14.2.jar">
-            <sha256 value="fbc64f5c44a7added8b6eab517cf7d70555e25153bf5d44a6ed9b0e5312f7de9" origin="Generated by Gradle"/>
+         <artifact name="mockk-agent-api-metadata-1.14.4.jar">
+            <sha256 value="089e24417bf9f6c34eec5720eebb2cbcc82ea2855ecef90133eb17e1079d5868" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk-agent-api-jvm" version="1.14.2">
-         <artifact name="mockk-agent-api-jvm-1.14.2.jar">
-            <sha256 value="6aba1cfaba319bdbf624990a3a795ec59d8f71ca7f1bfc34487660fd9f403724" origin="Generated by Gradle"/>
+      <component group="io.mockk" name="mockk-agent-api-jvm" version="1.14.4">
+         <artifact name="mockk-agent-api-jvm-1.14.4.jar">
+            <sha256 value="a919a8fec03dfb0c084cb43dafcebe2dd9351431c7a08c2fc8147037de1d06b7" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-agent-api-jvm-1.14.2.module">
-            <sha256 value="cd4feb8e109f9e65eca6fd9ef32c4fc7d03719ee207538305f96ec7d6985d22d" origin="Generated by Gradle"/>
+         <artifact name="mockk-agent-api-jvm-1.14.4.module">
+            <sha256 value="4fe578792a0c379f083464be35aa77474d53a30ea5295ec5d679fd6586407fc9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk-agent-jvm" version="1.14.2">
-         <artifact name="mockk-agent-jvm-1.14.2.jar">
-            <sha256 value="ecfc64b1e202ac10119c2981d06750ad3c08acaf910aabd41a4489bb744c24f9" origin="Generated by Gradle"/>
+      <component group="io.mockk" name="mockk-agent-jvm" version="1.14.4">
+         <artifact name="mockk-agent-jvm-1.14.4.jar">
+            <sha256 value="9f78e9988e84c98569edcf9a6225d5b7354939529642e54c2c58da3ef3913106" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-agent-jvm-1.14.2.module">
-            <sha256 value="02944631426aadc23e81c26ecb8e0763ec56168e4f9d84fd98e9d114e293de7a" origin="Generated by Gradle"/>
+         <artifact name="mockk-agent-jvm-1.14.4.module">
+            <sha256 value="d26b371b4c3ea367d7bd5d374974af376c7b699cfc32dd49482b8961ded56041" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk-android" version="1.14.2">
-         <artifact name="mockk-android-1.14.2.aar">
-            <sha256 value="1cb0955c9d49f1e72f0728dcfb79ca8a951056470253f30850cbd0fc634771ce" origin="Generated by Gradle"/>
+      <component group="io.mockk" name="mockk-android" version="1.14.4">
+         <artifact name="mockk-android-1.14.4.aar">
+            <sha256 value="d72980508f1bbf486d81967ab245875f78301402c362c4013984f4e22c8f527b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-android-1.14.2.module">
-            <sha256 value="473e2ff9ef0a5b9d3a07bab3bb979f53478ab379044cb9180d445b07d240df8d" origin="Generated by Gradle"/>
+         <artifact name="mockk-android-1.14.4.module">
+            <sha256 value="13b989706f15c46e9e7492e4569ee07513801f00c0c016d2ebd4578afc5ccef0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk-core" version="1.14.2">
-         <artifact name="mockk-core-1.14.2.module">
-            <sha256 value="a8c4948d4da9a604554c51cf876db4cb2cde5bdcb69e9a4990123ba2cf487447" origin="Generated by Gradle"/>
+      <component group="io.mockk" name="mockk-core" version="1.14.4">
+         <artifact name="mockk-core-1.14.4.module">
+            <sha256 value="a7e9c6e3879423c15842f00e24b418b6637d9e100dd90c1cf1603898289c2ac3" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-core-metadata-1.14.2.jar">
-            <sha256 value="fbc64f5c44a7added8b6eab517cf7d70555e25153bf5d44a6ed9b0e5312f7de9" origin="Generated by Gradle"/>
+         <artifact name="mockk-core-metadata-1.14.4.jar">
+            <sha256 value="089e24417bf9f6c34eec5720eebb2cbcc82ea2855ecef90133eb17e1079d5868" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk-core-jvm" version="1.14.2">
-         <artifact name="mockk-core-jvm-1.14.2.jar">
-            <sha256 value="8129651b024734fb63c6135308b22f5437a84588f17ea74c18efed4aec3529e8" origin="Generated by Gradle"/>
+      <component group="io.mockk" name="mockk-core-jvm" version="1.14.4">
+         <artifact name="mockk-core-jvm-1.14.4.jar">
+            <sha256 value="060fffe7452e74f6e18bb9dfe1221e92c4ec0de29a84b022fb562ec6cd954691" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-core-jvm-1.14.2.module">
-            <sha256 value="59aee862003dc80921017bf2fda4e9bdcf917757bb14e87d2e447e5d31089c01" origin="Generated by Gradle"/>
+         <artifact name="mockk-core-jvm-1.14.4.module">
+            <sha256 value="bcd3048750aab4fd566bef0f43fcf886cc260becfaeb257ed3705c95f66cf733" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk-dsl" version="1.14.2">
-         <artifact name="mockk-dsl-1.14.2.module">
-            <sha256 value="10e46b2f78be47952251a9cfe5fa6d0d0839e229bc702dbe9c0cbc462e03285a" origin="Generated by Gradle"/>
+      <component group="io.mockk" name="mockk-dsl" version="1.14.4">
+         <artifact name="mockk-dsl-1.14.4.module">
+            <sha256 value="f3de54ab82efd2a466e312dd65d96932b5e59f213e7a81ae65469aa83f77d9c9" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-dsl-metadata-1.14.2.jar">
-            <sha256 value="fbc64f5c44a7added8b6eab517cf7d70555e25153bf5d44a6ed9b0e5312f7de9" origin="Generated by Gradle"/>
+         <artifact name="mockk-dsl-metadata-1.14.4.jar">
+            <sha256 value="089e24417bf9f6c34eec5720eebb2cbcc82ea2855ecef90133eb17e1079d5868" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk-dsl-jvm" version="1.14.2">
-         <artifact name="mockk-dsl-jvm-1.14.2.jar">
-            <sha256 value="e97b4f289d66c318c97fd5d9d23429535b54a56d89981a68bfaeb1c5d27fff4a" origin="Generated by Gradle"/>
+      <component group="io.mockk" name="mockk-dsl-jvm" version="1.14.4">
+         <artifact name="mockk-dsl-jvm-1.14.4.jar">
+            <sha256 value="d01d6ce85f9824d8ddb22ea7f1bccd581b831ffad504f48a4f18abf9bc6f2eac" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-dsl-jvm-1.14.2.module">
-            <sha256 value="b7a085f54f5b83b9d8d72bff843803567eb25e110c4305d1d6723ea20335e55b" origin="Generated by Gradle"/>
+         <artifact name="mockk-dsl-jvm-1.14.4.module">
+            <sha256 value="83f025cce3dc4ff9ac89e31f6922b4f97cb321e29f36fd6706d2fcf747ef3325" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.mockk" name="mockk-jvm" version="1.14.2">
-         <artifact name="mockk-jvm-1.14.2.jar">
-            <sha256 value="9a73ac353f089bce866bbe60028e1e4d15ac509347cef52c9e4f29cef6275a12" origin="Generated by Gradle"/>
+      <component group="io.mockk" name="mockk-jvm" version="1.14.4">
+         <artifact name="mockk-jvm-1.14.4.jar">
+            <sha256 value="74deb86cbab6871a3e4d0f97ba8eacbdae7aacd7537f142bcb083590465a6219" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="mockk-jvm-1.14.2.module">
-            <sha256 value="c40494dfe5d550b0004099e73f1b80219c5bba638d3c8157411bf8b69da73bc1" origin="Generated by Gradle"/>
+         <artifact name="mockk-jvm-1.14.4.module">
+            <sha256 value="a6e19e6eaa9985571f0bc94eaffc0b449477f8c78e30fef946776f9d501edd62" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.netty" name="netty-buffer" version="4.1.110.Final">
@@ -5105,14 +5113,14 @@
             <sha256 value="f47aeef86821e52b2b18758978bd045f03d722292e32e747082122c6228952e0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="net.bytebuddy" name="byte-buddy" version="1.14.17">
-         <artifact name="byte-buddy-1.14.17.jar">
-            <sha256 value="cde8f8f8e07bff3694aace0d9944ba755665a583b05d9153d41062285e9a8a61" origin="Generated by Gradle"/>
+      <component group="net.bytebuddy" name="byte-buddy" version="1.17.5">
+         <artifact name="byte-buddy-1.17.5.jar">
+            <sha256 value="71568c9f8396677219f650268fbf6493ded484edcdbdf2dae6129ca5be81e8db" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="net.bytebuddy" name="byte-buddy-agent" version="1.14.17">
-         <artifact name="byte-buddy-agent-1.14.17.jar">
-            <sha256 value="461ec3017f1445b0af42d4e5f08eb6f5032fa4039ad737f3fcc4b2a12a38f984" origin="Generated by Gradle"/>
+      <component group="net.bytebuddy" name="byte-buddy-agent" version="1.17.5">
+         <artifact name="byte-buddy-agent-1.17.5.jar">
+            <sha256 value="c5b9334ad82e632f6af60df22bbbdbbb62cee04877f4f43c38ba04aed9bd9901" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="net.java.dev.jna" name="jna" version="4.2.2">
@@ -5592,25 +5600,35 @@
             <sha256 value="c5fd725bffab51846bf3c77db1383c60aaaebfe1b7fe2f00d23fe1b7df0a439d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="compose-compiler-gradle-plugin" version="2.1.21">
-         <artifact name="compose-compiler-gradle-plugin-2.1.21-gradle85.jar">
-            <sha256 value="b8612fdb185dcd98971a51bc1f42be9367bcbcaee513e372c24a14f4edb19b86" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="abi-tools" version="2.2.0">
+         <artifact name="abi-tools-2.2.0.jar">
+            <sha256 value="3e7827f2a76a8296b7bef7f3cb3acfc49240d60b5337089d447c8921f6e08b4d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="abi-tools-api" version="2.2.0">
+         <artifact name="abi-tools-api-2.2.0.jar">
+            <sha256 value="8717838866642e3bdd47ec9e0260bbd3076e8c7e86be05e2ada86831eb2af90a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="compose-compiler-gradle-plugin" version="2.2.0">
+         <artifact name="compose-compiler-gradle-plugin-2.2.0-gradle813.jar">
+            <sha256 value="f73d2f836300c022de0122f05642ff52070e0227f3acd3e36b13d717e47b1523" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="compose-compiler-gradle-plugin-2.1.21.module">
-            <sha256 value="b187500b8cdfc8d2c1c3a17b961cc43b7b4e185412fcdb04b03beb90f133fbbd" origin="Generated by Gradle"/>
+         <artifact name="compose-compiler-gradle-plugin-2.2.0.module">
+            <sha256 value="cae8df63aa10101492e5ba26bd3b317c443c0846f4605626ca0df53eaa76908e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="fus-statistics-gradle-plugin" version="2.1.21">
-         <artifact name="fus-statistics-gradle-plugin-2.1.21-gradle85.jar">
-            <sha256 value="fc0905810309a5ad3ea15dfbbe129a47e90db11215232364841b72044124e7b0" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="fus-statistics-gradle-plugin" version="2.2.0">
+         <artifact name="fus-statistics-gradle-plugin-2.2.0-gradle813.jar">
+            <sha256 value="d0cf9ff23ad38c210eed0cc25a51315a384e61fdc15a53feb86c00bee691aae8" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="fus-statistics-gradle-plugin-2.1.21.module">
-            <sha256 value="76a323dafb588e0faee8e3148b910fb6ec3eb422fc10640106be5b7f06a9c7f3" origin="Generated by Gradle"/>
+         <artifact name="fus-statistics-gradle-plugin-2.2.0.module">
+            <sha256 value="e5dd2edf88af756df4775adad77c52d0090351abf51192cf19d3fe62c667cab8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-android-extensions-runtime" version="2.1.21">
-         <artifact name="kotlin-android-extensions-runtime-2.1.21.jar">
-            <sha256 value="5c143d20cdc29967e2916e06948604e598ba9f11677fad4facae692be2e2a38a" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-android-extensions-runtime" version="2.2.0">
+         <artifact name="kotlin-android-extensions-runtime-2.2.0.jar">
+            <sha256 value="b43fa546caf93a17c76ca22ffae8d3cbc3bd615a5daf81588d0472d7932cbed2" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-assignment" version="2.0.21">
@@ -5636,9 +5654,9 @@
             <sha256 value="80120b74df03633d6f79e08864131eee3b7a7486f6c05d2f2edc8683753c54da" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-build-statistics" version="2.1.21">
-         <artifact name="kotlin-build-statistics-2.1.21.jar">
-            <sha256 value="3a762c1e558559447daf4217fde2b982b2508756eb102a6571194f12dd41acfa" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-build-statistics" version="2.2.0">
+         <artifact name="kotlin-build-statistics-2.2.0.jar">
+            <sha256 value="9257f2dfbc788827f602750fae28d7e945932ead904153f77f4f6c4c4d98e511" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-build-tools-api" version="2.0.21">
@@ -5646,9 +5664,9 @@
             <sha256 value="8fca2b4af6c4cf24565d9a7f64c3178489518d049e106981db6718ef22cae18e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-build-tools-api" version="2.1.21">
-         <artifact name="kotlin-build-tools-api-2.1.21.jar">
-            <sha256 value="06bb6b3671d4bc3ba74c0e0efabbdcd555ccc2d4cc2ef67cd309c5738c8d1e54" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-build-tools-api" version="2.2.0">
+         <artifact name="kotlin-build-tools-api-2.2.0.jar">
+            <sha256 value="1decd99b229437741f36a008c678a9d8fae30716e8772151308f56f68c10f38e" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-build-tools-impl" version="2.0.21">
@@ -5656,14 +5674,9 @@
             <sha256 value="ba6ea24daed44717f503072a91c59b0da7e9caf0002bd0ec1be773294c127dcb" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-build-tools-impl" version="2.1.21">
-         <artifact name="kotlin-build-tools-impl-2.1.21.jar">
-            <sha256 value="e6c7f18a3228f56ca91400a54ddad21e1d789a9f9a07263b560c8c95347c63cd" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-compiler-embeddable" version="2.0.0">
-         <artifact name="kotlin-compiler-embeddable-2.0.0.jar">
-            <sha256 value="eb8ae09df38e212eec3965cafa97ab08112773fe2e870ebeb6131b8f69bfb92e" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-build-tools-impl" version="2.2.0">
+         <artifact name="kotlin-build-tools-impl-2.2.0.jar">
+            <sha256 value="4a87f3c0272f17285d60e98643ec219f53e9b5ad5a23f3bc4c543a8644f86f17" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-compiler-embeddable" version="2.0.21">
@@ -5671,9 +5684,14 @@
             <sha256 value="9fa8cdd1de0dccffe154c997d423ec6b5f53cd6d9177e3a77a9b0de03fb1bc81" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-compiler-embeddable" version="2.1.21">
-         <artifact name="kotlin-compiler-embeddable-2.1.21.jar">
-            <sha256 value="67a2e3673765f097725608cc7c843b0d8fdd94bd9af41327211361614aa57d49" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-compiler-embeddable" version="2.2.0">
+         <artifact name="kotlin-compiler-embeddable-2.2.0.jar">
+            <sha256 value="b2f743ea5ba12f69e0f35e5d8d46069d74c8e2861087548a7e0e14a784bc4cf1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-compiler-embeddable" version="2.2.0-Beta2">
+         <artifact name="kotlin-compiler-embeddable-2.2.0-Beta2.jar">
+            <sha256 value="20fa5b5de444452762460ec275ebce68eef3568ba4b9c9a0a298c50a82a22897" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="2.0.21">
@@ -5681,14 +5699,14 @@
             <sha256 value="08e605be81060ff612d0aeb94058a19bc4ac99625c35c461c6c0b302560e9104" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="2.1.21">
-         <artifact name="kotlin-compiler-runner-2.1.21.jar">
-            <sha256 value="70a8972bb7be1b2bb098c9a5da70bec1dd44cb104d4da1aa6e33dc551028d49a" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="2.2.0">
+         <artifact name="kotlin-compiler-runner-2.2.0.jar">
+            <sha256 value="90706ae8671defba01408dd1c541ba30912c9070cdf1ddda18c51eae8d679304" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-compose-compiler-plugin-embeddable" version="2.1.21">
-         <artifact name="kotlin-compose-compiler-plugin-embeddable-2.1.21.jar">
-            <sha256 value="6719d2dd7620ae8cfd151b56d2d3c0cae57e642d2e728b272a0e86d18423276f" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-compose-compiler-plugin-embeddable" version="2.2.0">
+         <artifact name="kotlin-compose-compiler-plugin-embeddable-2.2.0.jar">
+            <sha256 value="80c654f376ac474dabfb0f33441a41eb083143923d4b7b55a60ac36444e43fe5" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-daemon-client" version="2.0.21">
@@ -5696,14 +5714,9 @@
             <sha256 value="371ea08e4f036882cc8e064ffcf6445990df444295ba1ec68928e7cc2b5bc015" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-daemon-client" version="2.1.21">
-         <artifact name="kotlin-daemon-client-2.1.21.jar">
-            <sha256 value="3070dd0359efe4a1348c0ce9b95b0324799765598bb7b6876f1549ab5347e94f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-daemon-embeddable" version="2.0.0">
-         <artifact name="kotlin-daemon-embeddable-2.0.0.jar">
-            <sha256 value="b907a36e9cfa587ca0523793d89eb2ea9bb545456935f180e12422486c14049f" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-daemon-client" version="2.2.0">
+         <artifact name="kotlin-daemon-client-2.2.0.jar">
+            <sha256 value="21293da016e4ba12a128ac26fd920a74e8b87f574cf9bc43c60a3d2e7645a7ae" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-daemon-embeddable" version="2.0.21">
@@ -5711,9 +5724,14 @@
             <sha256 value="b1a0a73c5022f8dd05a638c6b76b2bd7361818a1f3860ff2644133b1dd2bdb03" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-daemon-embeddable" version="2.1.21">
-         <artifact name="kotlin-daemon-embeddable-2.1.21.jar">
-            <sha256 value="9401effd82de8606df3289308a275cc1d3573768665ca5edd09dc319c71715f4" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-daemon-embeddable" version="2.2.0">
+         <artifact name="kotlin-daemon-embeddable-2.2.0.jar">
+            <sha256 value="a26cc8e2d8619197cc4d115bea7766e9aa8e0f1e7876ea044ee1b9f305654601" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-daemon-embeddable" version="2.2.0-Beta2">
+         <artifact name="kotlin-daemon-embeddable-2.2.0-Beta2.jar">
+            <sha256 value="9c355e222fcc33c7deee86cc6246c28b02274f46b2fad048a1918e05b3bce2cf" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin" version="2.0.21">
@@ -5724,12 +5742,12 @@
             <sha256 value="0f9897a06c07a3e87d647131cc3490a1f72d1ae54c107f13f72269d5344b087a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin" version="2.1.21">
-         <artifact name="kotlin-gradle-plugin-2.1.21-gradle85.jar">
-            <sha256 value="eac04876c1ab66036f6016fd90833f204b0236c2764759cad069276e02cb43e6" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin" version="2.2.0">
+         <artifact name="kotlin-gradle-plugin-2.2.0-gradle813.jar">
+            <sha256 value="835c4dc18a07325f5793050c7f2e765d235c596749568e47b597b449d867968d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-2.1.21.module">
-            <sha256 value="7e120e4dfca08edd4890afe0b68bba5aa89f27fba11d8fe68f6b6da0b2129358" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-2.2.0.module">
+            <sha256 value="637c3fcae5723a7427026c0edb3dc6796dd3fe7990dc2286d4f7496edf5d2985" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-annotations" version="2.0.21">
@@ -5737,9 +5755,9 @@
             <sha256 value="5b4707a32e467efbe122c318ff6abdca17a2fc7d8c83f66037c9a120b6dcbc2f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-annotations" version="2.1.21">
-         <artifact name="kotlin-gradle-plugin-annotations-2.1.21.jar">
-            <sha256 value="784bbf6f8834d1ecf65ec51fe7b44b416f33052e821962a59b9e7f74e094f696" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-annotations" version="2.2.0">
+         <artifact name="kotlin-gradle-plugin-annotations-2.2.0.jar">
+            <sha256 value="9d1b07dae5559c3fc9c2dce15bd85c36dc1e76dff377f1312489bd6660c16544" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-api" version="2.0.21">
@@ -5753,15 +5771,15 @@
             <sha256 value="cf6f5d344c555554bfac64051ead0085cbd4338676baa3fc87b503e9e4abbe34" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-api" version="2.1.21">
-         <artifact name="kotlin-gradle-plugin-api-2.1.21-gradle85.jar">
-            <sha256 value="558f8a32baf5a87e9694c8bb395570a9e76e0aeaabaa683f9ac1fcde8ba3aacc" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-api" version="2.2.0">
+         <artifact name="kotlin-gradle-plugin-api-2.2.0-gradle813.jar">
+            <sha256 value="bba6aee21d185f72df896f348f0ea7b1175c11cd6637379989df899cb48c97e1" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-api-2.1.21.jar">
-            <sha256 value="558f8a32baf5a87e9694c8bb395570a9e76e0aeaabaa683f9ac1fcde8ba3aacc" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-api-2.2.0.jar">
+            <sha256 value="bba6aee21d185f72df896f348f0ea7b1175c11cd6637379989df899cb48c97e1" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-api-2.1.21.module">
-            <sha256 value="abd7c700e9a94c5df3ccd95e93d2eeab0c192645d707ead95c5cea47e81cc27b" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-api-2.2.0.module">
+            <sha256 value="0263a0b5d4051069a616325838ae421a6c4d006dc9b155a7a429266088800ba7" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea" version="2.0.21">
@@ -5772,12 +5790,12 @@
             <sha256 value="62a70d020dbb0780647b115518804713e67606405ae97a10d8fda3829388d149" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea" version="2.1.21">
-         <artifact name="kotlin-gradle-plugin-idea-2.1.21.jar">
-            <sha256 value="00f6f843abc930d0c61abb4e3e302c8d17761291f9b2bc2586fe12b0cb975ead" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea" version="2.2.0">
+         <artifact name="kotlin-gradle-plugin-idea-2.2.0.jar">
+            <sha256 value="ec969c5f0b099f823846232238f9bd64f3d3741e62ea9050ad2e432fad79d0a0" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-idea-2.1.21.module">
-            <sha256 value="808586c3cf7ace4cdf08b1185fbcafd0f55c52134850f366525afbae50bbc53a" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-idea-2.2.0.module">
+            <sha256 value="afe9b6014270048549bb20324a319d624a05a0b9e6b417e69b690795d7cf0d4b" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea-proto" version="2.0.21">
@@ -5785,9 +5803,9 @@
             <sha256 value="53355742b57ba8e16fbdf0a20439f8b345276071edb144e7b3da6e60be363188" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea-proto" version="2.1.21">
-         <artifact name="kotlin-gradle-plugin-idea-proto-2.1.21.jar">
-            <sha256 value="0583b9979edd4c8f5fefc08d5911821e9c3b05a91b839fa1aa070f926ee7cba0" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea-proto" version="2.2.0">
+         <artifact name="kotlin-gradle-plugin-idea-proto-2.2.0.jar">
+            <sha256 value="418e21763276d2a94616be990826a745d59d4c5d96638f0bbe21110d2c56493b" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-model" version="2.0.21">
@@ -5798,12 +5816,12 @@
             <sha256 value="eaa9fd9f86fbd44ff6070a197dc7bdd1980f0d41e8db49b252803d03aa4c55ac" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-model" version="2.1.21">
-         <artifact name="kotlin-gradle-plugin-model-2.1.21.jar">
-            <sha256 value="6804cd5f05d77fa954ac7b7a930e7b57fae08caf024e2291880a3c28a49fc075" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-model" version="2.2.0">
+         <artifact name="kotlin-gradle-plugin-model-2.2.0.jar">
+            <sha256 value="67a14ac424aa196a346b1dc99f442a6d5734582ad7b7e7a9ccdf28a9cd2b209b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-gradle-plugin-model-2.1.21.module">
-            <sha256 value="21fa2a83b1537806bbc7ed6556b99522a5e16f3891e8288a1bcfe8cdfd2642b8" origin="Generated by Gradle"/>
+         <artifact name="kotlin-gradle-plugin-model-2.2.0.module">
+            <sha256 value="2c2e30d830ea769aba897f4f96f19e1e82d8d6a23f533689ba09f41933004986" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugins-bom" version="2.0.21">
@@ -5811,9 +5829,9 @@
             <sha256 value="f0945487fe51959fdf8b6a1441707a29ed5f1ac31a231c7fdebe2c3ddd22fdf1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugins-bom" version="2.1.21">
-         <artifact name="kotlin-gradle-plugins-bom-2.1.21.module">
-            <sha256 value="6af494ac656e7248341ceba439e3d626116d0117c9fbdf97abee6570e11a0877" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugins-bom" version="2.2.0">
+         <artifact name="kotlin-gradle-plugins-bom-2.2.0.module">
+            <sha256 value="babd3c497a2971dfc68e50254ff97065a93a23183e8eda3c398f84f60cec12b2" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-api" version="2.0.21">
@@ -5821,9 +5839,9 @@
             <sha256 value="4757891165b698fbdace8f4da6f2bc0e988eaef9ef36713548865a8f27069afd" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-api" version="2.1.21">
-         <artifact name="kotlin-klib-commonizer-api-2.1.21.jar">
-            <sha256 value="43e0a40c1df79c33a3049914bc9e666e44fbcb20f07d4568eea0595e972a2c71" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-api" version="2.2.0">
+         <artifact name="kotlin-klib-commonizer-api-2.2.0.jar">
+            <sha256 value="f05702c3a6eaef6e7e842353be64f58d3307197e15a7f179804d3c550719ee69" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-embeddable" version="2.0.21">
@@ -5831,23 +5849,28 @@
             <sha256 value="d86bf4338a6d841cccdfbbff2da05bd03a49c3db8c3f97ab85e77e021ad0845b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-embeddable" version="2.1.21">
-         <artifact name="kotlin-klib-commonizer-embeddable-2.1.21.jar">
-            <sha256 value="70f0f498d08f3b80b2a702295c79acd6a42d0a2c36bcfb89f903cbbfe0388bc0" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-embeddable" version="2.2.0">
+         <artifact name="kotlin-klib-commonizer-embeddable-2.2.0.jar">
+            <sha256 value="28417e19977aa498dc08993aae201ffc21b94e9ff422f522522d608f606b9206" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-metadata-jvm" version="2.2.0">
+         <artifact name="kotlin-metadata-jvm-2.2.0.jar">
+            <sha256 value="501222ae7d63527e55f2e5e645f18d4eff2c19074c85b9bc055866e3ed2b17bf" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-native-prebuilt" version="2.1.21">
-         <artifact name="kotlin-native-prebuilt-2.1.21-linux-x86_64.tar.gz">
-            <sha256 value="297c423099a1187946cffa3a85306a019f43ec7f5cbaa74facd6d51b160765e1" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-native-prebuilt" version="2.2.0">
+         <artifact name="kotlin-native-prebuilt-2.2.0-linux-x86_64.tar.gz">
+            <sha256 value="070b7636410f3191c77c97ffd3a0749d0cddec7af5878778b034c7d988b0a8db" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-native-prebuilt-2.1.21-macos-aarch64.tar.gz">
-            <sha256 value="0d5ef78fda6173ba86bd978a729280cd6f1b674ccddb6bcb31c9b717132e5839" origin="Generated by Gradle"/>
+         <artifact name="kotlin-native-prebuilt-2.2.0-macos-aarch64.tar.gz">
+            <sha256 value="5e4140107ac9fb862bb3676eb324d5d8540bcf5faadbab1d38433dcf4e57b9f5" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-native-prebuilt-2.1.21-macos-x86_64.tar.gz">
-            <sha256 value="de40ecaf33debcdf7db0721f239c51d4fb5821197ee042e36717f6bafdc641ba" origin="Generated by Gradle"/>
+         <artifact name="kotlin-native-prebuilt-2.2.0-macos-x86_64.tar.gz">
+            <sha256 value="871a855509af51ef656460557f2f0b8fa50a2ff7347effee15d6e84d7428be14" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-native-prebuilt-2.1.21-windows-x86_64.zip">
-            <sha256 value="0bc7723d9f60e19491622d73d452b290961e3037a807eb140aaa45f1221868e3" origin="Generated by Gradle"/>
+         <artifact name="kotlin-native-prebuilt-2.2.0-windows-x86_64.zip">
+            <sha256 value="61049e9ae33d38f1bea3b11499bb1db6095ea26f91ea4054389c7e64c6f84a12" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-native-utils" version="2.0.21">
@@ -5855,19 +5878,19 @@
             <sha256 value="45eb08a3929f97c48a92912c9625779d1540bc6f3f212fb9e94620d0326bcc00" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-native-utils" version="2.1.21">
-         <artifact name="kotlin-native-utils-2.1.21.jar">
-            <sha256 value="dc409485c95cd38a5f30d5878ebe9a8bf2e6e6f254b6fe9e45cca0999905e070" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-native-utils" version="2.2.0">
+         <artifact name="kotlin-native-utils-2.2.0.jar">
+            <sha256 value="a4e96f7336dae849f39cf2b634a536d02a2abdf0114b73395adcb8c881850e9e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-parcelize-compiler" version="2.1.21">
-         <artifact name="kotlin-parcelize-compiler-2.1.21.jar">
-            <sha256 value="0dfcb04c6150827dff861a58defada9485b1525a877bfaa20fcb0f0a90abe846" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-parcelize-compiler" version="2.2.0">
+         <artifact name="kotlin-parcelize-compiler-2.2.0.jar">
+            <sha256 value="704fa3ff5525a0fd37067ced7337e32c17558b35c4d03a232d3126c1b884a75d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-parcelize-runtime" version="2.1.21">
-         <artifact name="kotlin-parcelize-runtime-2.1.21.jar">
-            <sha256 value="9dabea4e0b05526bb94f291d5074be45aeb37c7ba707ffd68028aaa2b2b67bae" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-parcelize-runtime" version="2.2.0">
+         <artifact name="kotlin-parcelize-runtime-2.2.0.jar">
+            <sha256 value="ffd266a80d58ea089f8ae78cfcc81f19f276ef491fb05c0777bdc99f22ae84a1" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.6.10">
@@ -5885,11 +5908,6 @@
             <sha256 value="a133e049f0a4e249651582428e166de4dfac9546adf436b6172119255ede510f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="2.0.0">
-         <artifact name="kotlin-reflect-2.0.0.jar">
-            <sha256 value="111bd906921937f76da17760641116d04b57a7a12fcf980efe7c6767f45179f0" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="2.0.21">
          <artifact name="kotlin-reflect-2.0.21.jar">
             <sha256 value="3ad2fcad0c09ddc0922debab4444d612144b7b465b75a8bb7587e20ddfafd799" origin="Generated by Gradle"/>
@@ -5900,9 +5918,14 @@
             <sha256 value="b5f608edfa98a8cfa2372cc12d18ada974be1c56c1093eff06cc061f4fc088b2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="2.1.21">
-         <artifact name="kotlin-reflect-2.1.21.jar">
-            <sha256 value="bcd75a36ca4ad8e06117214ed807f8dea2fe61a71e07f91ca14f4335024b8463" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="2.1.20">
+         <artifact name="kotlin-reflect-2.1.20.jar">
+            <sha256 value="419778f2b7a826bad6ee2ca1e4bdebe639ab306d2904fa3ef2a308ecfaab3811" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="2.2.0">
+         <artifact name="kotlin-reflect-2.2.0.jar">
+            <sha256 value="230d91c2e410e3cfca3a4dc73d255455f62ff52aac091a33397a6e30bde91bf7" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-sam-with-receiver" version="2.0.21">
@@ -5918,19 +5941,19 @@
             <sha256 value="c7cf1de955df22a162872226bd0677c9a0c8b6630a2e2d73d11d147cd0c53b73" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-script-runtime" version="2.0.0">
-         <artifact name="kotlin-script-runtime-2.0.0.jar">
-            <sha256 value="b57a14387a504f1d3d8634899a830cb0bc5fe1adb86a62cc65d940fe982b04f9" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-script-runtime" version="2.0.21">
          <artifact name="kotlin-script-runtime-2.0.21.jar">
             <sha256 value="9c111f8d08ade455566272d561921adc2b2cb6b7a4ccee38d9829c5e3a1ca6a3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-script-runtime" version="2.1.21">
-         <artifact name="kotlin-script-runtime-2.1.21.jar">
-            <sha256 value="d8221f445854f30ac92c248d543609e0ecb5d85bb5ba34c043684b013cb5b897" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-script-runtime" version="2.2.0">
+         <artifact name="kotlin-script-runtime-2.2.0.jar">
+            <sha256 value="4ed97fd1e0c9bb1d0948ed5e63cc91456313a59518295b92b2c1514aef556150" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-script-runtime" version="2.2.0-Beta2">
+         <artifact name="kotlin-script-runtime-2.2.0-Beta2.jar">
+            <sha256 value="a3c849c8b4260bdd114a9f0fb8ffdddbcd66bf58f9e2508928f0edc2f9cdcd9b" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-scripting-common" version="2.0.21">
@@ -5938,9 +5961,9 @@
             <sha256 value="f87deb2b14d068f99cba18217d80af85481c029c731ad8704458e9add9ca20f8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-scripting-common" version="2.1.21">
-         <artifact name="kotlin-scripting-common-2.1.21.jar">
-            <sha256 value="4582e2a7c07f9533a9b4a6408a32a5f57965dfb145d646860ad867d4630843f1" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-scripting-common" version="2.2.0">
+         <artifact name="kotlin-scripting-common-2.2.0.jar">
+            <sha256 value="7c9ac8499fa91b201ea7836537c625dd52a82549e57e6b3f175cc0c79e9ab604" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-scripting-compiler-embeddable" version="2.0.21">
@@ -5948,9 +5971,9 @@
             <sha256 value="2413c230fdd8cd47ebbeba273e4df94cf3b44cb3ec95d2cb35472c93768c9f1c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-scripting-compiler-embeddable" version="2.1.21">
-         <artifact name="kotlin-scripting-compiler-embeddable-2.1.21.jar">
-            <sha256 value="b5b1e0f4062f91cfe216d70617e8af9774b5288fd819e0ce5f6050f8d86e92fa" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-scripting-compiler-embeddable" version="2.2.0">
+         <artifact name="kotlin-scripting-compiler-embeddable-2.2.0.jar">
+            <sha256 value="92c7d6ec7c5f05d8ac01c37e747ac677d892e99bac0de5e516683b8f3640772b" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-scripting-compiler-impl-embeddable" version="2.0.21">
@@ -5958,9 +5981,9 @@
             <sha256 value="6ed0fa5beb25466883989b5641f36809479260b7014535502fd387ce6c7ba833" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-scripting-compiler-impl-embeddable" version="2.1.21">
-         <artifact name="kotlin-scripting-compiler-impl-embeddable-2.1.21.jar">
-            <sha256 value="a1295f282b070c0cefdb968614f6f64aa71f1bdbe746f1edf63527407d5d96b1" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-scripting-compiler-impl-embeddable" version="2.2.0">
+         <artifact name="kotlin-scripting-compiler-impl-embeddable-2.2.0.jar">
+            <sha256 value="1d26cbddaeeb6ffd458085396ecea0b080fc228fe006dcf8303da57711f33745" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-scripting-jvm" version="2.0.21">
@@ -5968,22 +5991,22 @@
             <sha256 value="88427f0f7a4c47845fa2221d29f6e0e0d7cbe73c3edf8bca30b4d8b3a336a77c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-scripting-jvm" version="2.1.21">
-         <artifact name="kotlin-scripting-jvm-2.1.21.jar">
-            <sha256 value="b3fe1f72e9ad482d726f89e139f45c4afe7b3f80adfe4cdc91dcc0a22637978d" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-scripting-jvm" version="2.2.0">
+         <artifact name="kotlin-scripting-jvm-2.2.0.jar">
+            <sha256 value="60a8c742d61f44f2311fbdc8a86b767d171ba09d97be72d6ba450d37f7e3fdbf" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-serialization" version="2.1.21">
-         <artifact name="kotlin-serialization-2.1.21-gradle85.jar">
-            <sha256 value="1ba3ae970ab921d93af784a27d0438c0f8de5d3231a8a5fc968ed5f88364e5de" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-serialization" version="2.2.0">
+         <artifact name="kotlin-serialization-2.2.0-gradle813.jar">
+            <sha256 value="e4ea40b322c9aa6b1d4f92b8e1b9b8d5234e6c9cb184f33434ca27a82b61ff24" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-serialization-2.1.21.module">
-            <sha256 value="b253b02f50651525b801e2945d9afd45552b4420bf14fce1c500ca5f8947c9cf" origin="Generated by Gradle"/>
+         <artifact name="kotlin-serialization-2.2.0.module">
+            <sha256 value="2796335b691a5b59112904890fb984cf69a2ba426b94b02b4d3f0d6eb836ec64" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-serialization-compiler-plugin-embeddable" version="2.1.21">
-         <artifact name="kotlin-serialization-compiler-plugin-embeddable-2.1.21.jar">
-            <sha256 value="d21480ecec14e022da202afbc409167c53c64ff640bfb21902230fedc6285de1" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-serialization-compiler-plugin-embeddable" version="2.2.0">
+         <artifact name="kotlin-serialization-compiler-plugin-embeddable-2.2.0.jar">
+            <sha256 value="fb542c2d78b9486ad8afdac2e5fe481e2cecd1ff6ac0d5e55517819205fb869d" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.4.21">
@@ -6006,14 +6029,6 @@
             <sha256 value="35aeffbe2db5aa446072cee50fcee48b7fa9e2fc51ca37c0cc7d7d0bc39d952e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.0.0">
-         <artifact name="kotlin-stdlib-2.0.0.jar">
-            <sha256 value="240938c4aab8e73e888703e3e7d3f87383ffe5bd536d6d5e3c100d4cd0379fcf" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="kotlin-stdlib-2.0.0.module">
-            <sha256 value="64f96ea8e7b9896731052241ffd3a265f8274d761e5fe9dc088ac45b31718341" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.0.21">
          <artifact name="kotlin-stdlib-2.0.21-all.jar">
             <sha256 value="50ffadeb20b4d2456a526595a4f7a9e85889682715073e6cdba1b1d80e3ad458" origin="Generated by Gradle"/>
@@ -6044,15 +6059,23 @@
             <sha256 value="55d296e45445f6c88699b0896706ea9550af87ad94873dc13b65bebbd5660a6f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.1.21">
-         <artifact name="kotlin-stdlib-2.1.21-all.jar">
-            <sha256 value="81e07de34e84b29e14f3fdef902f4bc4cf1d5da959b867df683fbe1cc54ce1e1" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.2.0">
+         <artifact name="kotlin-stdlib-2.2.0-all.jar">
+            <sha256 value="e2300faa59c935293dabb0a183d2e6108a9b011c427076c3f7ba10d24b73ba0a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-stdlib-2.1.21.jar">
-            <sha256 value="263bdc679e1f62012db7b091796279b6d71cf36f4797a98ff1ace05835f201c8" origin="Generated by Gradle"/>
+         <artifact name="kotlin-stdlib-2.2.0.jar">
+            <sha256 value="65d12d85a3b865c160db9147851712a64b10dadd68b22eea22a95bf8a8670dca" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-stdlib-2.1.21.module">
-            <sha256 value="0d3735043d68b7a5afb44d27de65f80a9d2b208462709c2edbb48fd5b395ad8a" origin="Generated by Gradle"/>
+         <artifact name="kotlin-stdlib-2.2.0.module">
+            <sha256 value="a5b98fdcd9db017d542e197225dcee18d658a56de1db2cc41e13196d6b1769a4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.2.0-Beta2">
+         <artifact name="kotlin-stdlib-2.2.0-Beta2.jar">
+            <sha256 value="13b2e5fb939ce83784f8617525e03672a7ff903453e36eed6331163366772f83" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-2.2.0-Beta2.module">
+            <sha256 value="bc8ef44c20e8f8b168e5c6a622e390fabbcb56334edc7f3509bc2517a0fa79cc" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.4.21">
@@ -6095,9 +6118,9 @@
             <sha256 value="94d0ad2b2319b85c40351cf9ee7077da12dd3850392e6cf10a3fe8159fbc73f7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="2.1.21">
-         <artifact name="kotlin-stdlib-common-2.1.21.module">
-            <sha256 value="a4d8fc14cedb3779843a47fbce522fd173e9875091964dbac1b8dd7884f6c1f9" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="2.2.0">
+         <artifact name="kotlin-stdlib-common-2.2.0.module">
+            <sha256 value="58fc0d664fc3a67e7e6be9fdbeaedbd212dfa3e527f744f861e792cda72c0e47" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.6.21">
@@ -6120,11 +6143,6 @@
             <sha256 value="33d148db0e11debd0d90677d28242bced907f9c77730000fd597867089039d86" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="2.0.0">
-         <artifact name="kotlin-stdlib-jdk7-2.0.0.jar">
-            <sha256 value="dd958064f946b01f745365c2efa11e4c5812a22e26b6caa4433f207fb5b4a5c5" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="2.1.0">
          <artifact name="kotlin-stdlib-jdk7-2.1.0.jar">
             <sha256 value="fdea6c4203724f42e8e64bef2f0bf79129ccd1df1edf1ccffdc22de7df498c76" origin="Generated by Gradle"/>
@@ -6175,39 +6193,39 @@
             <sha256 value="87b4f956de27401446227e474ac7a31acff0d0a8087160c54288c1e6f46a67e6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-test" version="2.0.0">
-         <artifact name="kotlin-test-2.0.0.jar">
-            <sha256 value="8438cc11769da31cbb4445dfafd12c08cf4015daa387963106f121a85a56864c" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-test" version="2.2.0">
+         <artifact name="kotlin-test-2.2.0-all.jar">
+            <sha256 value="a6d8c4dde82061812dac09728bbe7f7e8adf2f928335f33ac233f34b8da21b67" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-test-2.0.0.module">
-            <sha256 value="53c0f17a1388041cdf8578fdc425dc717221f177c8c839fb2930a08951aa1d25" origin="Generated by Gradle"/>
+         <artifact name="kotlin-test-2.2.0.jar">
+            <sha256 value="8db175a3f56cf139ebdf8936f293ce5a64a16b52a0408804e0ec077e8848eb32" origin="Generated by Gradle"/>
          </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-test" version="2.1.21">
-         <artifact name="kotlin-test-2.1.21-all.jar">
-            <sha256 value="d3b7cf9622b74e8ea4c0d36f4bd5ff9d1d31b32fe350e46e082047c5be3c6a57" origin="Generated by Gradle"/>
+         <artifact name="kotlin-test-2.2.0.module">
+            <sha256 value="54a7e1c07d567b0e0c7d9139579eb741ed07e0de5b5a0c7ff3a57ad35ee65a3c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-test-2.1.21.jar">
-            <sha256 value="0177d6d1ffdb2fa0d76c26c2228c991de537dbd89f1766624b43ab09d3da7643" origin="Generated by Gradle"/>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-test" version="2.2.0-Beta2">
+         <artifact name="kotlin-test-2.2.0-Beta2.jar">
+            <sha256 value="74d3f3b410c9dbc100ce935debc26fe2b5dc0d1e0c7079fbe0a410442d3ca7d3" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-test-2.1.21.module">
-            <sha256 value="b313d8cb82e4d1a7f798cebca91dcef8182e0078369fefab41789848ffcf9534" origin="Generated by Gradle"/>
+         <artifact name="kotlin-test-2.2.0-Beta2.module">
+            <sha256 value="30a91a61299f13ddfeb2c937a2f696fe0d02a4d3f624e8db0eced8d3108196f2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-test-junit" version="2.1.21">
-         <artifact name="kotlin-test-junit-2.1.21.jar">
-            <sha256 value="45ca97f27b3ed86ce5b77473962da539cef652f5fe5414524e79b863d83ce867" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-test-junit" version="2.2.0">
+         <artifact name="kotlin-test-junit-2.2.0.jar">
+            <sha256 value="f45ed32e721d901d3cbe83ece7f41c98533b34155186368a79bfdc667e433dce" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-test-junit-2.1.21.module">
-            <sha256 value="a4bb080087a2d586f33e89362cc7f4baf4649fee6255703df3985ea1147a44dd" origin="Generated by Gradle"/>
+         <artifact name="kotlin-test-junit-2.2.0.module">
+            <sha256 value="9faf92212550b1c8c8d13058b575e7ea70028a8583171b4a648d3be919f84ee3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-test-junit5" version="2.1.21">
-         <artifact name="kotlin-test-junit5-2.1.21.jar">
-            <sha256 value="3c8099d9850475c08eb761fd6a0b704eb3d908ee546de997858c59af26f88208" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-test-junit5" version="2.2.0">
+         <artifact name="kotlin-test-junit5-2.2.0.jar">
+            <sha256 value="716c89ba2e387c4422ea0e9a85c5731f9a328b669a7a0bbed3259e52291b555e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="kotlin-test-junit5-2.1.21.module">
-            <sha256 value="92f1639244be04e161a095cacfdd06d058fea9dfc2fc7651e391c715fc122de0" origin="Generated by Gradle"/>
+         <artifact name="kotlin-test-junit5-2.2.0.module">
+            <sha256 value="5a6a3ae11481440ff885e9d286fa432e340b21538368a3f6ad71df9b383ad883" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-tooling-core" version="2.0.21">
@@ -6215,9 +6233,9 @@
             <sha256 value="5b6f148548fe9e074df51f4225344433bf0375ac5b39ffcd3d7bd7d7f602d629" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-tooling-core" version="2.1.21">
-         <artifact name="kotlin-tooling-core-2.1.21.jar">
-            <sha256 value="b4fbb523e8662d4a8451b9a36a9e7fd43f637cb0cd6a9b9e3681719665dabd8d" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-tooling-core" version="2.2.0">
+         <artifact name="kotlin-tooling-core-2.2.0.jar">
+            <sha256 value="74014ec4f3ef78ce7da7e3e6964f2c526a3121d5c58fef8ca2979e5f344582f4" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-util-io" version="2.0.21">
@@ -6225,9 +6243,9 @@
             <sha256 value="0efee4c20f3e7f912b31c796c4e47f9d14ea68803ec7ed4e5d4f24258e3aa61e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-util-io" version="2.1.21">
-         <artifact name="kotlin-util-io-2.1.21.jar">
-            <sha256 value="e372492a2b0556d62fd038e3edfc4531b55065486ce28d04f47063d2bc030c1c" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-util-io" version="2.2.0">
+         <artifact name="kotlin-util-io-2.2.0.jar">
+            <sha256 value="87fff3c01970aaa9011abde565bb52a179aa6dc9038c58789281ed2b68d58e2d" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-util-klib" version="2.0.21">
@@ -6235,14 +6253,14 @@
             <sha256 value="a13b73896554b48e4bef4d8a4630ea7e940149ac4cadccac06914639146549ea" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-util-klib" version="2.1.21">
-         <artifact name="kotlin-util-klib-2.1.21.jar">
-            <sha256 value="a524831e9795d3e756d4de54cbd5b210de8097dad7c478abc957ae3f60e0a716" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-util-klib" version="2.2.0">
+         <artifact name="kotlin-util-klib-2.2.0.jar">
+            <sha256 value="14f07ebd9adfbe4e85fb4ebf31225250b2fc3f5428ece437d4ed63ec3fa9ac4d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-util-klib-metadata" version="2.1.21">
-         <artifact name="kotlin-util-klib-metadata-2.1.21.jar">
-            <sha256 value="94c7fcb40405f56482400baa235c96e81010c1e043bff6300b70b34e5ea8d9bb" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-util-klib-metadata" version="2.2.0">
+         <artifact name="kotlin-util-klib-metadata-2.2.0.jar">
+            <sha256 value="9ce3b0de053cb9ff07a0f717ca142f290a74e4d19d9332db226abe0feb61c81e" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlinx" name="atomicfu" version="0.17.0">
@@ -6649,6 +6667,11 @@
             <sha256 value="8f632f8965e9b6f4069e3d58b9ea26b9a5bc76a98e89b43233777ace6dadb237" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit" name="junit-bom" version="5.12.2">
+         <artifact name="junit-bom-5.12.2.module">
+            <sha256 value="de70ac5d91a52656d8890a6d23b9e04d99b99b1a0402530decad71bf31b2735e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit" name="junit-bom" version="5.13.0">
          <artifact name="junit-bom-5.13.0.module">
             <sha256 value="bf75304168028b4a0975ef8654802b155aeae47e694f689425f4c5a9f1e3e885" origin="Generated by Gradle"/>
@@ -6659,16 +6682,16 @@
             <sha256 value="33c07ab9724790a6e5859ba07d69117ac530439724545a81c4179e3272c75de8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.junit" name="junit-bom" version="5.8.2">
-         <artifact name="junit-bom-5.8.2.module">
-            <sha256 value="40cfad993fa70ecdf2af74d0c56da1484ee220964be8f932cfe632be9a2733fa" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.junit" name="junit-bom" version="5.9.2">
          <artifact name="junit-bom-5.9.2.module">
             <sha256 value="ab137ba5a8e32c9b066bf9126a1c76dd5614b724ba5c0b02549772b5e9f4cf1f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.jupiter" name="junit-jupiter" version="5.12.2">
+         <artifact name="junit-jupiter-5.12.2.module">
+            <sha256 value="8a8229a8a0f849efc1cc3ffd5cf94de16eac80061c5f93397a85c093c9d7ea70" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.jupiter" name="junit-jupiter" version="5.13.1">
          <artifact name="junit-jupiter-5.13.1.jar">
             <sha256 value="ba0ba2fa755b671e4fc7d28faf0cbd692875f9d9fd10f845ed64101ec641837d" origin="Generated by Gradle"/>
@@ -6677,11 +6700,6 @@
             <sha256 value="8a4927a8d18b8a3d736d4782fa3b7748123f64d802bdd220e344f7d82cfb1cc4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.junit.jupiter" name="junit-jupiter" version="5.8.2">
-         <artifact name="junit-jupiter-5.8.2.module">
-            <sha256 value="d9df47b3c7431883ab1f1f1d820c2980ebcbd753edc4c82b99bf5ec2c533ad2e" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.junit.jupiter" name="junit-jupiter-api" version="5.13.1">
          <artifact name="junit-jupiter-api-5.13.1.jar">
             <sha256 value="3f7bd659a2f1497f8708c55ea1337842c52a5866ee27305e337cc3211596bcea" origin="Generated by Gradle"/>
@@ -6711,14 +6729,6 @@
             <sha256 value="8f1faf65322bb7337fe598978c08aa2e407ce7279ac8f2f6b4b8cf4f2406854d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.junit.platform" name="junit-platform-commons" version="1.13.0">
-         <artifact name="junit-platform-commons-1.13.0.jar">
-            <sha256 value="ec451e45ae8a6c41f12bc56f6b2ed5dd74349ef5eb86e818c6ccebb97753b7da" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="junit-platform-commons-1.13.0.module">
-            <sha256 value="76d5cb98df4389767a7a718b20379a83cf46c764e98d745db015f1466ae463c0" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.junit.platform" name="junit-platform-commons" version="1.13.1">
          <artifact name="junit-platform-commons-1.13.1.jar">
             <sha256 value="883d4f23d774976e7835e0695340963ed01f6c7796321e227a932ee36135887e" origin="Generated by Gradle"/>
@@ -6727,11 +6737,6 @@
             <sha256 value="36446c867988ea70ddc62ea1ff405b1997919f903c799ab5006328a2c8c3b320" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.junit.platform" name="junit-platform-engine" version="1.13.0">
-         <artifact name="junit-platform-engine-1.13.0.module">
-            <sha256 value="a1378700a3c66584d5acef5ae75c840ce54d599942b58dbabbda9432271c4302" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.junit.platform" name="junit-platform-engine" version="1.13.1">
          <artifact name="junit-platform-engine-1.13.1.jar">
             <sha256 value="0863112f8509429b7c6c8cc1ff4619f4af450a0851b0fd95fde560cc7b9cd17e" origin="Generated by Gradle"/>
@@ -6740,11 +6745,6 @@
             <sha256 value="77907381f1294bdd2be205e16e9c62471fbdfc8c0b43ca9fe6d1b8cbbc04ec75" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.junit.platform" name="junit-platform-launcher" version="1.13.0">
-         <artifact name="junit-platform-launcher-1.13.0.module">
-            <sha256 value="22038eeb3c0dba71449a4d34841d4022856d3bef1bf26e3b9bf8d431fc6dfa85" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.junit.platform" name="junit-platform-launcher" version="1.13.1">
          <artifact name="junit-platform-launcher-1.13.1.jar">
             <sha256 value="a10e55cdff060bc557bb011f1c428831c5b8288562d2f6b565572f043f1dd41e" origin="Generated by Gradle"/>
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 9128c7d428..3735f265b9 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=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/android/lib/billing/build.gradle.kts b/android/lib/billing/build.gradle.kts
index 9c124d7358..e564703d38 100644
--- a/android/lib/billing/build.gradle.kts
+++ b/android/lib/billing/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -19,9 +21,11 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
-        allWarningsAsErrors = true
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get())
+            allWarningsAsErrors = true
+        }
     }
 
     lint {
diff --git a/android/lib/common-test/build.gradle.kts b/android/lib/common-test/build.gradle.kts
index 68e05a8ee2..9e6a06a8a6 100644
--- a/android/lib/common-test/build.gradle.kts
+++ b/android/lib/common-test/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -15,9 +17,11 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
-        allWarningsAsErrors = true
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get())
+            allWarningsAsErrors = true
+        }
     }
 
     lint {
diff --git a/android/lib/common/build.gradle.kts b/android/lib/common/build.gradle.kts
index ff8bb7521f..48172b9593 100644
--- a/android/lib/common/build.gradle.kts
+++ b/android/lib/common/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -16,9 +18,11 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
-        allWarningsAsErrors = true
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get())
+            allWarningsAsErrors = true
+        }
     }
 
     lint {
diff --git a/android/lib/daemon-grpc/build.gradle.kts b/android/lib/daemon-grpc/build.gradle.kts
index 774124a135..d4a6d0e7a2 100644
--- a/android/lib/daemon-grpc/build.gradle.kts
+++ b/android/lib/daemon-grpc/build.gradle.kts
@@ -1,4 +1,5 @@
 import com.google.protobuf.gradle.proto
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
@@ -20,9 +21,11 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
-        allWarningsAsErrors = true
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get())
+            allWarningsAsErrors = true
+        }
     }
 
     lint {
diff --git a/android/lib/endpoint/build.gradle.kts b/android/lib/endpoint/build.gradle.kts
index fdff5dc202..90115ebd01 100644
--- a/android/lib/endpoint/build.gradle.kts
+++ b/android/lib/endpoint/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -16,9 +18,11 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
-        allWarningsAsErrors = true
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get())
+            allWarningsAsErrors = true
+        }
     }
 
     lint {
diff --git a/android/lib/map/build.gradle.kts b/android/lib/map/build.gradle.kts
index 81aecdeda9..347adb4d31 100644
--- a/android/lib/map/build.gradle.kts
+++ b/android/lib/map/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -16,9 +18,11 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
-        allWarningsAsErrors = true
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get())
+            allWarningsAsErrors = true
+        }
     }
 
     buildFeatures {
diff --git a/android/lib/model/build.gradle.kts b/android/lib/model/build.gradle.kts
index c91a930627..1f65766ffc 100644
--- a/android/lib/model/build.gradle.kts
+++ b/android/lib/model/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -21,9 +23,11 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
-        allWarningsAsErrors = true
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get())
+            allWarningsAsErrors = true
+        }
     }
 
     lint {
diff --git a/android/lib/payment/build.gradle.kts b/android/lib/payment/build.gradle.kts
index 56f4d27047..b1169afb9c 100644
--- a/android/lib/payment/build.gradle.kts
+++ b/android/lib/payment/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -19,9 +21,11 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
-        allWarningsAsErrors = true
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get())
+            allWarningsAsErrors = true
+        }
     }
 
     lint {
diff --git a/android/lib/resource/build.gradle.kts b/android/lib/resource/build.gradle.kts
index 969f67c9a2..c5aa7ef474 100644
--- a/android/lib/resource/build.gradle.kts
+++ b/android/lib/resource/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -16,9 +18,11 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
-        allWarningsAsErrors = true
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get())
+            allWarningsAsErrors = true
+        }
     }
 
     lint {
diff --git a/android/lib/shared/build.gradle.kts b/android/lib/shared/build.gradle.kts
index a025a0a72a..04ed8c8901 100644
--- a/android/lib/shared/build.gradle.kts
+++ b/android/lib/shared/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -17,9 +19,11 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
-        allWarningsAsErrors = true
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get())
+            allWarningsAsErrors = true
+        }
     }
 
     lint {
diff --git a/android/lib/talpid/build.gradle.kts b/android/lib/talpid/build.gradle.kts
index 81747e0c88..26342ac403 100644
--- a/android/lib/talpid/build.gradle.kts
+++ b/android/lib/talpid/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -16,9 +18,11 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
-        allWarningsAsErrors = true
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get())
+            allWarningsAsErrors = true
+        }
     }
 
     lint {
diff --git a/android/lib/theme/build.gradle.kts b/android/lib/theme/build.gradle.kts
index 3ac5d227e3..2fcfc0c48d 100644
--- a/android/lib/theme/build.gradle.kts
+++ b/android/lib/theme/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -18,9 +20,11 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
-        allWarningsAsErrors = true
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get())
+            allWarningsAsErrors = true
+        }
     }
 
     lint {
diff --git a/android/lib/tv/build.gradle.kts b/android/lib/tv/build.gradle.kts
index aa4eb89bae..4b5ca98f95 100644
--- a/android/lib/tv/build.gradle.kts
+++ b/android/lib/tv/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -18,9 +20,11 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
-        allWarningsAsErrors = true
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get())
+            allWarningsAsErrors = true
+        }
     }
 
     lint {
diff --git a/android/lib/ui/component/build.gradle.kts b/android/lib/ui/component/build.gradle.kts
index a63362db66..8ca10e29c5 100644
--- a/android/lib/ui/component/build.gradle.kts
+++ b/android/lib/ui/component/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -18,9 +20,11 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
-        allWarningsAsErrors = true
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get())
+            allWarningsAsErrors = true
+        }
     }
 
     lint {
diff --git a/android/lib/ui/tag/build.gradle.kts b/android/lib/ui/tag/build.gradle.kts
index 1d08f395f9..f31e63ff30 100644
--- a/android/lib/ui/tag/build.gradle.kts
+++ b/android/lib/ui/tag/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -15,9 +17,11 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
-        allWarningsAsErrors = true
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get())
+            allWarningsAsErrors = true
+        }
     }
 
     lint {
diff --git a/android/service/build.gradle.kts b/android/service/build.gradle.kts
index f7d214570f..aae1662d2b 100644
--- a/android/service/build.gradle.kts
+++ b/android/service/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -25,9 +27,11 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
-        allWarningsAsErrors = true
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get())
+            allWarningsAsErrors = true
+        }
     }
 
     lint {
diff --git a/android/test/arch/build.gradle.kts b/android/test/arch/build.gradle.kts
index 11503955d7..68997325a6 100644
--- a/android/test/arch/build.gradle.kts
+++ b/android/test/arch/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -16,9 +18,11 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
-        allWarningsAsErrors = true
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get())
+            allWarningsAsErrors = true
+        }
     }
 
     lint {
diff --git a/android/test/common/build.gradle.kts b/android/test/common/build.gradle.kts
index 0a089017af..c3939ffc39 100644
--- a/android/test/common/build.gradle.kts
+++ b/android/test/common/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -16,9 +18,11 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
-        allWarningsAsErrors = true
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get())
+            allWarningsAsErrors = true
+        }
     }
 
     lint {
diff --git a/android/test/e2e/build.gradle.kts b/android/test/e2e/build.gradle.kts
index c68d1c89aa..d678add1b0 100644
--- a/android/test/e2e/build.gradle.kts
+++ b/android/test/e2e/build.gradle.kts
@@ -1,4 +1,5 @@
 import org.gradle.internal.extensions.stdlib.capitalized
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.test)
@@ -63,9 +64,11 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
-        allWarningsAsErrors = true
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get())
+            allWarningsAsErrors = true
+        }
     }
 
     lint {
diff --git a/android/test/mockapi/build.gradle.kts b/android/test/mockapi/build.gradle.kts
index 2a96d32028..aa89e0b011 100644
--- a/android/test/mockapi/build.gradle.kts
+++ b/android/test/mockapi/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.test)
     alias(libs.plugins.kotlin.android)
@@ -37,9 +39,11 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
-        allWarningsAsErrors = true
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get())
+            allWarningsAsErrors = true
+        }
     }
 
     lint {
diff --git a/android/tile/build.gradle.kts b/android/tile/build.gradle.kts
index a8fc409e1b..b956a6e123 100644
--- a/android/tile/build.gradle.kts
+++ b/android/tile/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -16,9 +18,11 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvm.target.get()
-        allWarningsAsErrors = true
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jvm.target.get())
+            allWarningsAsErrors = true
+        }
     }
 
     lint {