Skip to content

Commit f49e673

Browse files
authored
Merge pull request #2023 from liutikas/upgradekgpksp
Upgrade to KGP 2.3.0 and KSP 2.3.4
2 parents 8a08302 + 0cc1d9e commit f49e673

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2727
import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
2828
import org.jetbrains.kotlin.gradle.dsl.KotlinBaseExtension
2929
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
30+
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
3031

3132
/**
3233
* Configure base Kotlin with Android options
@@ -85,6 +86,9 @@ private inline fun <reified T : KotlinBaseExtension> Project.configureKotlin() =
8586
is KotlinJvmProjectExtension -> compilerOptions
8687
else -> TODO("Unsupported project extension $this ${T::class}")
8788
}.apply {
89+
// TODO: move remove languageVersion and coreLibrariesVersion after upgrading to AGP 9.0
90+
languageVersion.set(KotlinVersion.KOTLIN_2_2)
91+
coreLibrariesVersion = "2.2.21"
8892
jvmTarget = JvmTarget.JVM_11
8993
allWarningsAsErrors = warningsAsErrors
9094
freeCompilerArgs.add(

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ hilt = "2.57.2"
4646
hiltExt = "1.2.0"
4747
jacoco = "0.8.12"
4848
junit4 = "4.13.2"
49-
kotlin = "2.2.21"
49+
kotlin = "2.3.0"
5050
kotlinxCoroutines = "1.10.1"
5151
kotlinxDatetime = "0.6.1"
5252
kotlinxSerializationJson = "1.8.0"
53-
ksp = "2.3.1"
53+
ksp = "2.3.4"
5454
okhttp = "4.12.0"
5555
protobuf = "4.29.2"
5656
protobufPlugin = "0.9.5"

0 commit comments

Comments
 (0)