Merge pull request #1491 from square/codex/kotlin-k2-upgrade

Upgrade Kotlin to 2.3.21

Author: steve-the-edwards

build-logic/settings.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
   // Hardcoded as this is upstream of the version catalog. Keep this in sync with that.
-  kotlin("jvm") version "2.3.20" apply false
+  kotlin("jvm") version "2.3.21" apply false
 }
 
 dependencyResolutionManagement {

dependencies/classpath.txt

@@ -60,9 +60,9 @@ com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.11.0
 com.google.crypto.tink:tink:1.7.0
 com.google.dagger:dagger:2.28.3
-com.google.devtools.ksp:symbol-processing-api:2.3.5
-com.google.devtools.ksp:symbol-processing-common-deps:2.3.5
-com.google.devtools.ksp:symbol-processing-gradle-plugin:2.3.5
+com.google.devtools.ksp:symbol-processing-api:2.3.6
+com.google.devtools.ksp:symbol-processing-common-deps:2.3.6
+com.google.devtools.ksp:symbol-processing-gradle-plugin:2.3.6
 com.google.errorprone:error_prone_annotations:2.30.0
 com.google.flatbuffers:flatbuffers-java:1.12.0
 com.google.guava:failureaccess:1.0.2
@@ -144,33 +144,33 @@ org.jdom:jdom2:2.0.6
 org.jetbrains.dokka:dokka-core:2.0.0
 org.jetbrains.dokka:dokka-gradle-plugin:2.0.0
 org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:2.0.0
-org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.3.20
-org.jetbrains.kotlin:abi-tools-api:2.3.20
-org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.20
-org.jetbrains.kotlin:fus-statistics-gradle-plugin:2.3.20
-org.jetbrains.kotlin:kotlin-bom:2.3.20
-org.jetbrains.kotlin:kotlin-build-statistics:2.3.20
-org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20
-org.jetbrains.kotlin:kotlin-compiler-runner:2.3.20
-org.jetbrains.kotlin:kotlin-daemon-client:2.3.20
-org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.3.20
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.3.20
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.3.20
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.3.20
-org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.20
-org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.3.20
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.3.20
-org.jetbrains.kotlin:kotlin-native-utils:2.3.20
+org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.3.21
+org.jetbrains.kotlin:abi-tools-api:2.3.21
+org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.21
+org.jetbrains.kotlin:fus-statistics-gradle-plugin:2.3.21
+org.jetbrains.kotlin:kotlin-bom:2.3.21
+org.jetbrains.kotlin:kotlin-build-statistics:2.3.21
+org.jetbrains.kotlin:kotlin-build-tools-api:2.3.21
+org.jetbrains.kotlin:kotlin-compiler-runner:2.3.21
+org.jetbrains.kotlin:kotlin-daemon-client:2.3.21
+org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.3.21
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.3.21
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.3.21
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.3.21
+org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21
+org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.3.21
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.3.21
+org.jetbrains.kotlin:kotlin-native-utils:2.3.21
 org.jetbrains.kotlin:kotlin-reflect:2.2.21
-org.jetbrains.kotlin:kotlin-serialization:2.3.20
-org.jetbrains.kotlin:kotlin-stdlib-common:2.3.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.20
+org.jetbrains.kotlin:kotlin-serialization:2.3.21
+org.jetbrains.kotlin:kotlin-stdlib-common:2.3.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.21
 org.jetbrains.kotlin:kotlin-stdlib:2.2.21
-org.jetbrains.kotlin:kotlin-tooling-core:2.3.20
-org.jetbrains.kotlin:kotlin-util-io:2.3.20
-org.jetbrains.kotlin:kotlin-util-klib-metadata:2.3.20
-org.jetbrains.kotlin:kotlin-util-klib:2.3.20
+org.jetbrains.kotlin:kotlin-tooling-core:2.3.21
+org.jetbrains.kotlin:kotlin-util-io:2.3.21
+org.jetbrains.kotlin:kotlin-util-klib-metadata:2.3.21
+org.jetbrains.kotlin:kotlin-util-klib:2.3.21
 org.jetbrains.kotlinx:binary-compatibility-validator:0.18.1
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.0
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0

gradle.properties

@@ -8,7 +8,7 @@ android.useAndroidX=true
 systemProp.org.gradle.internal.publish.checksums.insecure=true
 
 GROUP=com.squareup.workflow1
-VERSION_NAME=1.26.1-SNAPSHOT
+VERSION_NAME=1.27.0-SNAPSHOT
 LAST_PUBLISHED_VERSION_NAME=1.26.0
 
 POM_DESCRIPTION=Square Workflow
@@ -29,5 +29,3 @@ SONATYPE_STAGING_PROFILE=com.squareup
 
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
-
-kotlin.languageVersion=1.9

gradle/libs.versions.toml

@@ -47,7 +47,7 @@ filekit-dialogs-compose = "0.10.0-beta03"
 
 google-accompanist = "0.18.0"
 google-dagger = "2.40.5"
-google-ksp = "2.3.5"
+google-ksp = "2.3.6"
 google-material = "1.4.0"
 
 groovy = "3.0.9"
@@ -59,10 +59,10 @@ kgx = "0.1.12"
 kotest = "5.1.0"
 # Keep this in sync with what is hard-coded in build-logic/settings.gradle.kts as that is upstream
 # of loading the library versions from this file but should be the same.
-kotlin = "2.3.20"
+kotlin = "2.3.21"
 
 kotlinx-binary-compatibility = "0.18.1"
-kotlinx-coroutines = "1.9.0"
+kotlinx-coroutines = "1.10.2"
 kotlinx-serialization-json = "1.8.1"
 kotlinx-atomicfu = "0.22.0"
 

samples/tutorial/build.gradle

@@ -8,7 +8,7 @@ buildscript {
   }
 
   ext {
-    kotlin_version = '2.3.20'
+    kotlin_version = '2.3.21'
     // Use the last published version for dependencies (workflow-core, workflow-testing, etc.)
     // so CI can resolve them from Maven Central. The ai-context plugin resolves via
     // includeBuild in settings.gradle regardless of the version string here.

workflow-ai-context/dependencies/runtimeClasspath.txt

@@ -1,3 +1,3 @@
-org.jetbrains.kotlin:kotlin-bom:2.3.20
-org.jetbrains.kotlin:kotlin-stdlib:2.3.20
+org.jetbrains.kotlin:kotlin-bom:2.3.21
+org.jetbrains.kotlin:kotlin-stdlib:2.3.21
 org.jetbrains:annotations:13.0

workflow-config/config-android/dependencies/releaseRuntimeClasspath.txt

@@ -55,13 +55,13 @@ androidx.versionedparcelable:versionedparcelable:1.1.1
 com.google.guava:listenablefuture:1.0
 com.squareup.okio:okio-jvm:3.3.0
 com.squareup.okio:okio:3.3.0
-org.jetbrains.kotlin:kotlin-bom:2.3.20
-org.jetbrains.kotlin:kotlin-stdlib-common:2.3.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.20
-org.jetbrains.kotlin:kotlin-stdlib:2.3.20
-org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0
-org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.9.0
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0
+org.jetbrains.kotlin:kotlin-bom:2.3.21
+org.jetbrains.kotlin:kotlin-stdlib-common:2.3.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.21
+org.jetbrains.kotlin:kotlin-stdlib:2.3.21
+org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
+org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2
 org.jetbrains:annotations:23.0.0

workflow-config/config-jvm/dependencies/runtimeClasspath.txt

@@ -1,11 +1,11 @@
 com.squareup.okio:okio-jvm:3.3.0
 com.squareup.okio:okio:3.3.0
-org.jetbrains.kotlin:kotlin-bom:2.3.20
-org.jetbrains.kotlin:kotlin-stdlib-common:2.3.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.20
-org.jetbrains.kotlin:kotlin-stdlib:2.3.20
-org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.9.0
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0
+org.jetbrains.kotlin:kotlin-bom:2.3.21
+org.jetbrains.kotlin:kotlin-stdlib-common:2.3.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.21
+org.jetbrains.kotlin:kotlin-stdlib:2.3.21
+org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2
 org.jetbrains:annotations:23.0.0

workflow-core/dependencies/jsRuntimeClasspath.txt

@@ -1,10 +1,10 @@
 com.squareup.okio:okio-js:3.3.0
 com.squareup.okio:okio:3.3.0
-org.jetbrains.kotlin:kotlin-bom:2.3.20
-org.jetbrains.kotlin:kotlin-dom-api-compat:2.3.20
-org.jetbrains.kotlin:kotlin-stdlib-js:2.3.20
-org.jetbrains.kotlin:kotlin-stdlib:2.3.20
-org.jetbrains.kotlin:kotlinx-atomicfu-runtime:2.0.0
-org.jetbrains.kotlinx:atomicfu-js:0.25.0
-org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.9.0
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0
+org.jetbrains.kotlin:kotlin-bom:2.3.21
+org.jetbrains.kotlin:kotlin-dom-api-compat:2.3.21
+org.jetbrains.kotlin:kotlin-stdlib-js:2.3.21
+org.jetbrains.kotlin:kotlin-stdlib:2.3.21
+org.jetbrains.kotlinx:atomicfu-js:0.26.1
+org.jetbrains.kotlinx:atomicfu:0.26.1
+org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.10.2
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2

workflow-core/dependencies/jvmMainRuntimeClasspath.txt

@@ -1,11 +1,11 @@
 com.squareup.okio:okio-jvm:3.3.0
 com.squareup.okio:okio:3.3.0
-org.jetbrains.kotlin:kotlin-bom:2.3.20
-org.jetbrains.kotlin:kotlin-stdlib-common:2.3.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.20
-org.jetbrains.kotlin:kotlin-stdlib:2.3.20
-org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.9.0
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0
+org.jetbrains.kotlin:kotlin-bom:2.3.21
+org.jetbrains.kotlin:kotlin-stdlib-common:2.3.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.21
+org.jetbrains.kotlin:kotlin-stdlib:2.3.21
+org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2
 org.jetbrains:annotations:23.0.0