AGP 9 + Kotlin 2.3

build.dep.compose.gradle

@@ -1,5 +1,3 @@
-apply plugin: 'kotlin-android'
-
 android {
     buildFeatures {
         compose = true

build.gradle

@@ -14,7 +14,6 @@ buildscript {
 plugins { // sets class paths only (because of 'apply false')
     alias libs.plugins.androidApplication apply false
     alias libs.plugins.androidLibrary apply false
-    alias libs.plugins.jetbrainsKotlinAndroid apply false
     alias libs.plugins.kotlinSerialization apply false
     alias libs.plugins.googleServices apply false
     alias libs.plugins.firebaseCrashlyticsPlugin apply false

build.module.feature-and-app.gradle

@@ -1,5 +1,3 @@
-apply plugin: 'kotlin-android'
-
 apply from: "$rootDir/build.config.jvm.gradle"
 apply from: "$rootDir/build.dep.di.gradle"
 apply from: "$rootDir/build.dep.compose.gradle"

build.module.library.gradle

@@ -1,5 +1,3 @@
-apply plugin: 'kotlin-android'
-
 apply from: "$rootDir/build.config.jvm.gradle"
 apply from: "$rootDir/build.dep.di.gradle"
 

gradle.properties

@@ -4,6 +4,7 @@
 # any settings specified in this file.
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
+
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
@@ -15,9 +16,28 @@ org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
+
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
+
+# AGP 9.x enables compile-time R class for app modules by default; keeping false preserves existing build behavior.
+#android.enableAppCompileTimeRClass=false
+
+# Enables improved dependency version constraint resolution introduced in AGP 9.x.
+android.dependency.useConstraints=true
+
+# AGP 9.x enables R8 strict full mode by default; keeping false avoids failures from non-conforming third-party keep rules.
+android.r8.strictFullModeForKeepRules=false
+
+# android.dependency.excludeLibraryComponentsFromConstraints is DEPRECATED and will be removed in AGP 10.0.0
+# omitting it however, would cause AGP 9.x to output a warning
+# to supress that warning, we set android.generateSyncIssueWhenLibraryConstraintsAreEnabled to false
+android.generateSyncIssueWhenLibraryConstraintsAreEnabled=false
+
+# Project uses Groovy DSL; enabling the new DSL would break existing build scripts.
+android.newDsl=false

gradle/gradle-daemon-jvm.properties

@@ -0,0 +1,12 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec393a8d1f984107f9ae6ce8f45a661f/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/2e70db4a6fa54a1270e3a3d74da52fcc/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec393a8d1f984107f9ae6ce8f45a661f/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/2e70db4a6fa54a1270e3a3d74da52fcc/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/b30866b18394d55c95dc662594302c0a/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/88dd3a3df8e2336eb284d6b9b6b98d9c/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec393a8d1f984107f9ae6ce8f45a661f/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/2e70db4a6fa54a1270e3a3d74da52fcc/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/1c2ee0010b0528b7376f108f13ea45c3/redirect
+toolchainVendor=AMAZON
+toolchainVersion=21

gradle/libs.versions.toml

@@ -1,9 +1,8 @@
 [versions]
 jvmTarget = "21"
 kermit = "2.0.8"
-kotlin = "2.2.20"
-# should match kotlin https://github.com/google/ksp/releases
-gradlePlugin = "8.11.2"
+kotlin = "2.3.20"
+gradlePlugin = "9.1.0"
 googleServices = "4.4.4"
 crashlyticsPlugin = "3.0.6"
 firebaseBOM = "34.4.0"
@@ -59,7 +58,6 @@ plugin-licensee = { module = "app.cash.licensee:licensee-gradle-plugin", version
 androidApplication = { id = "com.android.application", version.ref = "gradlePlugin" }
 androidLibrary = { id = "com.android.library", version.ref = "gradlePlugin" }
 kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 googleServices = { id = "com.google.gms.google-services", version.ref = "googleServices" }
 firebaseCrashlyticsPlugin = { id = "com.google.firebase.crashlytics", version.ref = "crashlyticsPlugin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Jan 26 10:33:34 CET 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -5,6 +5,9 @@ pluginManagement {
         gradlePluginPortal()
     }
 }
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
+}
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {