Merge pull request #192 from liutikas/agp9.0.0

Upgrade to Android Gradle Plugin 9.0.0

Author: liutikas

benchmark/build.gradle.kts

@@ -34,7 +34,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
  */
 plugins {
     alias(libs.plugins.android.test)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.baselineprofile)
 }
 

build-plugin/src/main/kotlin/com/android/developers/androidify/plugin/AndroidApplicationPlugin.kt

@@ -14,7 +14,6 @@ class AndroidApplicationPlugin : Plugin<Project> {
     override fun apply(project: Project) {
         with(project) {
             apply(plugin = "com.android.application")
-            apply(plugin = "org.jetbrains.kotlin.android")
             apply(plugin = "org.jetbrains.kotlin.plugin.compose")
 
             extensions.configure<ApplicationExtension> {

build-plugin/src/main/kotlin/com/android/developers/androidify/plugin/AndroidLibraryPlugin.kt

@@ -14,7 +14,6 @@ class AndroidLibraryPlugin : Plugin<Project> {
     override fun apply(project: Project) {
         with(project) {
             apply(plugin = "com.android.library")
-            apply(plugin = "org.jetbrains.kotlin.android")
 
             extensions.configure<LibraryExtension> {
                 compileOptions {

feature/creation/build.gradle.kts

@@ -63,7 +63,7 @@ dependencies {
     testImplementation(libs.hilt.android.testing)
     testImplementation(libs.robolectric)
     testImplementation(projects.core.testing)
-    testImplementation(kotlin("test"))
+    testImplementation(libs.kotlin.test)
 
     // Android Instrumented Tests
     androidTestImplementation(platform(libs.androidx.compose.bom))

gradle.properties

@@ -25,4 +25,4 @@ kotlin.code.style=official
 android.nonTransitiveRClass=true
 android.disableMinifyLocalDependenciesForLibraries=true
 org.gradle.configuration-cache=true
-android.experimental.enableScreenshotTest=false
+android.experimental.enableScreenshotTest=false

gradle/libs.versions.toml

@@ -3,7 +3,7 @@
 appVersionCode = "10"
 appVersionName = "1.3.0"
 appVersionWearOffset = "60000000"
-agp = "8.13.1"
+agp = "9.0.0"
 bcpkixJdk18on = "1.83"
 core = "1.7.0"
 extensionsXr = "1.1.0"
@@ -16,7 +16,7 @@ activityCompose = "1.12.1"
 adaptive = "1.2.0"
 apksig = "9.0.0-alpha06"
 appcompat = "1.7.1"
-baselineprofile = "1.4.1"
+baselineprofile = "1.5.0-alpha01"
 benchmarkMacroJunit4 = "1.4.1"
 camerax = "1.5.2"
 coilCompose = "3.3.0"
@@ -33,23 +33,23 @@ firebaseBom = "34.4.0"
 genaiPrompt = "1.0.0-alpha1"
 googleServices = "4.4.4"
 googleOss = "17.3.0"
-googleOssPlugin = "0.10.9"
+googleOssPlugin = "0.10.10"
 guava = "33.5.0-android"
-hiltAndroid = "2.57.2"
+hiltAndroid = "2.59"
 hiltLifecycleViewmodel = "1.0.0-alpha03"
 hiltNavigationCompose = "1.3.0"
 horologist = "0.7.15"
 junit = "4.13.2"
 junitVersion = "1.3.0"
-kotlin = "2.2.21"
-ksp = "2.2.20-2.0.3"
+kotlin = "2.3.0"
+ksp = "2.3.4"
 kotlinxCoroutines = "1.10.2"
-kotlinxSerialization = "2.2.21"
+kotlinxSerialization = "2.3.0"
 kotlinxSerializationJson = "1.9.0"
 kotlinxSerializationProtobuf = "1.9.0"
 ktlint = "1.5.0"
 lifecycleRuntimeKtx = "2.10.0"
-lifecycleViewmodelNavigation3 = "1.0.0-alpha04"
+lifecycleViewmodelNavigation3 = "2.10.0"
 loggingInterceptor = "5.3.2"
 material3 = "1.5.0-alpha10"
 media3 = "1.8.0"
@@ -150,6 +150,7 @@ hilt-android-testing = { group = "com.google.dagger", name = "hilt-android-testi
 hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "hiltAndroid" }
 horologist-compose-layout = { module = "com.google.android.horologist:horologist-compose-layout", version.ref = "horologist" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
+kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin"}
 kotlinx-coroutines-play-services = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-play-services", version.ref = "kotlinxCoroutines"}
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
-#Thu Apr 03 08:56:48 BST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists