From cf7c071634d3fbd1a90b41bc628df185d31f8c11 Mon Sep 17 00:00:00 2001 From: Stephen Edwards Date: Fri, 25 Jul 2025 11:18:14 -0400 Subject: [PATCH] Update to Kotlin 2.1.21 and Compiler Plugins; compileSdk 36; AGP 1.11.1; Gradle 8.13 --- benchmarks/dungeon-benchmark/build.gradle.kts | 13 +- .../complex-benchmark/build.gradle.kts | 13 +- .../complex-poetry/build.gradle.kts | 12 +- build-logic/settings.gradle.kts | 3 +- dependencies/classpath.txt | 240 +++++++++--------- gradle/libs.versions.toml | 16 +- gradle/wrapper/gradle-wrapper.properties | 2 +- kotlin-js-store/yarn.lock | 70 +++-- .../squareup/sample/dungeon/LoadingBinding.kt | 2 +- .../sample/nestedoverlays/ButtonBar.kt | 4 +- samples/tutorial/build.gradle | 4 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../dependencies/runtimeClasspath.txt | 17 +- .../com/squareup/tracing/ChromeTraceEvent.kt | 18 +- .../dependencies/releaseRuntimeClasspath.txt | 10 +- .../dependencies/runtimeClasspath.txt | 10 +- workflow-core/build.gradle.kts | 2 +- .../dependencies/jsRuntimeClasspath.txt | 8 +- .../dependencies/jvmMainRuntimeClasspath.txt | 6 +- .../dependencies/jvmRuntimeClasspath.txt | 8 +- .../dependencies/releaseRuntimeClasspath.txt | 10 +- .../dependencies/jsRuntimeClasspath.txt | 8 +- .../dependencies/jvmMainRuntimeClasspath.txt | 25 +- .../dependencies/jvmRuntimeClasspath.txt | 8 +- .../dependencies/runtimeClasspath.txt | 10 +- .../dependencies/runtimeClasspath.txt | 12 +- .../workflow1/testing/RealRenderTester.kt | 1 - .../api/workflow-trace-viewer.api | 12 +- .../dependencies/runtimeClasspath.txt | 17 +- .../dependencies/releaseRuntimeClasspath.txt | 10 +- workflow-ui/compose/api/compose.api | 9 +- .../dependencies/releaseRuntimeClasspath.txt | 10 +- .../dependencies/releaseRuntimeClasspath.txt | 10 +- .../workflow1/ui/LayoutScreenViewFactory.kt | 2 +- .../dependencies/runtimeClasspath.txt | 10 +- .../dependencies/releaseRuntimeClasspath.txt | 10 +- 36 files changed, 311 insertions(+), 313 deletions(-) diff --git a/benchmarks/dungeon-benchmark/build.gradle.kts b/benchmarks/dungeon-benchmark/build.gradle.kts index 00f21d752c..6046db24a5 100644 --- a/benchmarks/dungeon-benchmark/build.gradle.kts +++ b/benchmarks/dungeon-benchmark/build.gradle.kts @@ -2,6 +2,7 @@ import com.rickbusarow.kgx.libsCatalog import com.rickbusarow.kgx.version import com.squareup.workflow1.buildsrc.internal.javaTarget import com.squareup.workflow1.buildsrc.internal.javaTargetVersion +import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { id("com.android.test") @@ -19,11 +20,6 @@ android { targetCompatibility = javaTargetVersion } - kotlinOptions { - jvmTarget = javaTarget - freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn" - } - defaultConfig { minSdk = 28 targetSdk = libsCatalog.version("targetSdk").toInt() @@ -44,6 +40,13 @@ android { experimentalProperties["android.experimental.self-instrumenting"] = true } +kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn") + } +} + dependencies { implementation(libs.androidx.macro.benchmark) implementation(libs.androidx.test.espresso.core) diff --git a/benchmarks/performance-poetry/complex-benchmark/build.gradle.kts b/benchmarks/performance-poetry/complex-benchmark/build.gradle.kts index b0916a3879..e60250f41e 100644 --- a/benchmarks/performance-poetry/complex-benchmark/build.gradle.kts +++ b/benchmarks/performance-poetry/complex-benchmark/build.gradle.kts @@ -2,6 +2,7 @@ import com.rickbusarow.kgx.libsCatalog import com.rickbusarow.kgx.version import com.squareup.workflow1.buildsrc.internal.javaTarget import com.squareup.workflow1.buildsrc.internal.javaTargetVersion +import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { id("com.android.test") @@ -19,11 +20,6 @@ android { targetCompatibility = javaTargetVersion } - kotlinOptions { - jvmTarget = javaTarget - freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn" - } - defaultConfig { minSdk = 28 targetSdk = libsCatalog.version("targetSdk").toInt() @@ -53,6 +49,13 @@ android { experimentalProperties["android.experimental.self-instrumenting"] = true } +kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn") + } +} + dependencies { implementation(libs.androidx.macro.benchmark) implementation(libs.androidx.test.espresso.core) diff --git a/benchmarks/performance-poetry/complex-poetry/build.gradle.kts b/benchmarks/performance-poetry/complex-poetry/build.gradle.kts index 274a83cab9..c3a608b9cb 100644 --- a/benchmarks/performance-poetry/complex-poetry/build.gradle.kts +++ b/benchmarks/performance-poetry/complex-poetry/build.gradle.kts @@ -1,7 +1,7 @@ import com.rickbusarow.kgx.libsCatalog import com.rickbusarow.kgx.version -import com.squareup.workflow1.buildsrc.internal.javaTarget import com.squareup.workflow1.buildsrc.internal.javaTargetVersion +import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { id("com.android.application") @@ -16,10 +16,6 @@ android { targetCompatibility = javaTargetVersion } - kotlinOptions { - jvmTarget = javaTarget - } - defaultConfig { targetSdk = libsCatalog.version("targetSdk").toInt() minSdk = 29 @@ -51,6 +47,12 @@ android { namespace = "com.squareup.benchmarks.performance.complex.poetry" } +kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } +} + dependencies { androidTestImplementation(libs.androidx.test.espresso.core) androidTestImplementation(libs.androidx.test.junit) diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts index 2c7dfa00c2..5c8522d509 100644 --- a/build-logic/settings.gradle.kts +++ b/build-logic/settings.gradle.kts @@ -1,11 +1,10 @@ plugins { // Hardcoded as this is upstream of the version catalog. Keep this in sync with that. - kotlin("jvm") version "2.0.21" apply false + kotlin("jvm") version "2.1.21" apply false } dependencyResolutionManagement { - @Suppress("UnstableApiUsage") versionCatalogs { create("libs") { diff --git a/dependencies/classpath.txt b/dependencies/classpath.txt index e3a47bd6af..0a29f2e0f6 100644 --- a/dependencies/classpath.txt +++ b/dependencies/classpath.txt @@ -1,51 +1,50 @@ -androidx.databinding:databinding-common:8.8.0 -androidx.databinding:databinding-compiler-common:8.8.0 -app.cash.burst:burst-gradle-plugin:2.1.0 -app.cash.burst:burst-jvm:2.1.0 -app.cash.burst:burst-kotlin-plugin:2.1.0 -app.cash.burst:burst:2.1.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 +androidx.databinding:databinding-common:8.11.1 +androidx.databinding:databinding-compiler-common:8.11.1 +app.cash.burst:burst-gradle-plugin:2.5.0 +app.cash.burst:burst-jvm:2.5.0 +app.cash.burst:burst-kotlin-plugin:2.5.0 +app.cash.burst:burst:2.5.0 +com.android.databinding:baseLibrary:8.11.1 +com.android.tools.analytics-library:crash:31.11.1 +com.android.tools.analytics-library:protos:31.11.1 +com.android.tools.analytics-library:shared:31.11.1 +com.android.tools.analytics-library:tracker:31.11.1 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.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:aapt2-proto:8.11.1-12782657 +com.android.tools.build:aaptcompiler:8.11.1 +com.android.tools.build:apksig:8.11.1 +com.android.tools.build:apkzlib:8.11.1 +com.android.tools.build:builder-model:8.11.1 +com.android.tools.build:builder-test-api:8.11.1 +com.android.tools.build:builder:8.11.1 +com.android.tools.build:bundletool:1.18.1 +com.android.tools.build:gradle-api:8.11.1 +com.android.tools.build:gradle-settings-api:8.11.1 +com.android.tools.build:gradle:8.11.1 +com.android.tools.build:manifest-merger:31.11.1 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api -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.android.tools.ddms:ddmlib:31.11.1 +com.android.tools.layoutlib:layoutlib-api:31.11.1 +com.android.tools.lint:lint-model:31.11.1 +com.android.tools.lint:lint-typedef-remover:31.11.1 +com.android.tools.utp:android-device-provider-ddmlib-proto:31.11.1 +com.android.tools.utp:android-device-provider-gradle-proto:31.11.1 +com.android.tools.utp:android-device-provider-profile-proto:31.11.1 +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.11.1 +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.11.1 +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.11.1 +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.11.1 +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.11.1 +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.11.1 +com.android.tools:annotations:31.11.1 +com.android.tools:common:31.11.1 +com.android.tools:dvlib:31.11.1 +com.android.tools:repository:31.11.1 +com.android.tools:sdk-common:31.11.1 +com.android.tools:sdklib:31.11.1 +com.android:signflinger:8.11.1 +com.android:zipflinger:8.11.1 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 @@ -56,31 +55,31 @@ com.fasterxml.jackson.module:jackson-module-kotlin:2.12.7 com.fasterxml.jackson:jackson-bom:2.12.7 com.fasterxml.woodstox:woodstox-core:6.2.4 com.google.android:annotations:4.1.1.4 -com.google.api.grpc:proto-google-common-protos:2.17.0 +com.google.api.grpc:proto-google-common-protos:2.48.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:2.0.21-1.0.26 -com.google.devtools.ksp:symbol-processing-common-deps:2.0.21-1.0.26 -com.google.devtools.ksp:symbol-processing-gradle-plugin:2.0.21-1.0.26 -com.google.errorprone:error_prone_annotations:2.18.0 +com.google.devtools.ksp:symbol-processing-api:2.1.21-2.0.2 +com.google.devtools.ksp:symbol-processing-common-deps:2.1.21-2.0.2 +com.google.devtools.ksp:symbol-processing-gradle-plugin:2.1.21-2.0.2 +com.google.errorprone:error_prone_annotations:2.30.0 com.google.flatbuffers:flatbuffers-java:1.12.0 -com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:32.0.1-jre +com.google.guava:failureaccess:1.0.2 +com.google.guava:guava:33.3.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -com.google.j2objc:j2objc-annotations:2.8 +com.google.j2objc:j2objc-annotations:3.0.0 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.google.protobuf:protobuf-java-util:3.25.5 +com.google.protobuf:protobuf-java:3.25.5 +com.google.testing.platform:core-proto:0.0.9-alpha03 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-adapters:1.15.2 com.squareup.moshi:moshi:1.15.2 com.squareup.okhttp3:okhttp:4.12.0 com.squareup.okio:okio-jvm:3.7.0 @@ -97,28 +96,30 @@ com.vanniktech:central-portal:0.32.0 com.vanniktech:gradle-maven-publish-plugin:0.32.0 com.vanniktech:nexus:0.32.0 commons-codec:commons-codec:1.11 -commons-io:commons-io:2.13.0 +commons-io:commons-io:2.16.1 commons-logging:commons-logging:1.2 io.github.java-diff-utils:java-diff-utils:4.12 -io.grpc:grpc-api:1.57.0 -io.grpc:grpc-context:1.57.0 -io.grpc:grpc-core:1.57.0 -io.grpc:grpc-netty:1.57.0 -io.grpc:grpc-protobuf-lite:1.57.0 -io.grpc:grpc-protobuf:1.57.0 -io.grpc:grpc-stub:1.57.0 -io.netty:netty-buffer:4.1.93.Final -io.netty:netty-codec-http2:4.1.93.Final -io.netty:netty-codec-http:4.1.93.Final -io.netty:netty-codec-socks:4.1.93.Final -io.netty:netty-codec:4.1.93.Final -io.netty:netty-common:4.1.93.Final -io.netty:netty-handler-proxy:4.1.93.Final -io.netty:netty-handler:4.1.93.Final -io.netty:netty-resolver:4.1.93.Final -io.netty:netty-transport-native-unix-common:4.1.93.Final -io.netty:netty-transport:4.1.93.Final -io.perfmark:perfmark-api:0.26.0 +io.grpc:grpc-api:1.69.1 +io.grpc:grpc-context:1.69.1 +io.grpc:grpc-core:1.69.1 +io.grpc:grpc-inprocess:1.69.1 +io.grpc:grpc-netty:1.69.1 +io.grpc:grpc-protobuf-lite:1.69.1 +io.grpc:grpc-protobuf:1.69.1 +io.grpc:grpc-stub:1.69.1 +io.grpc:grpc-util:1.69.1 +io.netty:netty-buffer:4.1.110.Final +io.netty:netty-codec-http2:4.1.110.Final +io.netty:netty-codec-http:4.1.110.Final +io.netty:netty-codec-socks:4.1.110.Final +io.netty:netty-codec:4.1.110.Final +io.netty:netty-common:4.1.110.Final +io.netty:netty-handler-proxy:4.1.110.Final +io.netty:netty-handler:4.1.110.Final +io.netty:netty-resolver:4.1.110.Final +io.netty:netty-transport-native-unix-common:4.1.110.Final +io.netty:netty-transport:4.1.110.Final +io.perfmark:perfmark-api:0.27.0 jakarta.activation:jakarta.activation-api:1.2.1 jakarta.xml.bind:jakarta.xml.bind-api:2.3.2 javax.annotation:javax.annotation-api:1.3.2 @@ -132,11 +133,11 @@ 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.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.bouncycastle:bcpkix-jdk18on:1.79 +org.bouncycastle:bcprov-jdk18on:1.79 +org.bouncycastle:bcutil-jdk18on:1.79 +org.checkerframework:checker-qual:3.43.0 +org.codehaus.mojo:animal-sniffer-annotations:1.24 org.codehaus.woodstox:stax2-api:4.2.1 org.glassfish.jaxb:jaxb-runtime:2.3.2 org.glassfish.jaxb:txw2:2.3.2 @@ -144,37 +145,36 @@ 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.intellij.deps:trove4j:1.0.20200330 -org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.0.21 -org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21 -org.jetbrains.kotlin:kotlin-bom:2.0.21 -org.jetbrains.kotlin:kotlin-build-statistics:2.0.21 -org.jetbrains.kotlin:kotlin-build-tools-api:2.0.21 -org.jetbrains.kotlin:kotlin-compiler-embeddable:2.0.21 -org.jetbrains.kotlin:kotlin-compiler-runner:2.0.21 -org.jetbrains.kotlin:kotlin-daemon-client:2.0.21 -org.jetbrains.kotlin:kotlin-daemon-embeddable:2.0.21 -org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.0.21 -org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.0.21 -org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.0.21 -org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.0.21 -org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.0.21 -org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21 -org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.0.21 -org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.0.21 -org.jetbrains.kotlin:kotlin-native-utils:2.0.21 -org.jetbrains.kotlin:kotlin-reflect:2.0.20 -org.jetbrains.kotlin:kotlin-serialization:2.0.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 -org.jetbrains.kotlin:kotlin-stdlib:2.0.20 -org.jetbrains.kotlin:kotlin-tooling-core:2.0.21 -org.jetbrains.kotlin:kotlin-util-io:2.0.21 -org.jetbrains.kotlin:kotlin-util-klib:2.0.21 -org.jetbrains.kotlinx:binary-compatibility-validator:0.17.0 -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 +org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.1.21 +org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21 +org.jetbrains.kotlin:fus-statistics-gradle-plugin:2.1.21 +org.jetbrains.kotlin:kotlin-bom:2.1.21 +org.jetbrains.kotlin:kotlin-build-statistics:2.1.21 +org.jetbrains.kotlin:kotlin-build-tools-api:2.1.21 +org.jetbrains.kotlin:kotlin-compiler-runner:2.1.21 +org.jetbrains.kotlin:kotlin-daemon-client:2.1.21 +org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.1.21 +org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.1.21 +org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.1.21 +org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.1.21 +org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.1.21 +org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21 +org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.1.21 +org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.1.21 +org.jetbrains.kotlin:kotlin-native-utils:2.1.21 +org.jetbrains.kotlin:kotlin-reflect:2.0.21 +org.jetbrains.kotlin:kotlin-serialization:2.1.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21 +org.jetbrains.kotlin:kotlin-stdlib:2.0.21 +org.jetbrains.kotlin:kotlin-tooling-core:2.1.21 +org.jetbrains.kotlin:kotlin-util-io:2.1.21 +org.jetbrains.kotlin:kotlin-util-klib-metadata:2.1.21 +org.jetbrains.kotlin:kotlin-util-klib:2.1.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 +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 @@ -182,10 +182,10 @@ 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.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.ow2.asm:asm-analysis:9.7.1 +org.ow2.asm:asm-commons:9.7.1 +org.ow2.asm:asm-tree:9.7.1 +org.ow2.asm:asm-util:9.7.1 +org.ow2.asm:asm:9.7.1 org.slf4j:slf4j-api:1.7.30 -org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2 +org.tensorflow:tensorflow-lite-metadata:0.2.0 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2a3999324d..732d223365 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -agpVersion = "8.8.0" +agpVersion = "8.11.1" -compileSdk = "34" +compileSdk = "36" minSdk = "24" targetSdk = "33" @@ -36,7 +36,7 @@ androidx-tracing = "1.2.0" androidx-transition = "1.5.1" androidx-viewbinding = "8.1.2" -burst = "2.1.0" +burst = "2.5.0" detekt = "1.19.0" dokka = "2.0.0" @@ -46,7 +46,7 @@ filekit-dialogs-compose = "0.10.0-beta03" google-accompanist = "0.18.0" google-dagger = "2.40.5" -google-ksp = "2.0.21-1.0.26" +google-ksp = "2.1.21-2.0.2" google-material = "1.4.0" groovy = "3.0.9" @@ -58,11 +58,11 @@ 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.0.21" +kotlin = "2.1.21" -kotlinx-binary-compatibility = "0.17.0" +kotlinx-binary-compatibility = "0.18.1" kotlinx-coroutines = "1.9.0" -kotlinx-serialization-json = "1.6.3" +kotlinx-serialization-json = "1.8.1" kotlinx-atomicfu = "0.22.0" ktlint = "0.49.1" @@ -81,7 +81,7 @@ rxjava2-core = "2.2.21" squareup-curtains = "1.2.5" squareup-cycler = "0.1.9" squareup-leakcanary = "3.0-alpha-8" -squareup-moshi = "1.15.0" +squareup-moshi = "1.15.2" squareup-moshi-kotlin = "1.15.2" squareup-okhttp = "4.9.1" squareup-okio = "3.3.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bbb57cf062..f407850a54 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock index d3e469b54c..83e4663ff3 100644 --- a/kotlin-js-store/yarn.lock +++ b/kotlin-js-store/yarn.lock @@ -82,37 +82,21 @@ dependencies: "@types/node" "*" -"@types/eslint-scope@^3.7.3": - version "3.7.7" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5" - integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg== - dependencies: - "@types/eslint" "*" - "@types/estree" "*" - -"@types/eslint@*": - version "9.6.1" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584" - integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag== - dependencies: - "@types/estree" "*" - "@types/json-schema" "*" - -"@types/estree@*", "@types/estree@^1.0.5": +"@types/estree@^1.0.5": version "1.0.7" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.7.tgz#4158d3105276773d5b7695cd4834b1722e4f37a8" integrity sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ== -"@types/json-schema@*", "@types/json-schema@^7.0.9": - version "7.0.15" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" - integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== - "@types/json-schema@^7.0.8": version "7.0.11" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== +"@types/json-schema@^7.0.9": + version "7.0.15" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" + integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== + "@types/node@*", "@types/node@>=10.0.0": version "18.14.0" resolved "https://registry.yarnpkg.com/@types/node/-/node-18.14.0.tgz#94c47b9217bbac49d4a67a967fdcdeed89ebb7d0" @@ -690,10 +674,10 @@ engine.io@~6.6.0: engine.io-parser "~5.2.1" ws "~8.17.1" -enhanced-resolve@^5.17.0: - version "5.18.1" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz#728ab082f8b7b6836de51f1637aab5d3b9568faf" - integrity sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg== +enhanced-resolve@^5.17.1: + version "5.18.2" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.2.tgz#7903c5b32ffd4b2143eeb4b92472bd68effd5464" + integrity sha512-6Jw4sE1maoRJo3q8MsSIn2onJFbLTOjY9hlx4DZXmOKvLRd1Ok2kXmAGXaafL2+ijsJZ1ClYbl/pmqr9+k4iUQ== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -1162,10 +1146,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" @@ -1197,6 +1181,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" + loader-runner@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" @@ -1300,10 +1291,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" @@ -1900,12 +1891,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" @@ -1914,7 +1904,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/samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/LoadingBinding.kt b/samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/LoadingBinding.kt index 5c18b1bca3..48fb2bec3c 100644 --- a/samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/LoadingBinding.kt +++ b/samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/LoadingBinding.kt @@ -23,7 +23,7 @@ inline fun LoadingScreenViewFactory( @PublishedApi internal class LoadingLayoutRunner( - @StringRes private val labelRes: Int, + @param:StringRes private val labelRes: Int, view: View ) : ScreenViewRunner { diff --git a/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/ButtonBar.kt b/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/ButtonBar.kt index ecf29eb3fe..6254d0df9e 100644 --- a/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/ButtonBar.kt +++ b/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/ButtonBar.kt @@ -15,13 +15,13 @@ import com.squareup.workflow1.ui.ScreenViewHolder import android.widget.Button as ButtonView data class Button( - @StringRes val name: Int, + @param:StringRes val name: Int, val onClick: () -> Unit ) class ButtonBar( vararg buttons: Button?, - @ColorRes val color: Int = -1, + @param:ColorRes val color: Int = -1, val showEditText: Boolean = false, ) : AndroidScreen { private val buttons: List