From 0cc1d9ebf67e632320e3fa5f32981394649c0669 Mon Sep 17 00:00:00 2001
From: Aurimas Liutikas <aurimas@google.com>
Date: Thu, 18 Dec 2025 09:36:13 -0800
Subject: [PATCH] Upgrade to KGP 2.3.0 and KSP 2.3.4

Leave language version as 2.2 because AGP 8.x does
not yet support 2.3 in R8

Test: ./gradlew test
---
 .../com/google/samples/apps/nowinandroid/KotlinAndroid.kt     | 4 ++++
 gradle/libs.versions.toml                                     | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
index 81f26e9db..588ab88f3 100644
--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinBaseExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 /**
  * Configure base Kotlin with Android options
@@ -85,6 +86,9 @@ private inline fun <reified T : KotlinBaseExtension> Project.configureKotlin() =
         is KotlinJvmProjectExtension -> compilerOptions
         else -> TODO("Unsupported project extension $this ${T::class}")
     }.apply {
+        // TODO: move remove languageVersion and coreLibrariesVersion after upgrading to AGP 9.0
+        languageVersion.set(KotlinVersion.KOTLIN_2_2)
+        coreLibrariesVersion = "2.2.21"
         jvmTarget = JvmTarget.JVM_11
         allWarningsAsErrors = warningsAsErrors
         freeCompilerArgs.add(
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 729f9b480..b4bbd187e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -46,11 +46,11 @@ hilt = "2.57.2"
 hiltExt = "1.2.0"
 jacoco = "0.8.12"
 junit4 = "4.13.2"
-kotlin = "2.2.21"
+kotlin = "2.3.0"
 kotlinxCoroutines = "1.10.1"
 kotlinxDatetime = "0.6.1"
 kotlinxSerializationJson = "1.8.0"
-ksp = "2.3.1"
+ksp = "2.3.4"
 okhttp = "4.12.0"
 protobuf = "4.29.2"
 protobufPlugin = "0.9.5"