Skip to content

Commit fa982e3

Browse files
Upgrade Kotlin to 2.3.10.
1 parent a013f39 commit fa982e3

42 files changed

Lines changed: 732 additions & 495 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,9 @@ class PerformancePoemsBrowserWorkflow(
215215
return poems + poem
216216
}
217217

218-
else -> {
219-
throw IllegalStateException("State can't change while rendering.")
220-
}
218+
// else -> {
219+
// throw IllegalStateException("State can't change while rendering.")
220+
// }
221221
}
222222
}
223223
}

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: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
androidx.databinding:databinding-common:8.11.1
22
androidx.databinding:databinding-compiler-common:8.11.1
3-
app.cash.burst:burst-gradle-plugin:2.5.0
4-
app.cash.burst:burst-jvm:2.5.0
5-
app.cash.burst:burst-kotlin-plugin:2.5.0
6-
app.cash.burst:burst:2.5.0
3+
app.cash.burst:burst-gradle-plugin:2.11.0
74
com.android.databinding:baseLibrary:8.11.1
85
com.android.tools.analytics-library:crash:31.11.1
96
com.android.tools.analytics-library:protos:31.11.1
@@ -61,9 +58,9 @@ com.google.code.findbugs:jsr305:3.0.2
6158
com.google.code.gson:gson:2.11.0
6259
com.google.crypto.tink:tink:1.7.0
6360
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
61+
com.google.devtools.ksp:symbol-processing-api:2.3.5
62+
com.google.devtools.ksp:symbol-processing-common-deps:2.3.5
63+
com.google.devtools.ksp:symbol-processing-gradle-plugin:2.3.5
6764
com.google.errorprone:error_prone_annotations:2.30.0
6865
com.google.flatbuffers:flatbuffers-java:1.12.0
6966
com.google.guava:failureaccess:1.0.2
@@ -145,32 +142,32 @@ org.jdom:jdom2:2.0.6
145142
org.jetbrains.dokka:dokka-core:2.0.0
146143
org.jetbrains.dokka:dokka-gradle-plugin:2.0.0
147144
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
145+
org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.3.10
146+
org.jetbrains.kotlin:abi-tools-api:2.3.10
147+
org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10
148+
org.jetbrains.kotlin:fus-statistics-gradle-plugin:2.3.10
149+
org.jetbrains.kotlin:kotlin-bom:2.3.10
150+
org.jetbrains.kotlin:kotlin-build-statistics:2.3.10
151+
org.jetbrains.kotlin:kotlin-build-tools-api:2.3.10
152+
org.jetbrains.kotlin:kotlin-compiler-runner:2.3.10
153+
org.jetbrains.kotlin:kotlin-daemon-client:2.3.10
154+
org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.3.10
155+
org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.3.10
156+
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.3.10
157+
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.3.10
158+
org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10
159+
org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.3.10
160+
org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.3.10
161+
org.jetbrains.kotlin:kotlin-native-utils:2.3.10
165162
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
163+
org.jetbrains.kotlin:kotlin-serialization:2.3.10
164+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.10
165+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.10
169166
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
167+
org.jetbrains.kotlin:kotlin-tooling-core:2.3.10
168+
org.jetbrains.kotlin:kotlin-util-io:2.3.10
169+
org.jetbrains.kotlin:kotlin-util-klib-metadata:2.3.10
170+
org.jetbrains.kotlin:kotlin-util-klib:2.3.10
174171
org.jetbrains.kotlinx:binary-compatibility-validator:0.18.1
175172
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.0
176173
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0

gradle/libs.versions.toml

Lines changed: 3 additions & 3 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.5.0"
40+
burst = "2.11.0"
4141

4242
detekt = "1.19.0"
4343
dokka = "2.0.0"
@@ -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"

0 commit comments

Comments
 (0)