Skip to content

Upgrade Kotlin to 2.3.10. #1457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zach-klippenstein merged 1 commit into from
Feb 12, 2026
Merged

Upgrade Kotlin to 2.3.10. #1457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ jobs:
with:
languages: ${{ matrix.language }}
build-mode: ${{ matrix.build-mode }}
# Nightly is required for now to support Kotlin 2.3.10. Once CodeQL stable supports it, we
# can remove this.
tools: nightly
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
Expand Down
4 changes: 0 additions & 4 deletions ...ava/com/squareup/benchmarks/performance/complex/poetry/PerformancePoemsBrowserWorkflow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,6 @@ class PerformancePoemsBrowserWorkflow(
) { clearSelection }
return poems + poem
}

else -> {
throw IllegalStateException("State can't change while rendering.")
}
Comment on lines -218 to -220
Copy link

@blvckcoded blvckcoded Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how come this compiles? I'm guessing further in the PR there are changes around the renderState?

Copy link

@blvckcoded blvckcoded Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Guessing this was just dead code, didn't see related changes in PR

Copy link
Collaborator Author

@zach-klippenstein zach-klippenstein Feb 12, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not entirely sure – it looks to me like there are cases this doesn't cover, but if I don't remove this then the compiler complains that it's redundant, so ¯_(ツ)_/¯

Of course, the IDE complains the opposite, but what does it know. I'm guessing it's a K2 thing.

}
}
}
Expand Down
18 changes: 12 additions & 6 deletions benchmarks/runtime-microbenchmark/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
// Must be applied before kotlin-android so the convention can detect that this is a benchmark.
Expand All @@ -22,14 +23,8 @@ android {
targetCompatibility = javaTargetVersion
}

kotlinOptions {
jvmTarget = javaTarget
freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
}

defaultConfig {
minSdk = 28
targetSdk = libsCatalog.version("targetSdk").toInt()

testInstrumentationRunner = "androidx.benchmark.junit4.AndroidBenchmarkRunner"

Expand All @@ -46,6 +41,10 @@ android {
}
}

testOptions {
targetSdk = libsCatalog.version("targetSdk").toInt()
}

testBuildType = "release"
buildTypes {
debug {
Expand All @@ -66,6 +65,13 @@ android {
testNamespace = "$namespace.test"
}

kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.fromTarget(javaTarget))
freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
}
}

dependencies {
androidTestImplementation(project(":workflow-runtime"))
androidTestImplementation(libs.androidx.benchmark)
Expand Down
2 changes: 1 addition & 1 deletion build-logic/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
// Hardcoded as this is upstream of the version catalog. Keep this in sync with that.
kotlin("jvm") version "2.1.21" apply false
kotlin("jvm") version "2.3.10" apply false
}

dependencyResolutionManagement {
Expand Down
59 changes: 28 additions & 31 deletions dependencies/classpath.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ androidx.benchmark:androidx.benchmark.gradle.plugin:1.3.4
androidx.benchmark:benchmark-gradle-plugin:1.3.4
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
app.cash.burst:burst-gradle-plugin:2.11.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
Expand Down Expand Up @@ -63,9 +60,9 @@ com.google.code.findbugs:jsr305:3.0.2
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.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.devtools.ksp:symbol-processing-api:2.3.5
com.google.devtools.ksp:symbol-processing-common-deps:2.3.5
com.google.devtools.ksp:symbol-processing-gradle-plugin:2.3.5
com.google.errorprone:error_prone_annotations:2.30.0
com.google.flatbuffers:flatbuffers-java:1.12.0
com.google.guava:failureaccess:1.0.2
Expand Down Expand Up @@ -147,32 +144,32 @@ 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.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.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.3.10
org.jetbrains.kotlin:abi-tools-api:2.3.10
org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10
org.jetbrains.kotlin:fus-statistics-gradle-plugin:2.3.10
org.jetbrains.kotlin:kotlin-bom:2.3.10
org.jetbrains.kotlin:kotlin-build-statistics:2.3.10
org.jetbrains.kotlin:kotlin-build-tools-api:2.3.10
org.jetbrains.kotlin:kotlin-compiler-runner:2.3.10
org.jetbrains.kotlin:kotlin-daemon-client:2.3.10
org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.3.10
org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.3.10
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.3.10
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.3.10
org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10
org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.3.10
org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.3.10
org.jetbrains.kotlin:kotlin-native-utils:2.3.10
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-serialization:2.3.10
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.3.10
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.10
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.kotlin:kotlin-tooling-core:2.3.10
org.jetbrains.kotlin:kotlin-util-io:2.3.10
org.jetbrains.kotlin:kotlin-util-klib-metadata:2.3.10
org.jetbrains.kotlin:kotlin-util-klib:2.3.10
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
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ androidx-tracing = "1.2.0"
androidx-transition = "1.5.1"
androidx-viewbinding = "8.1.2"

burst = "2.5.0"
burst = "2.11.0"

detekt = "1.19.0"
dokka = "2.0.0"
Expand All @@ -47,7 +47,7 @@ filekit-dialogs-compose = "0.10.0-beta03"

google-accompanist = "0.18.0"
google-dagger = "2.40.5"
google-ksp = "2.1.21-2.0.2"
google-ksp = "2.3.5"
google-material = "1.4.0"

groovy = "3.0.9"
Expand All @@ -59,7 +59,7 @@ 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.1.21"
kotlin = "2.3.10"

kotlinx-binary-compatibility = "0.18.1"
kotlinx-coroutines = "1.9.0"
Expand Down
Loading
Loading