Kotlin 2.3 & AGP 8.11.2, 8.12.3, 8.13.2, 9.0 RC1, 9.1 Alpha 1

Author: mannodermaus

build-logic/src/main/kotlin/Dependencies.kt

@@ -2,7 +2,7 @@
 
 object libs {
     object versions {
-        const val kotlin = "2.1.21"
+        const val kotlin = "2.3.0"
         const val junitJupiter = "5.14.0"
         const val junitVintage = "5.14.0"
         const val junitPlatform = "1.14.0"

build-logic/src/main/kotlin/Environment.kt

@@ -18,10 +18,11 @@ enum class SupportedAgp(
     AGP_8_8("8.8.2", gradle = "8.10.2"),
     AGP_8_9("8.9.3", gradle = "8.11.1"),
     AGP_8_10("8.10.1", gradle = "8.11.1"),
-    AGP_8_11("8.11.1", gradle = "8.13"),
-    AGP_8_12("8.12.2", gradle = "8.13"),
-    AGP_8_13("8.13.0", gradle = "8.13"),
-    AGP_9_0("9.0.0-alpha04", gradle = "9.0.0"),
+    AGP_8_11("8.11.2", gradle = "8.13"),
+    AGP_8_12("8.12.3", gradle = "8.13"),
+    AGP_8_13("8.13.2", gradle = "8.13"),
+    AGP_9_0("9.0.0-rc01", gradle = "9.1.0"),
+    AGP_9_1("9.1.0-alpha01", gradle = "9.1.0"),
     ;
 
     companion object {

instrumentation/compose/build.gradle.kts

@@ -1,5 +1,6 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
   id("com.android.library")
@@ -33,10 +34,6 @@ android {
     targetCompatibility = javaVersion
   }
 
-  kotlinOptions {
-    jvmTarget = javaVersion.toString()
-  }
-
   testOptions {
     unitTests.isReturnDefaultValues = true
     targetSdk = Android.targetSdkVersion
@@ -52,6 +49,12 @@ android {
   }
 }
 
+kotlin {
+  compilerOptions {
+    jvmTarget = JvmTarget.fromTarget(javaVersion.toString())
+  }
+}
+
 junitPlatform {
   // Using local dependency instead of Maven coordinates
   instrumentationTests.enabled = false

instrumentation/sample/build.gradle.kts

@@ -1,4 +1,5 @@
 import org.gradle.api.tasks.testing.logging.TestLogEvent
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
   id("com.android.application")
@@ -48,9 +49,11 @@ android {
     sourceCompatibility = javaVersion
     targetCompatibility = javaVersion
   }
+}
 
-  kotlinOptions {
-    jvmTarget = javaVersion.toString()
+kotlin {
+  compilerOptions {
+    jvmTarget = JvmTarget.fromTarget(javaVersion.toString())
   }
 }