Skip to content

[Infra] Upgrade the Kotlin compiler to 2.3.21 #8596

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
rlazo merged 6 commits into from
Sep 15, 2026
Merged

[Infra] Upgrade the Kotlin compiler to 2.3.21 #8596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4fa97bf
[Infra] Upgrade the Kotlin compiler to 2.3.21
rlazo Sep 11, 2026
d36220d
Merge branch 'main' into rl/bump_compiler
rlazo Sep 11, 2026
736f7ec
Address feedback
rlazo Sep 11, 2026
5c85b00
Remove genc SDK since it depends on a deprecated annoations processor
rlazo Sep 14, 2026
4c7d643
Address issues with encoders
rlazo Sep 14, 2026
5cd3999
Fix format
rlazo Sep 15, 2026
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
2 changes: 1 addition & 1 deletion ai-logic/firebase-ai-ksp-processor/test-app/test-app.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("com.google.devtools.ksp") version "2.1.21-2.0.2"
id("com.google.devtools.ksp") version "2.3.6"
}

android {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {
alias(libs.plugins.protobuf) apply false
alias(libs.plugins.errorprone)
alias(libs.plugins.crashlytics) apply false
id("org.jetbrains.kotlin.android") version "2.1.21" apply false
id("org.jetbrains.kotlin.android") version "2.3.21" apply false
id("PublishingPlugin")
id("test-report")
id("firebase-ci")
Expand Down
7 changes: 7 additions & 0 deletions encoders/protoc-gen-firebase-encoders/protoc-gen-firebase-encoders.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ plugins {
id "kotlin-kapt"
}

kotlin {
coreLibrariesVersion = "2.1.21"
compilerOptions {
languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_1
}
}

protobuf {
protoc {
artifact = libs.protoc.get().toString()
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ rxjava = "2.2.21"
serialization = "1.7.3"
slf4j = "2.0.17"
spotless = "7.0.4"
symbolProcessingApi = "2.2.10-2.0.2"
symbolProcessingApi = "2.3.6"
testServices = "1.6.0"
truth = "1.4.5"
truthProtoExtension = "1.0"
Expand Down
8 changes: 8 additions & 0 deletions plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import org.gradle.kotlin.dsl.create
import org.gradle.kotlin.dsl.getByType
import org.gradle.kotlin.dsl.register
import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

/**
Expand Down Expand Up @@ -54,6 +56,12 @@ class FirebaseJavaLibraryPlugin : BaseFirebaseLibraryPlugin() {
// reduce the likelihood of kotlin module files colliding.
project.tasks.withType<KotlinCompile> {
kotlinOptions.freeCompilerArgs = listOf("-module-name", kotlinModuleName(project))
kotlinOptions.languageVersion = KotlinVersion.KOTLIN_2_1.version
}

project.plugins.withId("org.jetbrains.kotlin.jvm") {
project.extensions.findByType(KotlinProjectExtension::class.java)?.coreLibrariesVersion =
"2.1.21"
}
}

Expand Down
Loading