Update to Kotlin 2.1.20 (#1929)

ZacSweers · web-flow · commit 8c35c879f7df · 2025-05-17T01:30:20.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@ Changelog
 Unreleased
 ----------
 
+- Update to Kotlin `2.1.20`.
+
 0.28.0
 ------
 
diff --git a/backstack/build.gradle.kts b/backstack/build.gradle.kts
@@ -23,12 +23,12 @@ kotlin {
   macosX64()
   macosArm64()
   js(IR) {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   @OptIn(ExperimentalWasmDsl::class)
   wasmJs {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser {
       testTask {
         useKarma {
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -222,6 +222,8 @@ subprojects {
               // https://kotlinlang.org/docs/whatsnew1520.html#support-for-jspecify-nullness-annotations
               "-Xtype-enhancement-improvements-strict-mode",
               "-Xjspecify-annotations=strict",
+              // https://youtrack.jetbrains.com/issue/KT-73255
+              "-Xannotation-default-target=param-property",
             )
           }
         }
diff --git a/circuit-codegen-annotations/build.gradle.kts b/circuit-codegen-annotations/build.gradle.kts
@@ -31,12 +31,12 @@ kotlin {
   // TODO https://github.com/evant/kotlin-inject/pull/440
   //  mingwX64()
   js(IR) {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   @OptIn(ExperimentalWasmDsl::class)
   wasmJs {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   // endregion
diff --git a/circuit-foundation/api/android/circuit-foundation.api b/circuit-foundation/api/android/circuit-foundation.api
@@ -74,7 +74,7 @@ public final class com/slack/circuit/foundation/CircuitKt {
 public final class com/slack/circuit/foundation/ComposableSingletons$CircuitKt {
 	public static final field INSTANCE Lcom/slack/circuit/foundation/ComposableSingletons$CircuitKt;
 	public fun <init> ()V
-	public final fun getLambda-1$circuit_foundation_release ()Lkotlin/jvm/functions/Function4;
+	public final fun getLambda$-1518521136$circuit_foundation_release ()Lkotlin/jvm/functions/Function4;
 }
 
 public final class com/slack/circuit/foundation/ContentProviderState {
diff --git a/circuit-foundation/api/jvm/circuit-foundation.api b/circuit-foundation/api/jvm/circuit-foundation.api
@@ -74,7 +74,7 @@ public final class com/slack/circuit/foundation/CircuitKt {
 public final class com/slack/circuit/foundation/ComposableSingletons$CircuitKt {
 	public static final field INSTANCE Lcom/slack/circuit/foundation/ComposableSingletons$CircuitKt;
 	public fun <init> ()V
-	public final fun getLambda-1$circuit_foundation ()Lkotlin/jvm/functions/Function4;
+	public final fun getLambda$-1518521136$circuit_foundation ()Lkotlin/jvm/functions/Function4;
 }
 
 public final class com/slack/circuit/foundation/ContentProviderState {
diff --git a/circuit-foundation/build.gradle.kts b/circuit-foundation/build.gradle.kts
@@ -23,12 +23,12 @@ kotlin {
   macosX64()
   macosArm64()
   js(IR) {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   @OptIn(ExperimentalWasmDsl::class)
   wasmJs {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser {
       // Necessary for tests
       testTask {
diff --git a/circuit-overlay/api/android/circuit-overlay.api b/circuit-overlay/api/android/circuit-overlay.api
@@ -10,7 +10,7 @@ public abstract class com/slack/circuit/overlay/AnimatedOverlay : com/slack/circ
 public final class com/slack/circuit/overlay/ComposableSingletons$ContentWithOverlaysKt {
 	public static final field INSTANCE Lcom/slack/circuit/overlay/ComposableSingletons$ContentWithOverlaysKt;
 	public fun <init> ()V
-	public final fun getLambda-1$circuit_overlay_release ()Lkotlin/jvm/functions/Function4;
+	public final fun getLambda$-44710973$circuit_overlay_release ()Lkotlin/jvm/functions/Function4;
 }
 
 public final class com/slack/circuit/overlay/ContentWithOverlaysKt {
diff --git a/circuit-overlay/api/jvm/circuit-overlay.api b/circuit-overlay/api/jvm/circuit-overlay.api
@@ -10,7 +10,7 @@ public abstract class com/slack/circuit/overlay/AnimatedOverlay : com/slack/circ
 public final class com/slack/circuit/overlay/ComposableSingletons$ContentWithOverlaysKt {
 	public static final field INSTANCE Lcom/slack/circuit/overlay/ComposableSingletons$ContentWithOverlaysKt;
 	public fun <init> ()V
-	public final fun getLambda-1$circuit_overlay ()Lkotlin/jvm/functions/Function4;
+	public final fun getLambda$-44710973$circuit_overlay ()Lkotlin/jvm/functions/Function4;
 }
 
 public final class com/slack/circuit/overlay/ContentWithOverlaysKt {
diff --git a/circuit-overlay/build.gradle.kts b/circuit-overlay/build.gradle.kts
@@ -20,12 +20,12 @@ kotlin {
   macosX64()
   macosArm64()
   js(IR) {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   @OptIn(ExperimentalWasmDsl::class)
   wasmJs {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   // endregion
diff --git a/circuit-retained/build.gradle.kts b/circuit-retained/build.gradle.kts
@@ -32,12 +32,12 @@ kotlin {
   linuxX64()
   mingwX64()
   js(IR) {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   @OptIn(ExperimentalWasmDsl::class)
   wasmJs {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   // endregion
diff --git a/circuit-runtime-presenter/build.gradle.kts b/circuit-runtime-presenter/build.gradle.kts
@@ -30,12 +30,12 @@ kotlin {
   linuxX64()
   mingwX64()
   js(IR) {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   @OptIn(ExperimentalWasmDsl::class)
   wasmJs {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   // endregion
diff --git a/circuit-runtime-screen/build.gradle.kts b/circuit-runtime-screen/build.gradle.kts
@@ -31,12 +31,12 @@ kotlin {
   linuxX64()
   mingwX64()
   js(IR) {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   @OptIn(ExperimentalWasmDsl::class)
   wasmJs {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   // endregion
diff --git a/circuit-runtime-ui/build.gradle.kts b/circuit-runtime-ui/build.gradle.kts
@@ -20,12 +20,12 @@ kotlin {
   macosX64()
   macosArm64()
   js(IR) {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   @OptIn(ExperimentalWasmDsl::class)
   wasmJs {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   // endregion
diff --git a/circuit-runtime/build.gradle.kts b/circuit-runtime/build.gradle.kts
@@ -30,12 +30,12 @@ kotlin {
   linuxX64()
   mingwX64()
   js(IR) {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   @OptIn(ExperimentalWasmDsl::class)
   wasmJs {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   // endregion
diff --git a/circuit-shared-elements/build.gradle.kts b/circuit-shared-elements/build.gradle.kts
@@ -21,12 +21,12 @@ kotlin {
   macosX64()
   macosArm64()
   js(IR) {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   @OptIn(ExperimentalWasmDsl::class)
   wasmJs {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   // endregion
diff --git a/circuit-test/build.gradle.kts b/circuit-test/build.gradle.kts
@@ -21,12 +21,12 @@ kotlin {
   macosX64()
   macosArm64()
   js(IR) {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   @OptIn(ExperimentalWasmDsl::class)
   wasmJs {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   // endregion
diff --git a/circuitx/effects/build.gradle.kts b/circuitx/effects/build.gradle.kts
@@ -21,12 +21,12 @@ kotlin {
   macosX64()
   macosArm64()
   js(IR) {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   @OptIn(ExperimentalWasmDsl::class)
   wasmJs {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser {
       testTask {
         useKarma {
diff --git a/circuitx/gesture-navigation/build.gradle.kts b/circuitx/gesture-navigation/build.gradle.kts
@@ -18,12 +18,12 @@ kotlin {
   iosArm64()
   iosSimulatorArm64()
   js(IR) {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   @OptIn(ExperimentalWasmDsl::class)
   wasmJs {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   // endregion
diff --git a/circuitx/navigation/src/jvmTest/kotlin/com/slack/circuitx/navigation/intercepting/FakeFailureNotifier.kt b/circuitx/navigation/src/jvmTest/kotlin/com/slack/circuitx/navigation/intercepting/FakeFailureNotifier.kt
@@ -10,16 +10,16 @@ class FakeFailureNotifier : InterceptingNavigator.FailureNotifier {
   private val popFailures = Turbine<InterceptedResult.Failure>()
   private val resetRootFailures = Turbine<InterceptedResult.Failure>()
 
-  override fun goToFailure(interceptorResult: InterceptedResult.Failure) {
-    goToFailures.add(interceptorResult)
+  override fun goToFailure(interceptedResult: InterceptedResult.Failure) {
+    goToFailures.add(interceptedResult)
   }
 
-  override fun popFailure(interceptorResult: InterceptedResult.Failure) {
-    popFailures.add(interceptorResult)
+  override fun popFailure(interceptedResult: InterceptedResult.Failure) {
+    popFailures.add(interceptedResult)
   }
 
-  override fun rootResetFailure(interceptorResult: InterceptedResult.Failure) {
-    resetRootFailures.add(interceptorResult)
+  override fun rootResetFailure(interceptedResult: InterceptedResult.Failure) {
+    resetRootFailures.add(interceptedResult)
   }
 
   suspend fun awaitGoToFailure(): InterceptedResult.Failure = goToFailures.awaitItem()
diff --git a/circuitx/overlays/api/android/overlays.api b/circuitx/overlays/api/android/overlays.api
@@ -29,7 +29,7 @@ public final class com/slack/circuitx/overlays/BottomSheetOverlay : com/slack/ci
 public final class com/slack/circuitx/overlays/ComposableSingletons$BottomSheetOverlayKt {
 	public static final field INSTANCE Lcom/slack/circuitx/overlays/ComposableSingletons$BottomSheetOverlayKt;
 	public fun <init> ()V
-	public final fun getLambda-1$overlays_release ()Lkotlin/jvm/functions/Function2;
+	public final fun getLambda$1348418038$overlays_release ()Lkotlin/jvm/functions/Function2;
 }
 
 public final class com/slack/circuitx/overlays/DialogResult : java/lang/Enum {
diff --git a/circuitx/overlays/api/jvm/overlays.api b/circuitx/overlays/api/jvm/overlays.api
@@ -29,7 +29,7 @@ public final class com/slack/circuitx/overlays/BottomSheetOverlay : com/slack/ci
 public final class com/slack/circuitx/overlays/ComposableSingletons$BottomSheetOverlayKt {
 	public static final field INSTANCE Lcom/slack/circuitx/overlays/ComposableSingletons$BottomSheetOverlayKt;
 	public fun <init> ()V
-	public final fun getLambda-1$overlays ()Lkotlin/jvm/functions/Function2;
+	public final fun getLambda$1348418038$overlays ()Lkotlin/jvm/functions/Function2;
 }
 
 public final class com/slack/circuitx/overlays/DialogResult : java/lang/Enum {
diff --git a/circuitx/overlays/build.gradle.kts b/circuitx/overlays/build.gradle.kts
@@ -20,12 +20,12 @@ kotlin {
   macosX64()
   macosArm64()
   js(IR) {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   @OptIn(ExperimentalWasmDsl::class)
   wasmJs {
-    moduleName = property("POM_ARTIFACT_ID").toString()
+    outputModuleName = property("POM_ARTIFACT_ID").toString()
     browser()
   }
   // endregion
diff --git a/gradle.properties b/gradle.properties
@@ -38,7 +38,7 @@ org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
 
 # SKIE sets max versions, so we leave this in (even if commented out) for ease of use with new
 # Kotlin versions
-#skie.kgpVersion=2.1.0
+skie.kgpVersion=2.1.20
 
 # Use Kapt4 in K2
 kapt.use.k2=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -29,13 +29,13 @@ jdk = "23"
 jvmTarget = "11"
 publishedJvmTarget = "11"
 kct = "0.7.1"
-kotlin = "2.1.10"
+kotlin = "2.1.20"
 kotlinInject = "0.8.0"
 kotlinInject-anvil = "0.1.5"
 kotlinpoet = "2.1.0"
 kotlinx-coroutines = "1.10.2"
 kotlinx-serialization = "1.8.1"
-ksp = "2.1.10-1.0.31"
+ksp = "2.1.20-1.0.32"
 ktfmt = "0.54"
 ktor = "3.1.3"
 leakcanary = "2.14"
@@ -47,7 +47,7 @@ okio = "3.11.0"
 picnic = "0.7.0"
 robolectric = "4.14.1"
 roborazzi = "1.43.1"
-skie = "0.10.1"
+skie = "0.10.2-preview.2.1.20"
 spotless = "7.0.2"
 sqldelight = "2.0.2"
 telephoto = "0.15.1"
diff --git a/internal-runtime/build.gradle.kts b/internal-runtime/build.gradle.kts
@@ -20,12 +20,12 @@ kotlin {
   macosX64()
   macosArm64()
   js(IR) {
-    moduleName = "internal-runtime"
+    outputModuleName = "internal-runtime"
     browser()
   }
   @OptIn(ExperimentalWasmDsl::class)
   wasmJs {
-    moduleName = "internal-runtime"
+    outputModuleName = "internal-runtime"
     browser()
   }
   // endregion
diff --git a/internal-test-utils/build.gradle.kts b/internal-test-utils/build.gradle.kts
@@ -21,12 +21,12 @@ kotlin {
   macosX64()
   macosArm64()
   js(IR) {
-    moduleName = "internal-test-utils"
+    outputModuleName = "internal-test-utils"
     browser()
   }
   @OptIn(ExperimentalWasmDsl::class)
   wasmJs {
-    moduleName = "internal-test-utils"
+    outputModuleName = "internal-test-utils"
     browser()
   }
   // endregion
diff --git a/samples/counter/apps/build.gradle.kts b/samples/counter/apps/build.gradle.kts
@@ -31,7 +31,7 @@ kotlin {
   iosArm64()
   @OptIn(ExperimentalWasmDsl::class)
   wasmJs {
-    moduleName = "counterApp"
+    outputModuleName = "counterApp"
     browser { commonWebpackConfig { outputFileName = "counterApp.js" } }
     binaries.executable()
   }
diff --git a/samples/counter/build.gradle.kts b/samples/counter/build.gradle.kts
@@ -18,12 +18,12 @@ kotlin {
   androidTarget { publishLibraryVariants("release") }
   jvm()
   js(IR) {
-    moduleName = "counterbrowser"
+    outputModuleName = "counterbrowser"
     browser()
   }
   @OptIn(ExperimentalWasmDsl::class)
   wasmJs {
-    moduleName = "counterbrowser"
+    outputModuleName = "counterbrowser"
     browser()
   }
   listOf(iosX64(), iosArm64(), iosSimulatorArm64()).forEach {

Original file line number	Diff line number	Diff line change
`@@ -222,6 +222,8 @@ subprojects {`
`222`	`222`	`// https://kotlinlang.org/docs/whatsnew1520.html#support-for-jspecify-nullness-annotations`
`223`	`223`	`"-Xtype-enhancement-improvements-strict-mode",`
`224`	`224`	`"-Xjspecify-annotations=strict",`
	`225`	`+ // https://youtrack.jetbrains.com/issue/KT-73255`
	`226`	`+ "-Xannotation-default-target=param-property",`
`225`	`227`	`)`
`226`	`228`	`}`
`227`	`229`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public final class com/slack/circuit/foundation/CircuitKt {`
`74`	`74`	`public final class com/slack/circuit/foundation/ComposableSingletons$CircuitKt {`
`75`	`75`	`public static final field INSTANCE Lcom/slack/circuit/foundation/ComposableSingletons$CircuitKt;`
`76`	`76`	`public fun <init> ()V`
`77`		`- public final fun getLambda-1$circuit_foundation_release ()Lkotlin/jvm/functions/Function4;`
	`77`	`+ public final fun getLambda$-1518521136$circuit_foundation_release ()Lkotlin/jvm/functions/Function4;`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`public final class com/slack/circuit/foundation/ContentProviderState {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public abstract class com/slack/circuit/overlay/AnimatedOverlay : com/slack/circ`
`10`	`10`	`public final class com/slack/circuit/overlay/ComposableSingletons$ContentWithOverlaysKt {`
`11`	`11`	`public static final field INSTANCE Lcom/slack/circuit/overlay/ComposableSingletons$ContentWithOverlaysKt;`
`12`	`12`	`public fun <init> ()V`
`13`		`- public final fun getLambda-1$circuit_overlay_release ()Lkotlin/jvm/functions/Function4;`
	`13`	`+ public final fun getLambda$-44710973$circuit_overlay_release ()Lkotlin/jvm/functions/Function4;`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public final class com/slack/circuit/overlay/ContentWithOverlaysKt {`