Update to Kotlin 2.0.20 (#1605)

**Highlights** - Switch to stdlib `Uuid` implementation - Rest is just busywork in builds
slackhq · Aug 27, 2024 · 4c1cbee · 4c1cbee
1 parent 8f0353f
commit 4c1cbee
Show file tree

Hide file tree

Showing 34 changed files with 242 additions and 429 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,10 @@ Changelog
 **Unreleased**
 --------------
 
+- Update to Kotlin `2.0.20`.
+- **Change**: Switch to stdlib's implementation of `Uuid`. This release now requires Kotlin `2.0.20` or later.
 - **Behavior change**: `presenterTestOf` and `Presenter.test` have a new optional `moleculeFlowTransformer` parameter that allows for advanced filtering of the `Flow` returned out of the underlying `moleculeFlow`. By default, this now runs a `distinctUntilChanged` operator.
+- Build against KSP `2.0.20-1.0.24`.
 
 0.23.1
 ------

diff --git a/backstack/build.gradle.kts b/backstack/build.gradle.kts
@@ -1,6 +1,6 @@
 // Copyright (C) 2022 Slack Technologies, LLC
 // SPDX-License-Identifier: Apache-2.0
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
 plugins {
@@ -57,7 +57,6 @@ kotlin {
         api(libs.kotlinx.immutable)
         api(projects.circuitRuntimeScreen)
         implementation(libs.compose.runtime.saveable)
-        implementation(libs.uuid)
       }
     }
     commonTest {

diff --git a/backstack/dependencies/androidReleaseRuntimeClasspath.txt b/backstack/dependencies/androidReleaseRuntimeClasspath.txt
@@ -51,8 +51,6 @@ androidx.savedstate:savedstate
 androidx.startup:startup-runtime
 androidx.tracing:tracing
 androidx.versionedparcelable:versionedparcelable
-com.benasher44:uuid-jvm
-com.benasher44:uuid
 com.google.guava:listenablefuture
 org.jetbrains.compose.runtime:runtime-saveable
 org.jetbrains.compose.runtime:runtime

diff --git a/backstack/dependencies/jvmRuntimeClasspath.txt b/backstack/dependencies/jvmRuntimeClasspath.txt
@@ -9,8 +9,6 @@ androidx.lifecycle:lifecycle-runtime-desktop
 androidx.lifecycle:lifecycle-runtime
 androidx.lifecycle:lifecycle-viewmodel-desktop
 androidx.lifecycle:lifecycle-viewmodel
-com.benasher44:uuid-jvm
-com.benasher44:uuid
 org.jetbrains.androidx.lifecycle:lifecycle-common
 org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-desktop
 org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose

diff --git a/backstack/src/commonMain/kotlin/com/slack/circuit/backstack/SaveableBackStack.kt b/backstack/src/commonMain/kotlin/com/slack/circuit/backstack/SaveableBackStack.kt
@@ -22,9 +22,10 @@ import androidx.compose.runtime.saveable.listSaver
 import androidx.compose.runtime.saveable.mapSaver
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.snapshots.Snapshot
-import com.benasher44.uuid.uuid4
 import com.slack.circuit.runtime.screen.PopResult
 import com.slack.circuit.runtime.screen.Screen
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.channels.Channel
@@ -156,7 +157,7 @@ internal constructor(
   public data class Record(
     override val screen: Screen,
     val args: Map<String, Any?> = emptyMap(),
-    override val key: String = uuid4().toString(),
+    @OptIn(ExperimentalUuidApi::class) override val key: String = Uuid.random().toString(),
   ) : BackStack.Record {
     /**
      * A [Channel] of pending results. Note we use this instead of a [CompletableDeferred] because

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -396,10 +396,7 @@ subprojects {
 
   pluginManager.withPlugin("org.jetbrains.compose") {
     apply(plugin = "org.jetbrains.kotlin.plugin.compose")
-    configure<ComposeCompilerGradlePluginExtension> {
-      enableStrongSkippingMode = true
-      includeSourceInformation = true
-    }
+    configure<ComposeCompilerGradlePluginExtension> { includeSourceInformation = true }
   }
 
   pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {

diff --git a/circuit-foundation/build.gradle.kts b/circuit-foundation/build.gradle.kts
@@ -1,7 +1,7 @@
 // Copyright (C) 2022 Slack Technologies, LLC
 // SPDX-License-Identifier: Apache-2.0
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -60,7 +60,6 @@ kotlin {
         api(projects.circuitRuntimeUi)
         api(projects.circuitRetained)
         api(libs.compose.ui)
-        implementation(libs.uuid)
       }
     }
     androidMain {

diff --git a/circuit-foundation/dependencies/androidReleaseRuntimeClasspath.txt b/circuit-foundation/dependencies/androidReleaseRuntimeClasspath.txt
@@ -60,8 +60,6 @@ androidx.savedstate:savedstate
 androidx.startup:startup-runtime
 androidx.tracing:tracing
 androidx.versionedparcelable:versionedparcelable
-com.benasher44:uuid-jvm
-com.benasher44:uuid
 com.google.guava:listenablefuture
 org.jetbrains.compose.foundation:foundation
 org.jetbrains.compose.runtime:runtime-saveable

diff --git a/circuit-foundation/dependencies/jvmRuntimeClasspath.txt b/circuit-foundation/dependencies/jvmRuntimeClasspath.txt
@@ -9,8 +9,6 @@ androidx.lifecycle:lifecycle-runtime-desktop
 androidx.lifecycle:lifecycle-runtime
 androidx.lifecycle:lifecycle-viewmodel-desktop
 androidx.lifecycle:lifecycle-viewmodel
-com.benasher44:uuid-jvm
-com.benasher44:uuid
 org.jetbrains.androidx.lifecycle:lifecycle-common
 org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-desktop
 org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose

diff --git a/circuit-foundation/src/commonMain/kotlin/com/slack/circuit/foundation/AnsweringNavigator.kt b/circuit-foundation/src/commonMain/kotlin/com/slack/circuit/foundation/AnsweringNavigator.kt
@@ -11,13 +11,14 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
-import com.benasher44.uuid.uuid4
 import com.slack.circuit.backstack.BackStack
 import com.slack.circuit.runtime.GoToNavigator
 import com.slack.circuit.runtime.Navigator
 import com.slack.circuit.runtime.screen.PopResult
 import com.slack.circuit.runtime.screen.Screen
 import kotlin.reflect.KClass
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 import kotlinx.coroutines.CoroutineScope
 
 /**
@@ -104,7 +105,7 @@ public fun <T : PopResult> rememberAnsweringNavigator(
   }
 
   // Key for the resultKey, so we can track who owns this requested result
-  val key = rememberSaveable { uuid4().toString() }
+  val key = rememberSaveable { @OptIn(ExperimentalUuidApi::class) Uuid.random().toString() }
 
   // Current top record of the navigator
   val currentTopRecordKey by remember { derivedStateOf { currentBackStack.topRecord!!.key } }

diff --git a/circuit-overlay/build.gradle.kts b/circuit-overlay/build.gradle.kts
@@ -1,6 +1,6 @@
 // Copyright (C) 2022 Slack Technologies, LLC
 // SPDX-License-Identifier: Apache-2.0
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
   alias(libs.plugins.agp.library)

diff --git a/circuit-retained/build.gradle.kts b/circuit-retained/build.gradle.kts
@@ -1,7 +1,7 @@
 // Copyright (C) 2023 Slack Technologies, LLC
 // SPDX-License-Identifier: Apache-2.0
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
   alias(libs.plugins.agp.library)

diff --git a/circuit-runtime-presenter/build.gradle.kts b/circuit-runtime-presenter/build.gradle.kts
@@ -1,6 +1,6 @@
 // Copyright (C) 2022 Slack Technologies, LLC
 // SPDX-License-Identifier: Apache-2.0
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
   alias(libs.plugins.agp.library)

diff --git a/circuit-runtime-screen/build.gradle.kts b/circuit-runtime-screen/build.gradle.kts
@@ -1,6 +1,6 @@
 // Copyright (C) 2022 Slack Technologies, LLC
 // SPDX-License-Identifier: Apache-2.0
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
   alias(libs.plugins.agp.library)

diff --git a/circuit-runtime-ui/build.gradle.kts b/circuit-runtime-ui/build.gradle.kts
@@ -1,6 +1,6 @@
 // Copyright (C) 2022 Slack Technologies, LLC
 // SPDX-License-Identifier: Apache-2.0
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
   alias(libs.plugins.agp.library)

diff --git a/circuit-runtime/build.gradle.kts b/circuit-runtime/build.gradle.kts
@@ -1,6 +1,6 @@
 // Copyright (C) 2022 Slack Technologies, LLC
 // SPDX-License-Identifier: Apache-2.0
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
   alias(libs.plugins.agp.library)

diff --git a/circuit-test/build.gradle.kts b/circuit-test/build.gradle.kts
@@ -1,6 +1,6 @@
 // Copyright (C) 2022 Slack Technologies, LLC
 // SPDX-License-Identifier: Apache-2.0
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
   alias(libs.plugins.agp.library)

diff --git a/circuit-test/dependencies/androidReleaseRuntimeClasspath.txt b/circuit-test/dependencies/androidReleaseRuntimeClasspath.txt
@@ -64,8 +64,6 @@ app.cash.molecule:molecule-runtime-android
 app.cash.molecule:molecule-runtime
 app.cash.turbine:turbine-jvm
 app.cash.turbine:turbine
-com.benasher44:uuid-jvm
-com.benasher44:uuid
 com.google.guava:listenablefuture
 org.jetbrains.compose.foundation:foundation
 org.jetbrains.compose.runtime:runtime-saveable

diff --git a/circuit-test/dependencies/jvmRuntimeClasspath.txt b/circuit-test/dependencies/jvmRuntimeClasspath.txt
@@ -13,8 +13,6 @@ app.cash.molecule:molecule-runtime-jvm
 app.cash.molecule:molecule-runtime
 app.cash.turbine:turbine-jvm
 app.cash.turbine:turbine
-com.benasher44:uuid-jvm
-com.benasher44:uuid
 org.jetbrains.androidx.lifecycle:lifecycle-common
 org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-desktop
 org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose

diff --git a/circuitx/effects/build.gradle.kts b/circuitx/effects/build.gradle.kts
@@ -1,6 +1,6 @@
 // Copyright (C) 2024 Slack Technologies, LLC
 // SPDX-License-Identifier: Apache-2.0
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
   alias(libs.plugins.agp.library)

diff --git a/circuitx/effects/dependencies/androidReleaseRuntimeClasspath.txt b/circuitx/effects/dependencies/androidReleaseRuntimeClasspath.txt
@@ -60,8 +60,6 @@ androidx.savedstate:savedstate
 androidx.startup:startup-runtime
 androidx.tracing:tracing
 androidx.versionedparcelable:versionedparcelable
-com.benasher44:uuid-jvm
-com.benasher44:uuid
 com.google.guava:listenablefuture
 org.jetbrains.compose.foundation:foundation
 org.jetbrains.compose.runtime:runtime-saveable

diff --git a/circuitx/effects/dependencies/jvmRuntimeClasspath.txt b/circuitx/effects/dependencies/jvmRuntimeClasspath.txt
@@ -9,8 +9,6 @@ androidx.lifecycle:lifecycle-runtime-desktop
 androidx.lifecycle:lifecycle-runtime
 androidx.lifecycle:lifecycle-viewmodel-desktop
 androidx.lifecycle:lifecycle-viewmodel
-com.benasher44:uuid-jvm
-com.benasher44:uuid
 org.jetbrains.androidx.lifecycle:lifecycle-common
 org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-desktop
 org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose

diff --git a/circuitx/gesture-navigation/build.gradle.kts b/circuitx/gesture-navigation/build.gradle.kts
@@ -1,6 +1,6 @@
 // Copyright (C) 2023 Slack Technologies, LLC
 // SPDX-License-Identifier: Apache-2.0
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
   alias(libs.plugins.agp.library)

diff --git a/circuitx/gesture-navigation/dependencies/androidReleaseRuntimeClasspath.txt b/circuitx/gesture-navigation/dependencies/androidReleaseRuntimeClasspath.txt
@@ -69,8 +69,6 @@ androidx.savedstate:savedstate
 androidx.startup:startup-runtime
 androidx.tracing:tracing
 androidx.versionedparcelable:versionedparcelable
-com.benasher44:uuid-jvm
-com.benasher44:uuid
 com.google.guava:listenablefuture
 org.jetbrains.compose.foundation:foundation
 org.jetbrains.compose.material3:material3

diff --git a/circuitx/gesture-navigation/dependencies/jvmRuntimeClasspath.txt b/circuitx/gesture-navigation/dependencies/jvmRuntimeClasspath.txt
@@ -9,8 +9,6 @@ androidx.lifecycle:lifecycle-runtime-desktop
 androidx.lifecycle:lifecycle-runtime
 androidx.lifecycle:lifecycle-viewmodel-desktop
 androidx.lifecycle:lifecycle-viewmodel
-com.benasher44:uuid-jvm
-com.benasher44:uuid
 org.jetbrains.androidx.lifecycle:lifecycle-common
 org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-desktop
 org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose

diff --git a/circuitx/overlays/build.gradle.kts b/circuitx/overlays/build.gradle.kts
@@ -1,6 +1,6 @@
 // Copyright (C) 2022 Slack Technologies, LLC
 // SPDX-License-Identifier: Apache-2.0
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
   alias(libs.plugins.agp.library)

diff --git a/circuitx/overlays/dependencies/androidReleaseRuntimeClasspath.txt b/circuitx/overlays/dependencies/androidReleaseRuntimeClasspath.txt
@@ -67,8 +67,6 @@ androidx.savedstate:savedstate
 androidx.startup:startup-runtime
 androidx.tracing:tracing
 androidx.versionedparcelable:versionedparcelable
-com.benasher44:uuid-jvm
-com.benasher44:uuid
 com.google.accompanist:accompanist-systemuicontroller
 com.google.guava:listenablefuture
 org.jetbrains.compose.foundation:foundation

diff --git a/circuitx/overlays/dependencies/jvmRuntimeClasspath.txt b/circuitx/overlays/dependencies/jvmRuntimeClasspath.txt
@@ -9,8 +9,6 @@ androidx.lifecycle:lifecycle-runtime-desktop
 androidx.lifecycle:lifecycle-runtime
 androidx.lifecycle:lifecycle-viewmodel-desktop
 androidx.lifecycle:lifecycle-viewmodel
-com.benasher44:uuid-jvm
-com.benasher44:uuid
 org.jetbrains.androidx.lifecycle:lifecycle-common
 org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-desktop
 org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -28,11 +28,11 @@ jdk = "22"
 jvmTarget = "11"
 publishedJvmTarget = "1.8"
 kct = "0.5.1"
-kotlin = "2.0.10"
+kotlin = "2.0.20"
 kotlinpoet = "1.18.1"
 kotlinx-coroutines = "1.8.1"
 kotlinx-serialization = "1.7.1"
-ksp = "2.0.10-1.0.24"
+ksp = "2.0.20-1.0.24"
 ktfmt = "0.52"
 ktor = "2.3.12"
 leakcanary = "2.14"
@@ -46,7 +46,7 @@ paparazzi = "1.3.4"
 picnic = "0.7.0"
 robolectric = "4.13"
 roborazzi = "1.26.0"
-skie = "0.8.4"
+skie = "0.9.0-RC.3"
 spotless = "7.0.0.BETA2"
 sqldelight = "2.0.2"
 telephoto = "0.13.0"
@@ -273,9 +273,6 @@ testing-testParameterInjector = { module = "com.google.testparameterinjector:tes
 truth = "com.google.truth:truth:1.4.4"
 turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" }
 
-# KMP UUID
-uuid = "com.benasher44:uuid:0.8.4"
-
 windowSizeClass = "dev.chrisbanes.material3:material3-window-size-class-multiplatform:0.5.0"
 
 [bundles]

diff --git a/internal-test-utils/build.gradle.kts b/internal-test-utils/build.gradle.kts
@@ -1,7 +1,7 @@
 // Copyright (C) 2023 Slack Technologies, LLC
 // SPDX-License-Identifier: Apache-2.0
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
   alias(libs.plugins.agp.library)