Skip to content

Commit fba3733

Browse files
zach-klippensteinzach-klippenstein
authored
Merge pull request #1486 from square/zachklipp/kotlin-2.3.20
Upgrade Kotlin to 2.3.20
2 parents cee94b3 + ead2fe1 commit fba3733

26 files changed

Lines changed: 126 additions & 125 deletions

File tree

‎.github/workflows/codeql.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,11 @@ jobs:
4545
include:
4646
- language: actions
4747
build-mode: none
48-
- language: java-kotlin
49-
build-mode: autobuild
48+
# Temporarily disable Java/Kotlin CodeQL analysis because current CodeQL releases,
49+
# including nightly, do not support this repo's Kotlin 2.3.20 toolchain.
50+
# TODO(1487): Re-enable this entry once CodeQL supports Kotlin 2.3.20.
51+
# - language: java-kotlin
52+
# build-mode: autobuild
5053
- language: ruby
5154
build-mode: none
5255
# CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', 'swift'
@@ -73,8 +76,7 @@ jobs:
7376
with:
7477
languages: ${{ matrix.language }}
7578
build-mode: ${{ matrix.build-mode }}
76-
# Nightly is required for now to support Kotlin 2.3.10. Once CodeQL stable supports it, we
77-
# can remove this.
79+
# Nightly is required to support bleeding-edge Kotlin versions.
7880
tools: nightly
7981
# If you wish to specify custom queries, you can do so here or in a config file.
8082
# By default, queries listed here will override any specified in a config file.

‎build-logic/settings.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
// Hardcoded as this is upstream of the version catalog. Keep this in sync with that.
3-
kotlin("jvm") version "2.3.10" apply false
3+
kotlin("jvm") version "2.3.20" apply false
44
}
55

66
dependencyResolutionManagement {

‎dependencies/classpath.txt‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ androidx.benchmark:androidx.benchmark.gradle.plugin:1.3.4
22
androidx.benchmark:benchmark-gradle-plugin:1.3.4
33
androidx.databinding:databinding-common:8.11.1
44
androidx.databinding:databinding-compiler-common:8.11.1
5-
app.cash.burst:burst-gradle-plugin:2.11.0
5+
app.cash.burst:burst-gradle-plugin:2.12.0-beta1
66
com.android.databinding:baseLibrary:8.11.1
77
com.android.tools.analytics-library:crash:31.11.1
88
com.android.tools.analytics-library:protos:31.11.1
@@ -144,33 +144,33 @@ org.jdom:jdom2:2.0.6
144144
org.jetbrains.dokka:dokka-core:2.0.0
145145
org.jetbrains.dokka:dokka-gradle-plugin:2.0.0
146146
org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:2.0.0
147-
org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.3.10
148-
org.jetbrains.kotlin:abi-tools-api:2.3.10
149-
org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10
150-
org.jetbrains.kotlin:fus-statistics-gradle-plugin:2.3.10
151-
org.jetbrains.kotlin:kotlin-bom:2.3.10
152-
org.jetbrains.kotlin:kotlin-build-statistics:2.3.10
153-
org.jetbrains.kotlin:kotlin-build-tools-api:2.3.10
154-
org.jetbrains.kotlin:kotlin-compiler-runner:2.3.10
155-
org.jetbrains.kotlin:kotlin-daemon-client:2.3.10
156-
org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.3.10
157-
org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.3.10
158-
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.3.10
159-
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.3.10
160-
org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10
161-
org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.3.10
162-
org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.3.10
163-
org.jetbrains.kotlin:kotlin-native-utils:2.3.10
147+
org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.3.20
148+
org.jetbrains.kotlin:abi-tools-api:2.3.20
149+
org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.20
150+
org.jetbrains.kotlin:fus-statistics-gradle-plugin:2.3.20
151+
org.jetbrains.kotlin:kotlin-bom:2.3.20
152+
org.jetbrains.kotlin:kotlin-build-statistics:2.3.20
153+
org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20
154+
org.jetbrains.kotlin:kotlin-compiler-runner:2.3.20
155+
org.jetbrains.kotlin:kotlin-daemon-client:2.3.20
156+
org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.3.20
157+
org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.3.20
158+
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.3.20
159+
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.3.20
160+
org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.20
161+
org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.3.20
162+
org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.3.20
163+
org.jetbrains.kotlin:kotlin-native-utils:2.3.20
164164
org.jetbrains.kotlin:kotlin-reflect:2.2.21
165-
org.jetbrains.kotlin:kotlin-serialization:2.3.10
166-
org.jetbrains.kotlin:kotlin-stdlib-common:2.3.10
167-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.10
168-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.10
165+
org.jetbrains.kotlin:kotlin-serialization:2.3.20
166+
org.jetbrains.kotlin:kotlin-stdlib-common:2.3.20
167+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.20
168+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.20
169169
org.jetbrains.kotlin:kotlin-stdlib:2.2.21
170-
org.jetbrains.kotlin:kotlin-tooling-core:2.3.10
171-
org.jetbrains.kotlin:kotlin-util-io:2.3.10
172-
org.jetbrains.kotlin:kotlin-util-klib-metadata:2.3.10
173-
org.jetbrains.kotlin:kotlin-util-klib:2.3.10
170+
org.jetbrains.kotlin:kotlin-tooling-core:2.3.20
171+
org.jetbrains.kotlin:kotlin-util-io:2.3.20
172+
org.jetbrains.kotlin:kotlin-util-klib-metadata:2.3.20
173+
org.jetbrains.kotlin:kotlin-util-klib:2.3.20
174174
org.jetbrains.kotlinx:binary-compatibility-validator:0.18.1
175175
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.0
176176
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ androidx-tracing = "1.2.0"
3737
androidx-transition = "1.5.1"
3838
androidx-viewbinding = "8.1.2"
3939

40-
burst = "2.11.0"
40+
burst = "2.12.0-beta1"
4141

4242
detekt = "1.19.0"
4343
dokka = "2.0.0"
@@ -59,7 +59,7 @@ kgx = "0.1.12"
5959
kotest = "5.1.0"
6060
# Keep this in sync with what is hard-coded in build-logic/settings.gradle.kts as that is upstream
6161
# of loading the library versions from this file but should be the same.
62-
kotlin = "2.3.10"
62+
kotlin = "2.3.20"
6363

6464
kotlinx-binary-compatibility = "0.18.1"
6565
kotlinx-coroutines = "1.9.0"

‎samples/tutorial/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99

1010
ext {
11-
kotlin_version = '2.3.10'
11+
kotlin_version = '2.3.20'
1212
// Use the last published version for dependencies (workflow-core, workflow-testing, etc.)
1313
// so CI can resolve them from Maven Central. The ai-context plugin resolves via
1414
// includeBuild in settings.gradle regardless of the version string here.

‎workflow-ai-context/dependencies/runtimeClasspath.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.jetbrains.kotlin:kotlin-bom:2.3.10
2-
org.jetbrains.kotlin:kotlin-stdlib:2.3.10
1+
org.jetbrains.kotlin:kotlin-bom:2.3.20
2+
org.jetbrains.kotlin:kotlin-stdlib:2.3.20
33
org.jetbrains:annotations:13.0

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ androidx.versionedparcelable:versionedparcelable:1.1.1
5555
com.google.guava:listenablefuture:1.0
5656
com.squareup.okio:okio-jvm:3.3.0
5757
com.squareup.okio:okio:3.3.0
58-
org.jetbrains.kotlin:kotlin-bom:2.3.10
59-
org.jetbrains.kotlin:kotlin-stdlib-common:2.3.10
60-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.10
61-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.10
62-
org.jetbrains.kotlin:kotlin-stdlib:2.3.10
58+
org.jetbrains.kotlin:kotlin-bom:2.3.20
59+
org.jetbrains.kotlin:kotlin-stdlib-common:2.3.20
60+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.20
61+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.20
62+
org.jetbrains.kotlin:kotlin-stdlib:2.3.20
6363
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0
6464
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0
6565
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.9.0

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
com.squareup.okio:okio-jvm:3.3.0
22
com.squareup.okio:okio:3.3.0
3-
org.jetbrains.kotlin:kotlin-bom:2.3.10
4-
org.jetbrains.kotlin:kotlin-stdlib-common:2.3.10
5-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.10
6-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.10
7-
org.jetbrains.kotlin:kotlin-stdlib:2.3.10
3+
org.jetbrains.kotlin:kotlin-bom:2.3.20
4+
org.jetbrains.kotlin:kotlin-stdlib-common:2.3.20
5+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.20
6+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.20
7+
org.jetbrains.kotlin:kotlin-stdlib:2.3.20
88
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0
99
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.9.0
1010
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0

‎workflow-core/dependencies/jsRuntimeClasspath.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
com.squareup.okio:okio-js:3.3.0
22
com.squareup.okio:okio:3.3.0
3-
org.jetbrains.kotlin:kotlin-bom:2.3.10
4-
org.jetbrains.kotlin:kotlin-dom-api-compat:2.3.10
5-
org.jetbrains.kotlin:kotlin-stdlib-js:2.3.10
6-
org.jetbrains.kotlin:kotlin-stdlib:2.3.10
3+
org.jetbrains.kotlin:kotlin-bom:2.3.20
4+
org.jetbrains.kotlin:kotlin-dom-api-compat:2.3.20
5+
org.jetbrains.kotlin:kotlin-stdlib-js:2.3.20
6+
org.jetbrains.kotlin:kotlin-stdlib:2.3.20
77
org.jetbrains.kotlin:kotlinx-atomicfu-runtime:2.0.0
88
org.jetbrains.kotlinx:atomicfu-js:0.25.0
99
org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.9.0

‎workflow-core/dependencies/jvmMainRuntimeClasspath.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
com.squareup.okio:okio-jvm:3.3.0
22
com.squareup.okio:okio:3.3.0
3-
org.jetbrains.kotlin:kotlin-bom:2.3.10
4-
org.jetbrains.kotlin:kotlin-stdlib-common:2.3.10
5-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.10
6-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.10
7-
org.jetbrains.kotlin:kotlin-stdlib:2.3.10
3+
org.jetbrains.kotlin:kotlin-bom:2.3.20
4+
org.jetbrains.kotlin:kotlin-stdlib-common:2.3.20
5+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.20
6+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.20
7+
org.jetbrains.kotlin:kotlin-stdlib:2.3.20
88
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0
99
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.9.0
1010
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0

0 commit comments

Comments
 (0)