1318: Update to Kotlin 2.1.20

Author: steve-the-edwards

RELEASING.md

@@ -130,7 +130,7 @@ To build and install the current version to your local Maven repository (`~/.m2`
 
 #### Configuration
 
-In order to deploy artifacts to `s01.oss.sonatype.org`, you'll need to provide
+In order to deploy artifacts to `central.sonatype.org`, you'll need to provide
 your credentials via these two properties in your private Gradle properties
 file(`~/.gradle/gradle.properties`).
 
@@ -166,4 +166,4 @@ snapshot artifacts to Sonatype just like you would for a production release:
 ```
 
 You can verify the artifacts are available by visiting
-https://s01.oss.sonatype.org/content/repositories/snapshots/com/squareup/workflow1/.
+https://central.sonatype.org/content/repositories/snapshots/com/squareup/workflow1/.

benchmarks/performance-poetry/complex-poetry/src/main/java/com/squareup/benchmarks/performance/complex/poetry/MaybeLoadingGatekeeperWorkflow.kt

@@ -15,7 +15,7 @@ import kotlinx.coroutines.flow.Flow
 typealias IsLoading = Boolean
 
 class MaybeLoadingGatekeeperWorkflow<T : Any>(
-  private val childWithLoading: Workflow<T, Any, OverviewDetailScreen<*>>,
+  private val childWithLoading: Workflow<T, *, OverviewDetailScreen<*>>,
   private val childProps: T,
   private val isLoading: Flow<Boolean>
 ) : StatefulWorkflow<Unit, IsLoading, Unit, MayBeLoadingScreen>() {

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 "1.9.24" apply false
+  kotlin("jvm") version "2.1.20" apply false
 }
 
 dependencyResolutionManagement {

build-logic/src/main/java/com/squareup/workflow1/buildsrc/KotlinAndroidConventionPlugin.kt

@@ -16,7 +16,8 @@ class KotlinAndroidConventionPlugin : Plugin<Project> {
       components.onVariants(
         selector = components.selector().withBuildType("debug")
       ) { variant ->
-        val nameCaps = variant.name.capitalized()
+        val nameCaps = variant.name
+          .replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }
         val testTask = "connected${nameCaps}AndroidTest"
         target.tasks.register("prepare${nameCaps}AndroidTestArtifacts") { task ->
           task.description =

build-logic/src/main/java/com/squareup/workflow1/buildsrc/KotlinCommonSettings.kt

@@ -10,8 +10,11 @@ import com.squareup.workflow1.buildsrc.internal.javaTargetInt
 import com.squareup.workflow1.buildsrc.internal.kotlin
 import org.gradle.api.Project
 import org.gradle.api.tasks.compile.JavaCompile
+import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode.Strict
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 fun Project.kotlinCommonSettings(bomConfigurationName: String) {
   pluginManager.apply(libsCatalog.pluginId("ktlint"))
@@ -28,39 +31,31 @@ fun Project.kotlinCommonSettings(bomConfigurationName: String) {
   }
 
   tasks.withType(KotlinCompile::class.java).configureEach { kotlinCompile ->
-    kotlinCompile.kotlinOptions {
-      jvmTarget = this@kotlinCommonSettings.javaTarget
+    kotlinCompile.apply {
+      if (!(path.startsWith(":samples") || path.startsWith(":benchmarks") ||
+          name.contains("test", ignoreCase = true))
+      ) {
+        explicitApiMode.set(Strict)
+      }
+    }
+    kotlinCompile.compilerOptions {
+      jvmTarget.set(JvmTarget.fromTarget(this@kotlinCommonSettings.javaTarget))
 
       // Allow warnings when running from IDE, makes it easier to experiment.
       if (!isRunningFromIde) {
-        allWarningsAsErrors = true
+        allWarningsAsErrors.set(true)
       }
 
       // Don't panic, all this does is allow us to use the @OptIn meta-annotation.
       // to define our own experiments.
-      freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+      freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
 
       // Make sure our module names don't conflict with those from pre-workflow1
       // releases, so that old and new META-INF/ entries don't stomp each other.
       // (This is only an issue for apps that are still migrating from workflow to
       // workflow1, and so need to import two versions of the library.)
       // https://blog.jetbrains.com/kotlin/2015/09/kotlin-m13-is-out/
-      moduleName = "wf1-${project.name}"
-    }
-
-    maybeEnableExplicitApi(kotlinCompile)
-  }
-}
-
-private fun Project.maybeEnableExplicitApi(compileTask: KotlinCompile) {
-  when {
-    path.startsWith(":samples") -> return
-    path.startsWith(":benchmarks") -> return
-    compileTask.name.contains("test", ignoreCase = true) -> return
-    else -> compileTask.kotlinOptions {
-      // TODO this should be moved to `kotlin { explicitApi() }` once that's working for android
-      //  projects, see https://youtrack.jetbrains.com/issue/KT-37652.
-      freeCompilerArgs += "-Xexplicit-api=strict"
+      moduleName.set("wf1-${project.name}")
     }
   }
 }

build.gradle.kts

@@ -27,6 +27,7 @@ plugins {
   id("artifacts-check")
   id("dependency-guard")
   alias(libs.plugins.ktlint)
+  alias(libs.plugins.compose.compiler) apply false
 }
 
 shardConnectedCheckTasks(project)

dependencies/classpath.txt

@@ -1,46 +1,47 @@
-androidx.databinding:databinding-common:8.3.2
-androidx.databinding:databinding-compiler-common:8.3.2
-com.android.databinding:baseLibrary:8.3.2
-com.android.tools.analytics-library:crash:31.3.2
-com.android.tools.analytics-library:protos:31.3.2
-com.android.tools.analytics-library:shared:31.3.2
-com.android.tools.analytics-library:tracker:31.3.2
+androidx.databinding:databinding-common:8.8.0
+androidx.databinding:databinding-compiler-common:8.8.0
+com.android.databinding:baseLibrary:8.8.0
+com.android.tools.analytics-library:crash:31.8.0
+com.android.tools.analytics-library:protos:31.8.0
+com.android.tools.analytics-library:shared:31.8.0
+com.android.tools.analytics-library:tracker:31.8.0
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10
-com.android.tools.build:aapt2-proto:8.3.2-10880808
-com.android.tools.build:aaptcompiler:8.3.2
-com.android.tools.build:apksig:8.3.2
-com.android.tools.build:apkzlib:8.3.2
-com.android.tools.build:builder-model:8.3.2
-com.android.tools.build:builder-test-api:8.3.2
-com.android.tools.build:builder:8.3.2
-com.android.tools.build:bundletool:1.15.6
-com.android.tools.build:gradle-api:8.3.2
-com.android.tools.build:gradle-settings-api:8.3.2
-com.android.tools.build:gradle:8.3.2
-com.android.tools.build:manifest-merger:31.3.2
+com.android.tools.build:aapt2-proto:8.8.0-12006047
+com.android.tools.build:aaptcompiler:8.8.0
+com.android.tools.build:apksig:8.8.0
+com.android.tools.build:apkzlib:8.8.0
+com.android.tools.build:builder-model:8.8.0
+com.android.tools.build:builder-test-api:8.8.0
+com.android.tools.build:builder:8.8.0
+com.android.tools.build:bundletool:1.17.2
+com.android.tools.build:gradle-api:8.8.0
+com.android.tools.build:gradle-settings-api:8.8.0
+com.android.tools.build:gradle:8.8.0
+com.android.tools.build:manifest-merger:31.8.0
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api
-com.android.tools.ddms:ddmlib:31.3.2
-com.android.tools.layoutlib:layoutlib-api:31.3.2
-com.android.tools.lint:lint-model:31.3.2
-com.android.tools.lint:lint-typedef-remover:31.3.2
-com.android.tools.utp:android-device-provider-ddmlib-proto:31.3.2
-com.android.tools.utp:android-device-provider-gradle-proto:31.3.2
-com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.3.2
-com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.3.2
-com.android.tools.utp:android-test-plugin-host-coverage-proto:31.3.2
-com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.3.2
-com.android.tools.utp:android-test-plugin-host-logcat-proto:31.3.2
-com.android.tools.utp:android-test-plugin-host-retention-proto:31.3.2
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.3.2
-com.android.tools:annotations:31.3.2
-com.android.tools:common:31.3.2
-com.android.tools:dvlib:31.3.2
-com.android.tools:repository:31.3.2
-com.android.tools:sdk-common:31.3.2
-com.android.tools:sdklib:31.3.2
-com.android:signflinger:8.3.2
-com.android:zipflinger:8.3.2
+com.android.tools.ddms:ddmlib:31.8.0
+com.android.tools.layoutlib:layoutlib-api:31.8.0
+com.android.tools.lint:lint-model:31.8.0
+com.android.tools.lint:lint-typedef-remover:31.8.0
+com.android.tools.utp:android-device-provider-ddmlib-proto:31.8.0
+com.android.tools.utp:android-device-provider-gradle-proto:31.8.0
+com.android.tools.utp:android-device-provider-profile-proto:31.8.0
+com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.8.0
+com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.8.0
+com.android.tools.utp:android-test-plugin-host-coverage-proto:31.8.0
+com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.8.0
+com.android.tools.utp:android-test-plugin-host-logcat-proto:31.8.0
+com.android.tools.utp:android-test-plugin-host-retention-proto:31.8.0
+com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.8.0
+com.android.tools:annotations:31.8.0
+com.android.tools:common:31.8.0
+com.android.tools:dvlib:31.8.0
+com.android.tools:repository:31.8.0
+com.android.tools:sdk-common:31.8.0
+com.android.tools:sdklib:31.8.0
+com.android:signflinger:8.8.0
+com.android:zipflinger:8.8.0
 com.dropbox.dependency-guard:dependency-guard:0.5.0
 com.fasterxml.jackson.core:jackson-annotations:2.12.7
 com.fasterxml.jackson.core:jackson-core:2.12.7
@@ -54,13 +55,13 @@ com.google.android:annotations:4.1.1.4
 com.google.api.grpc:proto-google-common-protos:2.17.0
 com.google.auto.value:auto-value-annotations:1.6.2
 com.google.code.findbugs:jsr305:3.0.2
-com.google.code.gson:gson:2.10.1
+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:1.9.24-1.0.20
-com.google.devtools.ksp:symbol-processing-common-deps:1.9.24-1.0.20
-com.google.devtools.ksp:symbol-processing-gradle-plugin:1.9.24-1.0.20
-com.google.errorprone:error_prone_annotations:2.18.0
+com.google.devtools.ksp:symbol-processing-api:2.1.20-1.0.32
+com.google.devtools.ksp:symbol-processing-common-deps:2.1.20-1.0.32
+com.google.devtools.ksp:symbol-processing-gradle-plugin:2.1.20-1.0.32
+com.google.errorprone:error_prone_annotations:2.27.0
 com.google.flatbuffers:flatbuffers-java:1.12.0
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:32.0.1-jre
@@ -70,26 +71,27 @@ com.google.jimfs:jimfs:1.1
 com.google.protobuf:protobuf-java-util:3.22.3
 com.google.protobuf:protobuf-java:3.22.3
 com.google.testing.platform:core-proto:0.0.9-alpha02
-com.googlecode.java-diff-utils:diffutils:1.3.0
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3
 com.rickbusarow.kgx:kotlin-gradle-extensions:0.1.12
 com.rickbusarow.kgx:names:0.1.12
 com.rickbusarow.ktlint:com.rickbusarow.ktlint.gradle.plugin:0.2.2
 com.rickbusarow.ktlint:ktlint-gradle-plugin:0.2.2
 com.squareup.moshi:moshi-adapters:1.15.0
-com.squareup.moshi:moshi:1.15.0
+com.squareup.moshi:moshi:1.15.2
 com.squareup.okhttp3:okhttp:4.12.0
-com.squareup.okio:okio-jvm:3.6.0
-com.squareup.okio:okio:3.6.0
-com.squareup.retrofit2:converter-moshi:2.9.0
-com.squareup.retrofit2:retrofit:2.9.0
+com.squareup.okio:okio-jvm:3.7.0
+com.squareup.okio:okio:3.7.0
+com.squareup.retrofit2:converter-moshi:2.11.0
+com.squareup.retrofit2:converter-scalars:2.11.0
+com.squareup.retrofit2:retrofit:2.11.0
 com.squareup:javapoet:1.10.0
 com.squareup:javawriter:2.5.0
 com.sun.activation:javax.activation:1.2.0
 com.sun.istack:istack-commons-runtime:3.0.8
 com.sun.xml.fastinfoset:FastInfoset:1.2.16
-com.vanniktech:gradle-maven-publish-plugin:0.27.0
-com.vanniktech:nexus:0.27.0
+com.vanniktech:central-portal:0.31.0
+com.vanniktech:gradle-maven-publish-plugin:0.31.0
+com.vanniktech:nexus:0.31.0
 commons-codec:commons-codec:1.11
 commons-io:commons-io:2.13.0
 commons-logging:commons-logging:1.2
@@ -125,59 +127,59 @@ org.apache.commons:commons-compress:1.21
 org.apache.httpcomponents:httpclient:4.5.14
 org.apache.httpcomponents:httpcore:4.4.16
 org.apache.httpcomponents:httpmime:4.5.6
-org.bitbucket.b_c:jose4j:0.7.0
-org.bouncycastle:bcpkix-jdk15on:1.67
-org.bouncycastle:bcprov-jdk15on:1.67
+org.bitbucket.b_c:jose4j:0.9.5
+org.bouncycastle:bcpkix-jdk18on:1.77
+org.bouncycastle:bcprov-jdk18on:1.77
+org.bouncycastle:bcutil-jdk18on:1.77
 org.checkerframework:checker-qual:3.33.0
 org.codehaus.mojo:animal-sniffer-annotations:1.23
 org.codehaus.woodstox:stax2-api:4.2.1
 org.glassfish.jaxb:jaxb-runtime:2.3.2
 org.glassfish.jaxb:txw2:2.3.2
 org.jdom:jdom2:2.0.6
-org.jetbrains.dokka:dokka-core:1.9.10
-org.jetbrains.dokka:dokka-gradle-plugin:1.9.10
-org.jetbrains.intellij.deps:trove4j:1.0.20200330
-org.jetbrains.kotlin:kotlin-android-extensions:1.9.24
-org.jetbrains.kotlin:kotlin-bom:1.9.24
-org.jetbrains.kotlin:kotlin-build-tools-api:1.9.24
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.24
-org.jetbrains.kotlin:kotlin-compiler-runner:1.9.24
-org.jetbrains.kotlin:kotlin-daemon-client:1.9.24
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.24
-org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.24
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.24
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.24
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.24
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.24
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24
-org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.24
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.24
-org.jetbrains.kotlin:kotlin-native-utils:1.9.24
-org.jetbrains.kotlin:kotlin-project-model:1.9.24
+org.jetbrains.dokka:dokka-core:2.0.0
+org.jetbrains.dokka:dokka-gradle-plugin:2.0.0
+org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.1.20
+org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.20
+org.jetbrains.kotlin:fus-statistics-gradle-plugin:2.1.20
+org.jetbrains.kotlin:kotlin-bom:2.1.20
+org.jetbrains.kotlin:kotlin-build-statistics:2.1.20
+org.jetbrains.kotlin:kotlin-build-tools-api:2.1.20
+org.jetbrains.kotlin:kotlin-compiler-runner:2.1.20
+org.jetbrains.kotlin:kotlin-daemon-client:2.1.20
+org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.1.20
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.1.20
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.1.20
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.1.20
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.1.20
+org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.20
+org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.1.20
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.1.20
+org.jetbrains.kotlin:kotlin-native-utils:2.1.20
 org.jetbrains.kotlin:kotlin-reflect:2.0.20
-org.jetbrains.kotlin:kotlin-scripting-common:1.9.24
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.24
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.24
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.24
-org.jetbrains.kotlin:kotlin-serialization:1.9.24
-org.jetbrains.kotlin:kotlin-stdlib-common:2.0.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.24
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.24
+org.jetbrains.kotlin:kotlin-serialization:2.1.20
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.20
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.20
 org.jetbrains.kotlin:kotlin-stdlib:2.0.20
-org.jetbrains.kotlin:kotlin-tooling-core:1.9.24
-org.jetbrains.kotlin:kotlin-util-io:1.9.24
-org.jetbrains.kotlin:kotlin-util-klib:1.9.24
-org.jetbrains.kotlinx:binary-compatibility-validator:0.13.2
-org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.3
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.3
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3
-org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.6.2
+org.jetbrains.kotlin:kotlin-tooling-core:2.1.20
+org.jetbrains.kotlin:kotlin-util-io:2.1.20
+org.jetbrains.kotlin:kotlin-util-klib-metadata:2.1.20
+org.jetbrains.kotlin:kotlin-util-klib:2.1.20
+org.jetbrains.kotlinx:binary-compatibility-validator:0.17.0
+org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.0
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0
+org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.0
+org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.0
+org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.0
+org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.0
+org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0
 org.jetbrains:annotations:13.0
 org.jvnet.staxex:stax-ex:1.8.1
-org.ow2.asm:asm-analysis:9.6
-org.ow2.asm:asm-commons:9.6
-org.ow2.asm:asm-tree:9.6
-org.ow2.asm:asm-util:9.6
-org.ow2.asm:asm:9.6
+org.ow2.asm:asm-analysis:9.7
+org.ow2.asm:asm-commons:9.7
+org.ow2.asm:asm-tree:9.7
+org.ow2.asm:asm-util:9.7
+org.ow2.asm:asm:9.7
 org.slf4j:slf4j-api:1.7.30
 org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2

gradle.properties

@@ -25,8 +25,3 @@ POM_DEVELOPER_ID=square
 POM_DEVELOPER_NAME=Square, Inc.
 POM_DEVELOPER_URL=https://github.com/square/
 SONATYPE_STAGING_PROFILE=com.squareup
-
-# As LEGACY JS compiler is deprecated and we only anticipate IR compatible consumers,
-# we're only supporting IR for now.
-# For details see https://kotlinlang.org/docs/js-ir-compiler.html
-kotlin.js.compiler=ir