Merge pull request #825 from arkivanov/kotlin-2.1.0

arkivanov · web-flow · commit 537afc3fc781 · 2025-01-02T20:51:15.000Z
Updated Kotlin to 2.1.0, Essenty to 2.4.0, AGP to 8.7.3, Gradle to 8.11.1
diff --git a/decompose/build.gradle.kts b/decompose/build.gradle.kts
@@ -58,9 +58,6 @@ kotlin {
         common.test.dependencies {
             implementation(deps.jetbrains.kotlinx.kotlinxCoroutinesCore)
             implementation(deps.jetbrains.kotlinx.kotlinxSerializationJson)
-
-            // Workaround: https://github.com/Kotlin/kotlinx.coroutines/issues/3968
-            implementation("org.jetbrains.kotlinx:atomicfu:0.23.1")
         }
 
         android.main.dependencies {
@@ -74,6 +71,10 @@ kotlin {
         web.main.dependencies {
             implementation(deps.jetbrains.kotlinx.kotlinxSerializationJson)
         }
+
+        wasmJs.main.dependencies {
+            implementation(deps.jetbrains.kotlinx.kotlinxBrowser)
+        }
     }
 }
 
diff --git a/decompose/src/commonTest/kotlin/com/arkivanov/decompose/router/stack/ChildStackIntegrationTest.kt b/decompose/src/commonTest/kotlin/com/arkivanov/decompose/router/stack/ChildStackIntegrationTest.kt
@@ -3,6 +3,7 @@ package com.arkivanov.decompose.router.stack
 import com.arkivanov.decompose.ComponentContext
 import com.arkivanov.decompose.DecomposeExperimentFlags
 import com.arkivanov.decompose.DefaultComponentContext
+import com.arkivanov.decompose.DelicateDecomposeApi
 import com.arkivanov.decompose.consume
 import com.arkivanov.decompose.register
 import com.arkivanov.decompose.router.TestInstance
@@ -26,6 +27,7 @@ import kotlin.test.assertFalse
 import kotlin.test.assertNotEquals
 import kotlin.test.assertTrue
 
+@OptIn(DelicateDecomposeApi::class)
 @Suppress("TestFunctionName")
 class ChildStackIntegrationTest {
 
diff --git a/decompose/src/commonTest/kotlin/com/arkivanov/decompose/router/stack/RouterPushTest.kt b/decompose/src/commonTest/kotlin/com/arkivanov/decompose/router/stack/RouterPushTest.kt
@@ -1,9 +1,11 @@
 package com.arkivanov.decompose.router.stack
 
+import com.arkivanov.decompose.DelicateDecomposeApi
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
+@OptIn(DelicateDecomposeApi::class)
 @Suppress("TestFunctionName")
 class RouterPushTest {
 
diff --git a/deps.versions.toml b/deps.versions.toml
@@ -1,17 +1,18 @@
 [versions]
 
 decompose = "3.3.0-alpha02"
-kotlin = "2.0.20"
-essenty = "2.3.0"
+kotlin = "2.1.0"
+essenty = "2.4.0"
 reaktive = "2.2.0"
 junit = "4.13.2"
 jetbrainsCompose = "1.7.0"
 jetbrainsKotlinWrappers = "1.0.0-pre.608"
-jetbrainsKotlinxCoroutines = "1.8.1"
+jetbrainsKotlinxCoroutines = "1.9.0"
 jetbrainsKotlinxSerialization = "1.6.3"
+jetbrainsKotlinxBrowser = "0.3"
 jetbrainsBinaryCompatibilityValidator = "0.16.3"
 robolectric = "4.9.1"
-androidGradle = "8.2.0"
+androidGradle = "8.7.3"
 androidMaterial = "1.6.1"
 androidPlay = "1.10.3"
 androidxCore = "1.9.0"
@@ -46,6 +47,7 @@ jetbrains-kotlinx-kotlinxCoroutinesSwing = { group = "org.jetbrains.kotlinx", na
 jetbrains-kotlin-serializationGradlePlug = { group = "org.jetbrains.kotlin", name = "kotlin-serialization", version.ref = "kotlin" }
 jetbrains-kotlinx-kotlinxSerializationCore = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version.ref = "jetbrainsKotlinxSerialization" }
 jetbrains-kotlinx-kotlinxSerializationJson = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "jetbrainsKotlinxSerialization" }
+jetbrains-kotlinx-kotlinxBrowser = { group = "org.jetbrains.kotlinx", name = "kotlinx-browser", version.ref = "jetbrainsKotlinxBrowser" }
 
 robolectric-robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" }
 
diff --git a/extensions-compose-experimental/api/android/extensions-compose-experimental.api b/extensions-compose-experimental/api/android/extensions-compose-experimental.api
@@ -21,14 +21,6 @@ public abstract interface class com/arkivanov/decompose/extensions/compose/exper
 
 public final class com/arkivanov/decompose/extensions/compose/experimental/panels/ComposableSingletons$ChildPanelsKt {
 	public static final field INSTANCE Lcom/arkivanov/decompose/extensions/compose/experimental/panels/ComposableSingletons$ChildPanelsKt;
-	public static field lambda-1 Lkotlin/jvm/functions/Function2;
-	public static field lambda-2 Lkotlin/jvm/functions/Function3;
-	public static field lambda-3 Lkotlin/jvm/functions/Function2;
-	public static field lambda-4 Lkotlin/jvm/functions/Function3;
-	public static field lambda-5 Lkotlin/jvm/functions/Function2;
-	public static field lambda-6 Lkotlin/jvm/functions/Function2;
-	public static field lambda-7 Lkotlin/jvm/functions/Function2;
-	public static field lambda-8 Lkotlin/jvm/functions/Function2;
 	public fun <init> ()V
 	public final fun getLambda-1$extensions_compose_experimental_release ()Lkotlin/jvm/functions/Function2;
 	public final fun getLambda-2$extensions_compose_experimental_release ()Lkotlin/jvm/functions/Function3;
diff --git a/extensions-compose-experimental/api/jvm/extensions-compose-experimental.api b/extensions-compose-experimental/api/jvm/extensions-compose-experimental.api
@@ -21,14 +21,6 @@ public abstract interface class com/arkivanov/decompose/extensions/compose/exper
 
 public final class com/arkivanov/decompose/extensions/compose/experimental/panels/ComposableSingletons$ChildPanelsKt {
 	public static final field INSTANCE Lcom/arkivanov/decompose/extensions/compose/experimental/panels/ComposableSingletons$ChildPanelsKt;
-	public static field lambda-1 Lkotlin/jvm/functions/Function2;
-	public static field lambda-2 Lkotlin/jvm/functions/Function3;
-	public static field lambda-3 Lkotlin/jvm/functions/Function2;
-	public static field lambda-4 Lkotlin/jvm/functions/Function3;
-	public static field lambda-5 Lkotlin/jvm/functions/Function2;
-	public static field lambda-6 Lkotlin/jvm/functions/Function2;
-	public static field lambda-7 Lkotlin/jvm/functions/Function2;
-	public static field lambda-8 Lkotlin/jvm/functions/Function2;
 	public fun <init> ()V
 	public final fun getLambda-1$extensions_compose_experimental ()Lkotlin/jvm/functions/Function2;
 	public final fun getLambda-2$extensions_compose_experimental ()Lkotlin/jvm/functions/Function3;
diff --git a/extensions-compose-experimental/src/jvmTest/kotlin/com/arkivanov/decompose/extensions/compose/experimental/stack/ChildStackTest.kt b/extensions-compose-experimental/src/jvmTest/kotlin/com/arkivanov/decompose/extensions/compose/experimental/stack/ChildStackTest.kt
@@ -293,7 +293,6 @@ class ChildStackTest(
         }
     }
 
-    // Can be enum, workaround https://issuetracker.google.com/issues/195185633
     sealed class Config {
         data object A : Config()
         data object B : Config()
diff --git a/extensions-compose/api/android/extensions-compose.api b/extensions-compose/api/android/extensions-compose.api
@@ -11,8 +11,6 @@ public final class com/arkivanov/decompose/extensions/compose/pages/ChildPagesKt
 
 public final class com/arkivanov/decompose/extensions/compose/pages/ComposableSingletons$ChildPagesKt {
 	public static final field INSTANCE Lcom/arkivanov/decompose/extensions/compose/pages/ComposableSingletons$ChildPagesKt;
-	public static field lambda-1 Lkotlin/jvm/functions/Function6;
-	public static field lambda-2 Lkotlin/jvm/functions/Function6;
 	public fun <init> ()V
 	public final fun getLambda-1$extensions_compose_release ()Lkotlin/jvm/functions/Function6;
 	public final fun getLambda-2$extensions_compose_release ()Lkotlin/jvm/functions/Function6;
diff --git a/extensions-compose/api/jvm/extensions-compose.api b/extensions-compose/api/jvm/extensions-compose.api
@@ -15,8 +15,6 @@ public final class com/arkivanov/decompose/extensions/compose/pages/ChildPagesKt
 
 public final class com/arkivanov/decompose/extensions/compose/pages/ComposableSingletons$ChildPagesKt {
 	public static final field INSTANCE Lcom/arkivanov/decompose/extensions/compose/pages/ComposableSingletons$ChildPagesKt;
-	public static field lambda-1 Lkotlin/jvm/functions/Function6;
-	public static field lambda-2 Lkotlin/jvm/functions/Function6;
 	public fun <init> ()V
 	public final fun getLambda-1$extensions_compose ()Lkotlin/jvm/functions/Function6;
 	public final fun getLambda-2$extensions_compose ()Lkotlin/jvm/functions/Function6;
diff --git a/extensions-compose/src/jvmTest/kotlin/com/arkivanov/decompose/extensions/compose/stack/ChildrenTest.kt b/extensions-compose/src/jvmTest/kotlin/com/arkivanov/decompose/extensions/compose/stack/ChildrenTest.kt
@@ -270,7 +270,6 @@ class ChildrenTest(
             )
     }
 
-    // Can be enum, workaround https://issuetracker.google.com/issues/195185633
     sealed class Config {
         data object A : Config()
         data object B : Config()
diff --git a/extensions-compose/src/jvmTest/kotlin/com/arkivanov/decompose/extensions/compose/stack/animation/StackAnimationDirectionsTest.kt b/extensions-compose/src/jvmTest/kotlin/com/arkivanov/decompose/extensions/compose/stack/animation/StackAnimationDirectionsTest.kt
@@ -93,9 +93,9 @@ class StackAnimationDirectionsTest(
                 Params(from = listOf("a", "b", "c"), to = listOf("a", "d"), expected = mapOf("d" to ENTER_FRONT, "c" to EXIT_BACK)),
                 Params(from = listOf("a", "b"), to = listOf("c", "d"), expected = mapOf("d" to ENTER_FRONT, "b" to EXIT_BACK)),
                 Params(from = listOf("a", "b"), to = listOf("b", "a"), expected = mapOf("a" to ENTER_FRONT, "b" to EXIT_BACK)),
-                Params(from = listOf("a", "b"), to = listOf("b"), expected = emptyMap()),
-                Params(from = listOf("a", "b"), to = listOf("c", "b"), expected = emptyMap()),
-                Params(from = listOf("b", "c"), to = listOf("a", "b", "c"), expected = emptyMap()),
+                Params(from = listOf("a", "b"), to = listOf("b"), expected = mapOf("b" to ENTER_FRONT)),
+                Params(from = listOf("a", "b"), to = listOf("c", "b"), expected = mapOf("b" to ENTER_FRONT)),
+                Params(from = listOf("b", "c"), to = listOf("a", "b", "c"), expected = mapOf("c" to ENTER_FRONT)),
             )
     }
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
@@ -554,27 +554,6 @@
   resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080"
   integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==
 
-"@types/eslint-scope@^3.7.3":
-  version "3.7.4"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16"
-  integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==
-  dependencies:
-    "@types/eslint" "*"
-    "@types/estree" "*"
-
-"@types/eslint@*":
-  version "8.2.2"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.2.2.tgz#b64dbdb64b1957cfc8a698c68297fcf8983e94c7"
-  integrity sha512-nQxgB8/Sg+QKhnV8e0WzPpxjIGT3tuJDDzybkDi8ItE/IgTlHo07U0shaIjzhcvQxlq9SDRE42lsJ23uvEgJ2A==
-  dependencies:
-    "@types/estree" "*"
-    "@types/json-schema" "*"
-
-"@types/estree@*":
-  version "0.0.50"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
-  integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==
-
 "@types/estree@^1.0.5":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
@@ -612,7 +591,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/json-schema@*", "@types/json-schema@^7.0.8":
+"@types/json-schema@^7.0.8":
   version "7.0.9"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
   integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
@@ -1584,7 +1563,7 @@ engine.io@~6.5.2:
     engine.io-parser "~5.2.1"
     ws "~8.11.0"
 
-enhanced-resolve@^5.17.0:
+enhanced-resolve@^5.17.1:
   version "5.17.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
   integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
@@ -2372,10 +2351,10 @@ karma-webpack@5.0.1:
     minimatch "^9.0.3"
     webpack-merge "^4.1.5"
 
-karma@6.4.3:
-  version "6.4.3"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.3.tgz#763e500f99597218bbb536de1a14acc4ceea7ce8"
-  integrity sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q==
+karma@6.4.4:
+  version "6.4.4"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.4.tgz#dfa5a426cf5a8b53b43cd54ef0d0d09742351492"
+  integrity sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==
   dependencies:
     "@colors/colors" "1.5.0"
     body-parser "^1.19.0"
@@ -2407,6 +2386,13 @@ kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
+kotlin-web-helpers@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.0.0.tgz#b112096b273c1e733e0b86560998235c09a19286"
+  integrity sha512-xkVGl60Ygn/zuLkDPx+oHj7jeLR7hCvoNF99nhwXMn8a3ApB4lLiC9pk4ol4NHPjyoCbvQctBqvzUcp8pkqyWw==
+  dependencies:
+    format-util "^1.0.5"
+
 launch-editor@^2.6.0:
   version "2.9.1"
   resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.9.1.tgz#253f173bd441e342d4344b4dae58291abb425047"
@@ -2587,10 +2573,10 @@ mkdirp@^0.5.5:
   dependencies:
     minimist "^1.2.6"
 
-mocha@10.7.0:
-  version "10.7.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.0.tgz#9e5cbed8fa9b37537a25bd1f7fb4f6fc45458b9a"
-  integrity sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA==
+mocha@10.7.3:
+  version "10.7.3"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.3.tgz#ae32003cabbd52b59aece17846056a68eb4b0752"
+  integrity sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==
   dependencies:
     ansi-colors "^4.1.3"
     browser-stdout "^1.3.1"
@@ -3667,12 +3653,11 @@ webpack-sources@^3.2.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@5.93.0:
-  version "5.93.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5"
-  integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==
+webpack@5.94.0:
+  version "5.94.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f"
+  integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==
   dependencies:
-    "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^1.0.5"
     "@webassemblyjs/ast" "^1.12.1"
     "@webassemblyjs/wasm-edit" "^1.12.1"
@@ -3681,7 +3666,7 @@ webpack@5.93.0:
     acorn-import-attributes "^1.9.5"
     browserslist "^4.21.10"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.17.0"
+    enhanced-resolve "^5.17.1"
     es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -15,7 +15,7 @@ pluginManagement {
     resolutionStrategy {
         eachPlugin {
             if (requested.id.toString() == "com.arkivanov.gradle.setup") {
-                useModule("com.github.arkivanov:gradle-setup-plugin:8eb6bb973c")
+                useModule("com.github.arkivanov:gradle-setup-plugin:4cef58cc3b")
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,6 @@ kotlin {`
`58`	`58`	`common.test.dependencies {`
`59`	`59`	`implementation(deps.jetbrains.kotlinx.kotlinxCoroutinesCore)`
`60`	`60`	`implementation(deps.jetbrains.kotlinx.kotlinxSerializationJson)`
`61`		`-`
`62`		`- // Workaround: https://github.com/Kotlin/kotlinx.coroutines/issues/3968`
`63`		`- implementation("org.jetbrains.kotlinx:atomicfu:0.23.1")`
`64`	`61`	`}`
`65`	`62`
`66`	`63`	`android.main.dependencies {`
`@@ -74,6 +71,10 @@ kotlin {`
`74`	`71`	`web.main.dependencies {`
`75`	`72`	`implementation(deps.jetbrains.kotlinx.kotlinxSerializationJson)`
`76`	`73`	`}`
	`74`	`+`
	`75`	`+ wasmJs.main.dependencies {`
	`76`	`+ implementation(deps.jetbrains.kotlinx.kotlinxBrowser)`
	`77`	`+ }`
`77`	`78`	`}`
`78`	`79`	`}`
`79`	`80`
Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,6 @@ class ChildStackTest(`
`293`	`293`	`}`
`294`	`294`	`}`
`295`	`295`
`296`		`- // Can be enum, workaround https://issuetracker.google.com/issues/195185633`
`297`	`296`	`sealed class Config {`
`298`	`297`	`data object A : Config()`
`299`	`298`	`data object B : Config()`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,6 @@ class ChildrenTest(`
`270`	`270`	`)`
`271`	`271`	`}`
`272`	`272`
`273`		`- // Can be enum, workaround https://issuetracker.google.com/issues/195185633`
`274`	`273`	`sealed class Config {`
`275`	`274`	`data object A : Config()`
`276`	`275`	`data object B : Config()`