Gradle 9.3, AGP 9.0

syslogic · syslogic · commit 9d35ca87a78f · 2026-01-30T21:47:49.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,11 +4,10 @@ plugins {
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.androidx.navigation.safeargs) apply false
     alias(libs.plugins.kotlin.compose.compiler) apply false
-    alias(libs.plugins.kotlin.android) apply false
-    alias(libs.plugins.kotlin.kapt) apply false
+    alias(libs.plugins.builtin.kotlin) apply false
+    alias(libs.plugins.legacy.kapt) apply false
 }
 
 tasks.register<Delete>("clean") {
-    delete(rootProject.fileTree("build"))
-    delete(project.fileTree("build"))
+    delete(rootProject.file("build"), project.file("build"))
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,23 +1,31 @@
 [versions]
+#noinspection UnusedVersionCatalogEntry
 app_version_code          = "32"
+#noinspection UnusedVersionCatalogEntry
 app_version_name          = "1.3.2"
-android_build_tools       = "36.0.0"
+#noinspection UnusedVersionCatalogEntry
+android_build_tools       = "36.1.0"
+#noinspection UnusedVersionCatalogEntry
 android_compile_sdk       = "36"
+#noinspection UnusedVersionCatalogEntry
 android_target_sdk        = "36"
+#noinspection UnusedVersionCatalogEntry
 android_min_sdk           = "23"
 
 # Gradle Plugins
-kotlin                    = "2.2.21"
+kotlin                    = "2.3.0"
 junit                     = "4.13.2"
-android_gradle_plugin     = "8.13.1"
+android_gradle_plugin     = "9.0.0"
 material_design           = "1.13.0"
 
-androidx_compose_bom      = "2025.12.00"
-androidx_compose_uitest   = "1.10.0"
+androidx_compose_bom      = "2026.01.01"
+androidx_compose_uitest   = "1.10.2"
+androidx_customview_poolingcontainer = "1.1.0"
+
 androidx_core             = "1.17.0"
 androidx_appcompat        = "1.7.1"
 androidx_preference       = "1.2.1"
-androidx_navigation       = "2.9.6"
+androidx_navigation       = "2.9.7"
 androidx_navigation3      = "1.0.0"
 
 androidx_test_ext_junit   = "1.3.0"
@@ -33,8 +41,8 @@ androidx_navigation_safeargs          = { id = "androidx.navigation.safeargs", v
 android_application                   = { id = "com.android.application", version.ref = "android_gradle_plugin" }
 android_library                       = { id = "com.android.library", version.ref = "android_gradle_plugin" }
 kotlin_compose_compiler               = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
-kotlin_android                        = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-kotlin_kapt                           = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
+builtin_kotlin                        = { id = "com.android.built-in-kotlin", version.ref = "android_gradle_plugin" }
+legacy_kapt                           = { id = "com.android.legacy-kapt", version.ref = "android_gradle_plugin" }
 
 [libraries]
 kotlin_stdlib                         = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
@@ -51,7 +59,7 @@ androidx_compose_activity             = { module = "androidx.activity:activity-c
 androidx_compose_runtime              = { module = "androidx.compose.runtime:runtime" }
 androidx_compose_ui_tooling           = { module = "androidx.compose.ui:ui-tooling" }
 androidx_compose_uitest_manifest      = { module = "androidx.compose.ui:ui-test-manifest" }
-androidx_customview_poolingcontainer  = { module = "androidx.customview:customview-poolingcontainer" }
+androidx_customview_poolingcontainer  = { module = "androidx.customview:customview-poolingcontainer", version.ref = "androidx_customview_poolingcontainer"  }
 androidx_compose_material_icons_core  = { module = "androidx.compose.material:material-icons-core" }
 # androidx_compose_material_icons_ext = { module = "androidx.compose.material:material-icons-extended" }
 androidx_preference_ktx               = { module = "androidx.preference:preference-ktx", version.ref = "androidx_preference" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
@@ -3,9 +3,9 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 // Module :library
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose.compiler)
-    alias(libs.plugins.kotlin.kapt)
+    alias(libs.plugins.builtin.kotlin)
+    alias(libs.plugins.legacy.kapt)
     id("maven-publish")
 }
 
@@ -14,6 +14,7 @@ base {
 }
 
 kotlin {
+    jvmToolchain(17)
     compilerOptions {
         jvmTarget.set(JvmTarget.JVM_17)
     }
@@ -32,9 +33,7 @@ android {
 
     sourceSets {
         getByName("main") {
-            java {
-                srcDir("src/main/java")
-            }
+            java.directories.add("src/main/java")
         }
     }
 
@@ -118,18 +117,15 @@ val javadoc by tasks.registering(Javadoc::class) {
     source = android.sourceSets.getByName("main").java.getSourceFiles()
     configurations["implementation"].isCanBeResolved = true
 
-    classpath = files(File("${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"))
-    android.bootClasspath.forEach { classpath += fileTree(it) }
-    classpath += fileTree(project.file("build/tmp/aarsToJars/").absolutePath)
-    classpath += configurations.implementation.get() as FileCollection
+    // classpath = files(File("${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"))
+    // android.bootClasspath.forEach { classpath += fileTree(it) }
+    // classpath += fileTree(project.file("build/tmp/aarsToJars/").absolutePath)
+    // classpath += configurations.implementation.get() as FileCollection
     isFailOnError = false
 
     options.verbose()
     (options as StandardJavadocDocletOptions).links("https://docs.oracle.com/en/java/javase/17/docs/api/")
-    (options as StandardJavadocDocletOptions).linksOffline(
-        "https://developer.android.com/reference",
-        "${android.sdkDirectory}/docs/reference"
-    )
+    // (options as StandardJavadocDocletOptions).linksOffline("https://developer.android.com/reference", "${android.sdkDirectory}/docs/reference")
     (options as StandardJavadocDocletOptions).linkSource(true)
     (options as StandardJavadocDocletOptions).author(true)
 
diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts
@@ -5,20 +5,27 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.androidx.navigation.safeargs)
     alias(libs.plugins.kotlin.compose.compiler)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kotlin.kapt)
+    alias(libs.plugins.builtin.kotlin)
+    alias(libs.plugins.legacy.kapt)
 }
 
 base {
     archivesName = "colorpicker_demo_${libs.versions.app.version.name.get()}"
 }
 
 kotlin {
+    jvmToolchain(17)
     compilerOptions {
         jvmTarget.set(JvmTarget.JVM_17)
     }
 }
 
+composeCompiler {
+    reportsDestination = layout.buildDirectory.dir("compose_compiler")
+    // stabilityConfigurationFile = rootProject.layout.projectDirectory.file("stability_config.conf")
+    // enableStrongSkippingMode = true
+}
+
 android {
     namespace = "io.syslogic.demo.colorpicker"
     buildToolsVersion = libs.versions.android.build.tools.get()
@@ -34,12 +41,6 @@ android {
         testBuildType = "debug"
     }
 
-    composeCompiler {
-        reportsDestination = layout.buildDirectory.dir("compose_compiler")
-        // stabilityConfigurationFile = rootProject.layout.projectDirectory.file("stability_config.conf")
-        // enableStrongSkippingMode = true
-    }
-
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
@@ -62,9 +63,7 @@ android {
 
     sourceSets {
         getByName("main") {
-            java {
-                srcDir("src/main/java")
-            }
+            java.directories.add("src/main/java")
         }
     }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -13,18 +13,10 @@ pluginManagement {
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
     repositories {
-        google {
-            content {
-                includeGroupByRegex("androidx.*")
-                includeGroupByRegex("com\\.(android|google).*")
-                excludeGroupByRegex("org\\.jetbrains.*")
-            }
-        }
+        google()
         mavenCentral()
+        maven(uri("https://jitpack.io"))
         mavenLocal()
-        maven {
-            url = uri("https://jitpack.io")
-        }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,10 @@ plugins {`
`4`	`4`	`alias(libs.plugins.android.library) apply false`
`5`	`5`	`alias(libs.plugins.androidx.navigation.safeargs) apply false`
`6`	`6`	`alias(libs.plugins.kotlin.compose.compiler) apply false`
`7`		`- alias(libs.plugins.kotlin.android) apply false`
`8`		`- alias(libs.plugins.kotlin.kapt) apply false`
	`7`	`+ alias(libs.plugins.builtin.kotlin) apply false`
	`8`	`+ alias(libs.plugins.legacy.kapt) apply false`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`tasks.register<Delete>("clean") {`
`12`		`- delete(rootProject.fileTree("build"))`
`13`		`- delete(project.fileTree("build"))`
	`12`	`+ delete(rootProject.file("build"), project.file("build"))`
`14`	`13`	`}`