Add: Support for Android Gradle Plugin 9.0.0 [WIP]

Rolf-Smit · Rolf-Smit · commit 10fd56313b14 · 2026-02-06T12:13:23.000+01:00
diff --git a/README.md b/README.md
@@ -173,7 +173,7 @@ for specific modules:
       // Since 1.7 (experimental): The name of the Gradle Managed device to run instrumented tests on.
       // This is only used if `runOnGradleManagedDevices` is set to true. If not given tests will be
       // run on all available Gradle Managed Devices
-      gradleManagedDeviceName = "nexusoneapi30"
+      gradleManagedDeviceName = "smallphoneapi32"
    }
    ```
 </details>
@@ -219,7 +219,7 @@ for specific modules:
       // Since 1.7 (experimental): The name of the Gradle Managed device to run instrumented tests on.
       // This is only used if `runOnGradleManagedDevices` is set to true. If not given tests will be
       // run on all available Gradle Managed Devices
-      gradleManagedDeviceName "nexusoneapi30"
+      gradleManagedDeviceName "smallphoneapi32"
    }
    ```
 </details>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 androidMinSdk       = "21"
-androidTargetSdk    = "35"
+androidTargetSdk    = "36"
 androidCompileSdk   = "36"
 kotlin              = "2.2.0"
 androidGradlePlugin = "8.11.1"
@@ -19,7 +19,7 @@ espressoCore        = { module = "androidx.test.espresso:espresso-core",
 androidJUnit        = { module = "androidx.test.ext:junit",                                  version = "1.2.1" }
 commonsCsv          = { module = "org.apache.commons:commons-csv",                           version = "1.14.0" }
 kotlinTest          = { module = "org.jetbrains.kotlin:kotlin-test",                         version.ref = "kotlin" }
-robolectric         = { module = "org.robolectric:robolectric",                              version = "4.15.1" }
+robolectric         = { module = "org.robolectric:robolectric",                              version = "4.16.1" }
 mockk               = { module = "io.mockk:mockk",                                           version = "1.14.5" }
 jacksonYaml         = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version = "2.19.2"}
 jacksonKotlin       = { module = "com.fasterxml.jackson.module:jackson-module-kotlin",       version = "2.19.2"}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -102,7 +102,7 @@ pluginManager.withPlugin("jacoco") {
     // Extracts the JaCoCo runtime jar from the configured JaCoCo Agent
     def extractJacocoRuntimeTask = tasks.register("extractJacocoTestKitRuntime", Copy) {
         from {
-            zipTree(project.configurations.getByName(JacocoPlugin.AGENT_CONFIGURATION_NAME).asPath).matching { include 'jacocoagent.jar' }.singleFile
+            zipTree(project.configurations.named(JacocoPlugin.AGENT_CONFIGURATION_NAME).map {it.asPath }).matching { include 'jacocoagent.jar' }.singleFile
         }
         into project.layout.buildDirectory.dir("testkit")
     }
@@ -118,12 +118,12 @@ pluginManager.withPlugin("jacoco") {
         it.group = "reporting"
         it.description = "Generates testkit-gradle.properties file which can be read and added to a TestKit build as gradle.properties"
         it.dependsOn(extractJacocoRuntimeTask)
-        it.outputFile = new File(buildDir, "testkit/${javaTestTask.name}/gradle.properties")
-        it.property("org.gradle.jvmargs", "\"-javaagent:${buildDir}/testkit/jacocoagent.jar=destfile=${destinationFileProvider.get()}\"")
+        it.destinationFile.set(project.layout.buildDirectory.file("testkit/${javaTestTask.name}/gradle.properties"))
+        it.property("org.gradle.jvmargs", "\"-javaagent:${project.layout.buildDirectory.get()}/testkit/jacocoagent.jar=destfile=${destinationFileProvider.get()}\"")
     }
 
     // Make the generated gradle.properties file available on the test classpath as resource
-    dependencies.add(JavaPlugin.TEST_RUNTIME_ONLY_CONFIGURATION_NAME, files(new File(buildDir, "testkit/${javaTestTask.name}")))
+    dependencies.add(JavaPlugin.TEST_RUNTIME_ONLY_CONFIGURATION_NAME, files(project.layout.buildDirectory.file("testkit/${javaTestTask.name}")))
 
     // "Fixes": https://github.com/gradle/gradle/issues/16603
     def jacocoTestReport = tasks.named("jacocoTestReport")
diff --git a/plugin/src/test/kotlin/org/neotech/plugin/rootcoverage/IntegrationTest.kt b/plugin/src/test/kotlin/org/neotech/plugin/rootcoverage/IntegrationTest.kt
@@ -53,10 +53,10 @@ class IntegrationTest(
                     """
                     managedDevices {
                         devices {
-                            nexusoneapi30 (com.android.build.api.dsl.ManagedVirtualDevice) {
-                                device = "Nexus One"
-                                apiLevel = 30
-                                systemImageSource = "aosp-atd"
+                            smallphoneapi32 (com.android.build.api.dsl.ManagedVirtualDevice) {
+                                device = "Small Phone"
+                                apiLevel = 32
+                                systemImageSource = "aosp"
                             }
                         }
                     }
@@ -99,7 +99,7 @@ class IntegrationTest(
             if (!runOnGradleManagedDevices) {
                 executeGradleTasks(listOf("clean", "connectedDebugAndroidTest", "connectedDemoDebugAndroidTest"))
             } else {
-                executeGradleTasks(listOf("clean", "nexusoneapi30DebugAndroidTest", "nexusoneapi30DemoDebugAndroidTest"))
+                executeGradleTasks(listOf("clean", "smallphoneapi32DebugAndroidTest", "smallphoneapi32DemoDebugAndroidTest"))
             }
 
             listOf("coverageReport", "rootCodeCoverageReport", "--stacktrace")
@@ -232,7 +232,7 @@ class IntegrationTest(
 
             val fixture = File("src/test/test-fixtures/multi-module")
 
-            val gradleVersions = arrayOf("8.13", "8.14.3")
+            val gradleVersions = arrayOf("9.1.0", "9.2.1", "9.3.1")
 
             val configurations = File(fixture, "configurations").listFiles() ?: error("Configurations folder not found in $fixture")
             return configurations.flatMap { configuration ->
diff --git a/plugin/src/test/test-fixtures/multi-module/app/build.gradle.tmp b/plugin/src/test/test-fixtures/multi-module/app/build.gradle.tmp
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id "com.android.application"
     alias(libs.plugins.kotlinAndroid)
@@ -53,9 +55,11 @@ android {
 
         {{managedDevices}}
     }
+}
 
-    kotlinOptions {
-        jvmTarget = "21"
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_21)
     }
 }
 
diff --git a/plugin/src/test/test-fixtures/multi-module/configurations/gradle-managed-device-clear-package-data.yaml b/plugin/src/test/test-fixtures/multi-module/configurations/gradle-managed-device-clear-package-data.yaml
@@ -30,4 +30,4 @@ pluginConfiguration:
     - name: runOnGradleManagedDevices
       value: true
     - name: gradleManagedDeviceName
-      value: nexusoneapi30
+      value: smallphoneapi32
diff --git a/plugin/src/test/test-fixtures/multi-module/configurations/gradle-managed-device-dont-execute-android-tests.yaml b/plugin/src/test/test-fixtures/multi-module/configurations/gradle-managed-device-dont-execute-android-tests.yaml
@@ -30,4 +30,4 @@ pluginConfiguration:
     - name: runOnGradleManagedDevices
       value: true
     - name: gradleManagedDeviceName
-      value: nexusoneapi30
+      value: smallphoneapi32
diff --git a/plugin/src/test/test-fixtures/multi-module/configurations/gradle-managed-device.yaml b/plugin/src/test/test-fixtures/multi-module/configurations/gradle-managed-device.yaml
@@ -28,4 +28,4 @@ pluginConfiguration:
     - name: runOnGradleManagedDevices
       value: true
     - name: gradleManagedDeviceName
-      value: nexusoneapi30
+      value: smallphoneapi32
diff --git a/plugin/src/test/test-fixtures/multi-module/library_android/build.gradle b/plugin/src/test/test-fixtures/multi-module/library_android/build.gradle
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id "com.android.library"
     alias(libs.plugins.kotlinAndroid)
@@ -40,17 +42,19 @@ android {
     testOptions {
         managedDevices {
             devices {
-                nexusoneapi30 (com.android.build.api.dsl.ManagedVirtualDevice) {
-                    device = "Nexus One"
-                    apiLevel = 30
-                    systemImageSource = "aosp-atd"
+                smallphoneapi32 (com.android.build.api.dsl.ManagedVirtualDevice) {
+                    device = "Small Phone"
+                    apiLevel = 32
+                    systemImageSource = "aosp"
                 }
             }
         }
     }
+}
 
-    kotlinOptions {
-        jvmTarget = "21"
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_21)
     }
 }
 
diff --git a/plugin/src/test/test-fixtures/multi-module/library_android_flavors/build.gradle b/plugin/src/test/test-fixtures/multi-module/library_android_flavors/build.gradle
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id "com.android.library"
     alias(libs.plugins.kotlinAndroid)
@@ -50,17 +52,19 @@ android {
     testOptions {
         managedDevices {
             devices {
-                nexusoneapi30 (com.android.build.api.dsl.ManagedVirtualDevice) {
-                    device = "Nexus One"
-                    apiLevel = 30
-                    systemImageSource = "aosp-atd"
+                smallphoneapi32 (com.android.build.api.dsl.ManagedVirtualDevice) {
+                    device = "Small Phone"
+                    apiLevel = 32
+                    systemImageSource = "aosp"
                 }
             }
         }
     }
+}
 
-    kotlinOptions {
-        jvmTarget = "21"
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_21)
     }
 }
 
diff --git a/plugin/src/test/test-fixtures/multi-module/library_java/build.gradle b/plugin/src/test/test-fixtures/multi-module/library_java/build.gradle
@@ -6,5 +6,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
 
-sourceCompatibility = JavaVersion.VERSION_21
-targetCompatibility = JavaVersion.VERSION_21
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
diff --git a/plugin/src/test/test-fixtures/multi-module/library_nested/java/build.gradle b/plugin/src/test/test-fixtures/multi-module/library_nested/java/build.gradle
@@ -6,5 +6,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
 
-sourceCompatibility = JavaVersion.VERSION_21
-targetCompatibility = JavaVersion.VERSION_21
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+import org.jetbrains.kotlin.gradle.dsl.JvmTarget`
	`2`	`+`
`1`	`3`	`plugins {`
`2`	`4`	`id "com.android.application"`
`3`	`5`	`alias(libs.plugins.kotlinAndroid)`
`@@ -53,9 +55,11 @@ android {`
`53`	`55`
`54`	`56`	`{{managedDevices}}`
`55`	`57`	`}`
	`58`	`+}`
`56`	`59`
`57`		`- kotlinOptions {`
`58`		`- jvmTarget = "21"`
	`60`	`+kotlin {`
	`61`	`+ compilerOptions {`
	`62`	`+ jvmTarget.set(JvmTarget.JVM_21)`
`59`	`63`	`}`
`60`	`64`	`}`
`61`	`65`