Skip to content

Commit 3fdf36e

Browse files
zach-klippensteinzach-klippenstein
committed
Upgrade Kotlin to 2.3.10.
1 parent a013f39 commit 3fdf36e

23 files changed

Lines changed: 118 additions & 118 deletions

File tree

‎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.1.21" apply false
3+
kotlin("jvm") version "2.3.10" apply false
44
}
55

66
dependencyResolutionManagement {

‎dependencies/classpath.txt‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ com.google.code.findbugs:jsr305:3.0.2
6161
com.google.code.gson:gson:2.11.0
6262
com.google.crypto.tink:tink:1.7.0
6363
com.google.dagger:dagger:2.28.3
64-
com.google.devtools.ksp:symbol-processing-api:2.1.21-2.0.2
65-
com.google.devtools.ksp:symbol-processing-common-deps:2.1.21-2.0.2
66-
com.google.devtools.ksp:symbol-processing-gradle-plugin:2.1.21-2.0.2
64+
com.google.devtools.ksp:symbol-processing-api:2.3.5
65+
com.google.devtools.ksp:symbol-processing-common-deps:2.3.5
66+
com.google.devtools.ksp:symbol-processing-gradle-plugin:2.3.5
6767
com.google.errorprone:error_prone_annotations:2.30.0
6868
com.google.flatbuffers:flatbuffers-java:1.12.0
6969
com.google.guava:failureaccess:1.0.2
@@ -145,32 +145,32 @@ org.jdom:jdom2:2.0.6
145145
org.jetbrains.dokka:dokka-core:2.0.0
146146
org.jetbrains.dokka:dokka-gradle-plugin:2.0.0
147147
org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:2.0.0
148-
org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.1.21
149-
org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21
150-
org.jetbrains.kotlin:fus-statistics-gradle-plugin:2.1.21
151-
org.jetbrains.kotlin:kotlin-bom:2.1.21
152-
org.jetbrains.kotlin:kotlin-build-statistics:2.1.21
153-
org.jetbrains.kotlin:kotlin-build-tools-api:2.1.21
154-
org.jetbrains.kotlin:kotlin-compiler-runner:2.1.21
155-
org.jetbrains.kotlin:kotlin-daemon-client:2.1.21
156-
org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.1.21
157-
org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.1.21
158-
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.1.21
159-
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.1.21
160-
org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.1.21
161-
org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21
162-
org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.1.21
163-
org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.1.21
164-
org.jetbrains.kotlin:kotlin-native-utils:2.1.21
148+
org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.3.10
149+
org.jetbrains.kotlin:abi-tools-api:2.3.10
150+
org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10
151+
org.jetbrains.kotlin:fus-statistics-gradle-plugin:2.3.10
152+
org.jetbrains.kotlin:kotlin-bom:2.3.10
153+
org.jetbrains.kotlin:kotlin-build-statistics:2.3.10
154+
org.jetbrains.kotlin:kotlin-build-tools-api:2.3.10
155+
org.jetbrains.kotlin:kotlin-compiler-runner:2.3.10
156+
org.jetbrains.kotlin:kotlin-daemon-client:2.3.10
157+
org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.3.10
158+
org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.3.10
159+
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.3.10
160+
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.3.10
161+
org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10
162+
org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.3.10
163+
org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.3.10
164+
org.jetbrains.kotlin:kotlin-native-utils:2.3.10
165165
org.jetbrains.kotlin:kotlin-reflect:2.0.21
166-
org.jetbrains.kotlin:kotlin-serialization:2.1.21
167-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21
168-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21
166+
org.jetbrains.kotlin:kotlin-serialization:2.3.10
167+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.10
168+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.10
169169
org.jetbrains.kotlin:kotlin-stdlib:2.0.21
170-
org.jetbrains.kotlin:kotlin-tooling-core:2.1.21
171-
org.jetbrains.kotlin:kotlin-util-io:2.1.21
172-
org.jetbrains.kotlin:kotlin-util-klib-metadata:2.1.21
173-
org.jetbrains.kotlin:kotlin-util-klib:2.1.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
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
@@ -47,7 +47,7 @@ filekit-dialogs-compose = "0.10.0-beta03"
4747

4848
google-accompanist = "0.18.0"
4949
google-dagger = "2.40.5"
50-
google-ksp = "2.1.21-2.0.2"
50+
google-ksp = "2.3.5"
5151
google-material = "1.4.0"
5252

5353
groovy = "3.0.9"
@@ -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.1.21"
62+
kotlin = "2.3.10"
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
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33
// Top-level build file where you can add configuration options common to all sub-projects/modules.
44
buildscript {
55
ext {
6-
kotlin_version = '2.1.21'
6+
kotlin_version = '2.3.10'
77
workflow_version = "1.19.0"
88

99
deps = [

‎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.1.21
59-
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21
60-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21
61-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21
62-
org.jetbrains.kotlin:kotlin-stdlib:2.1.21
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
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.1.21
4-
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21
5-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21
6-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21
7-
org.jetbrains.kotlin:kotlin-stdlib:2.1.21
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
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.1.21
4-
org.jetbrains.kotlin:kotlin-dom-api-compat:2.1.21
5-
org.jetbrains.kotlin:kotlin-stdlib-js:2.1.21
6-
org.jetbrains.kotlin:kotlin-stdlib:2.1.21
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
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.1.21
4-
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21
5-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21
6-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21
7-
org.jetbrains.kotlin:kotlin-stdlib:2.1.21
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
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/jvmRuntimeClasspath.txt‎

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

‎workflow-runtime/dependencies/androidRuntimeClasspath.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.1.21
59-
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21
60-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21
61-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21
62-
org.jetbrains.kotlin:kotlin-stdlib:2.1.21
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
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

0 commit comments

Comments
 (0)