Bump to AGP 9.0

build.gradle

@@ -1,7 +1,6 @@
 plugins {
   alias(libs.plugins.android.library) apply false
   alias(libs.plugins.kotlin.jvm) apply false
-  alias(libs.plugins.kotlin.android) apply false
   alias(libs.plugins.publish)
   alias(libs.plugins.spotless)
   alias(libs.plugins.wire) apply false

buildLogic/convention/src/main/kotlin/app/cash/better/dynamic/features/Convention.kt

@@ -46,7 +46,7 @@ class Convention : Plugin<Project> {
   }
 
   private companion object {
-    const val TOOLCHAIN_JDK = 17
-    const val TARGET_JDK = 11
+    const val TOOLCHAIN_JDK = 21
+    const val TARGET_JDK = 21
   }
 }

gradle-plugin/build.gradle

@@ -1,4 +1,4 @@
-import com.google.devtools.ksp.gradle.KspTaskJvm
+import com.google.devtools.ksp.gradle.KspAATask
 import com.squareup.wire.gradle.WireTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
@@ -72,15 +72,15 @@ val KOTLIN_VERSION = "${libs.versions.kotlin.get()}"
 }
 
 tasks.withType(KotlinCompile).configureEach { dependsOn(pluginVersion) }
-tasks.withType(KspTaskJvm).configureEach { dependsOn(pluginVersion) }
+tasks.withType(KspAATask).configureEach { dependsOn(pluginVersion) }
 
 wire {
   kotlin {}
 }
 
 // https://github.com/square/wire/issues/2335
 afterEvaluate {
-  tasks.withType(KspTaskJvm).configureEach {
-    dependsOn(tasks.withType(WireTask))
-  }
+    tasks.withType(KspAATask).configureEach {
+        dependsOn(tasks.withType(WireTask))
+    }
 }

gradle-plugin/src/main/kotlin/app/cash/better/dynamic/features/BetterDynamicFeaturesPlugin.kt

@@ -35,8 +35,7 @@ import com.android.build.api.variant.Variant
 import com.android.build.gradle.internal.publishing.AndroidArtifacts
 import com.android.build.gradle.internal.res.LinkApplicationAndroidResourcesTask
 import com.android.build.gradle.internal.tasks.factory.dependsOn
-import com.google.devtools.ksp.gradle.KspTask
-import com.google.devtools.ksp.gradle.KspTaskJvm
+import com.google.devtools.ksp.gradle.KspAATask
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.ArtifactCollection
@@ -374,7 +373,7 @@ class BetterDynamicFeaturesPlugin : Plugin<Project> {
           artifact.type = ARTIFACT_TYPE_FEATURE_IMPLEMENTATION_REPORT
 
           // TODO: Try and do this lazily
-          tasks.withType(KspTaskJvm::class.java) { task ->
+          tasks.withType(KspAATask::class.java) { task ->
             if (!kspTaskMatchesVariant(task, androidVariant)) return@withType
 
             logger.debug("Configuring KSP task ${task.path} for variant ${androidVariant.name}")
@@ -468,6 +467,7 @@ class BetterDynamicFeaturesPlugin : Plugin<Project> {
         taskName("compile", androidVariant, "Implementations"),
         TypesafeImplementationsCompilationTask::class.java,
       ) { task ->
+        task.dependsOn(implementationsTask)
         task.generatedSources.set(implementationsTask.flatMap { it.generatedFilesDirectory })
         val compileConfiguration = setupVariantCodegenDependencies(androidVariant.buildType!!)
         task.compileClasspath.setFrom(project.provider { compileConfiguration.files })
@@ -485,7 +485,7 @@ class BetterDynamicFeaturesPlugin : Plugin<Project> {
     }
   }
 
-  private fun kspTaskMatchesVariant(task: KspTask, variant: Variant): Boolean {
+  private fun kspTaskMatchesVariant(task: KspAATask, variant: Variant): Boolean {
     return task.name.contains(variant.name, ignoreCase = true) && !task.name.contains("UnitTest", ignoreCase = true)
   }
 

gradle-plugin/src/test/fixtures/buildscript.gradle

@@ -12,18 +12,16 @@ project.buildscript.dependencies {
 }
 
 subprojects {
-  extensions.findByName("kotlin")?.jvmToolchain(17)
-
   pluginManager.withPlugin("com.android.application") {
     android.compileOptions {
-      sourceCompatibility(JavaVersion.VERSION_17)
-      targetCompatibility(JavaVersion.VERSION_17)
+      sourceCompatibility(JavaVersion.VERSION_21)
+      targetCompatibility(JavaVersion.VERSION_21)
     }
   }
   pluginManager.withPlugin("com.android.dynamic-feature") {
     android.compileOptions {
-      sourceCompatibility(JavaVersion.VERSION_17)
-      targetCompatibility(JavaVersion.VERSION_17)
+      sourceCompatibility(JavaVersion.VERSION_21)
+      targetCompatibility(JavaVersion.VERSION_21)
     }
   }
 }

gradle-plugin/src/test/fixtures/codegen-fixture/base/build.gradle

@@ -1,12 +1,11 @@
 apply plugin: 'com.android.application'
-apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'app.cash.better.dynamic.features'
 
 android {
   namespace "app.cash.better.dynamic.features.integration"
 
-  compileSdk 32
+  compileSdk libs.versions.compileSdk.get() as int
 
   defaultConfig {
     versionCode 1

gradle-plugin/src/test/fixtures/codegen-fixture/feature/build.gradle

@@ -1,12 +1,11 @@
 apply plugin: 'com.android.dynamic-feature'
-apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'app.cash.better.dynamic.features'
 
 android {
   namespace "app.cash.better.dynamic.features.integration.feature"
 
-  compileSdk 32
+  compileSdk libs.versions.compileSdk.get() as int
 
   defaultConfig {
     minSdk 24

gradle-plugin/src/test/fixtures/custom-build-type/base/build.gradle

@@ -1,12 +1,11 @@
 apply plugin: 'com.android.application'
-apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'app.cash.better.dynamic.features'
 
 android {
   namespace "app.cash.better.dynamic.features.integration"
 
-  compileSdk 32
+  compileSdk libs.versions.compileSdk.get() as int
   defaultConfig {
     minSdk = 24
 

gradle-plugin/src/test/fixtures/custom-build-type/feature/build.gradle

@@ -1,12 +1,11 @@
 apply plugin: 'com.android.dynamic-feature'
-apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'app.cash.better.dynamic.features'
 
 android {
   namespace "app.cash.better.dynamic.features.integration.feature"
 
-  compileSdk 32
+  compileSdk libs.versions.compileSdk.get() as int
   defaultConfig {
     minSdk = 24
   }

gradle-plugin/src/test/fixtures/custom-lockfile/base/build.gradle

@@ -1,12 +1,11 @@
 apply plugin: 'com.android.application'
-apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'app.cash.better.dynamic.features'
 
 android {
   namespace "app.cash.better.dynamic.features.integration"
 
-  compileSdk 32
+  compileSdk libs.versions.compileSdk.get() as int
 
   dynamicFeatures = [':feature']
 }

gradle-plugin/src/test/fixtures/custom-lockfile/feature/build.gradle

@@ -1,12 +1,11 @@
 apply plugin: 'com.android.dynamic-feature'
-apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'app.cash.better.dynamic.features'
 
 android {
   namespace "app.cash.better.dynamic.features.integration.feature"
 
-  compileSdk 32
+  compileSdk libs.versions.compileSdk.get() as int
 }
 
 dependencies {

gradle-plugin/src/test/fixtures/different-versions-in-base/base/build.gradle

@@ -1,12 +1,11 @@
 apply plugin: 'com.android.application'
-apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'app.cash.better.dynamic.features'
 
 android {
   namespace "app.cash.better.dynamic.features.integration"
 
-  compileSdk 32
+  compileSdk libs.versions.compileSdk.get() as int
 
   dynamicFeatures = [':feature']
 }

gradle-plugin/src/test/fixtures/different-versions-in-base/feature/build.gradle

@@ -1,12 +1,11 @@
 apply plugin: 'com.android.dynamic-feature'
-apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'app.cash.better.dynamic.features'
 
 android {
   namespace "app.cash.better.dynamic.features.integration.feature"
 
-  compileSdk 32
+  compileSdk libs.versions.compileSdk.get() as int
 }
 
 dependencies {

gradle-plugin/src/test/fixtures/different-versions/base/build.gradle

@@ -1,11 +1,10 @@
 apply plugin: 'com.android.application'
-apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'app.cash.better.dynamic.features'
 
 android {
   namespace "app.cash.better.dynamic.features.integration"
 
-  compileSdk 32
+  compileSdk libs.versions.compileSdk.get() as int
 
   dynamicFeatures = [':feature']
 }

gradle-plugin/src/test/fixtures/different-versions/feature/build.gradle

@@ -1,11 +1,10 @@
 apply plugin: 'com.android.dynamic-feature'
-apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'app.cash.better.dynamic.features'
 
 android {
   namespace "app.cash.better.dynamic.features.integration.feature"
 
-  compileSdk 32
+  compileSdk libs.versions.compileSdk.get() as int
 }
 
 dependencies {

gradle-plugin/src/test/fixtures/feature-compile-classpath/base/build.gradle

@@ -1,12 +1,11 @@
 apply plugin: 'com.android.application'
-apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'app.cash.better.dynamic.features'
 
 android {
   namespace "app.cash.better.dynamic.features.integration"
 
-  compileSdk 32
+  compileSdk libs.versions.compileSdk.get() as int
 
   dynamicFeatures = [':feature']
 }

gradle-plugin/src/test/fixtures/feature-compile-classpath/feature/build.gradle

@@ -1,12 +1,11 @@
 apply plugin: 'com.android.dynamic-feature'
-apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'app.cash.better.dynamic.features'
 
 android {
   namespace "app.cash.better.dynamic.features.integration.feature"
 
-  compileSdk 32
+  compileSdk libs.versions.compileSdk.get() as int
 }
 
 dependencies {

gradle-plugin/src/test/fixtures/has-constraints/base/build.gradle

@@ -1,12 +1,11 @@
 apply plugin: 'com.android.application'
-apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'app.cash.better.dynamic.features'
 
 android {
   namespace "app.cash.better.dynamic.features.integration"
 
-  compileSdk 32
+  compileSdk libs.versions.compileSdk.get() as int
 
   dynamicFeatures = [':feature']
 }

gradle-plugin/src/test/fixtures/has-constraints/feature/build.gradle

@@ -1,12 +1,11 @@
 apply plugin: 'com.android.dynamic-feature'
-apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'app.cash.better.dynamic.features'
 
 android {
   namespace "app.cash.better.dynamic.features.integration.feature"
 
-  compileSdk 32
+  compileSdk libs.versions.compileSdk.get() as int
 }
 
 dependencies {

gradle-plugin/src/test/fixtures/lockfile-activation/base/build.gradle

@@ -1,12 +1,11 @@
 apply plugin: 'com.android.application'
-apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'app.cash.better.dynamic.features'
 
 android {
   namespace "app.cash.better.dynamic.features.integration"
 
-  compileSdk 32
+  compileSdk libs.versions.compileSdk.get() as int
 
   dynamicFeatures = [':feature']
 }

gradle-plugin/src/test/fixtures/lockfile-activation/feature/build.gradle

@@ -1,12 +1,11 @@
 apply plugin: 'com.android.dynamic-feature'
-apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'app.cash.better.dynamic.features'
 
 android {
   namespace "app.cash.better.dynamic.features.integration.feature"
 
-  compileSdk 32
+  compileSdk libs.versions.compileSdk.get() as int
 }
 
 dependencies {

gradle-plugin/src/test/fixtures/missing-dex/base/build.gradle

@@ -1,13 +1,12 @@
 apply plugin: 'com.android.application'
-apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'app.cash.better.dynamic.features'
 apply plugin: 'app.cash.better.dynamic.features.agp-patch'
 
 android {
   namespace "app.cash.better.dynamic.features.integration"
 
-  compileSdk 32
+  compileSdk libs.versions.compileSdk.get() as int
   defaultConfig {
     minSdk = 24
 

gradle-plugin/src/test/fixtures/missing-dex/base/gradle.lockfile

@@ -25,10 +25,10 @@ com.google.android.play:feature-delivery-ktx:2.1.0=debugCompileClasspath,debugRu
 com.google.android.play:feature-delivery:2.1.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
 com.squareup.okhttp3:okhttp:5.0.0-alpha.2=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
 com.squareup.okio:okio:2.9.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-common:2.1.20=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-common:2.2.20=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:2.1.20=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.2.20=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=debugCompileClasspath,debugRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath

gradle-plugin/src/test/fixtures/missing-dex/feature/build.gradle

@@ -1,12 +1,11 @@
 apply plugin: 'com.android.dynamic-feature'
-apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'app.cash.better.dynamic.features'
 
 android {
   namespace "app.cash.better.dynamic.features.integration.feature"
 
-  compileSdk 32
+  compileSdk libs.versions.compileSdk.get() as int
   defaultConfig {
     minSdk = 24
   }

gradle-plugin/src/test/fixtures/multiplatform-dependency/base/build.gradle

@@ -1,12 +1,11 @@
 apply plugin: 'com.android.application'
-apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'app.cash.better.dynamic.features'
 
 android {
   namespace "app.cash.better.dynamic.features.integration"
 
-  compileSdk 32
+  compileSdk libs.versions.compileSdk.get() as int
 
   dynamicFeatures = [':feature']
 }

gradle-plugin/src/test/fixtures/multiplatform-dependency/feature/build.gradle

@@ -1,12 +1,11 @@
 apply plugin: 'com.android.dynamic-feature'
-apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'app.cash.better.dynamic.features'
 
 android {
   namespace "app.cash.better.dynamic.features.integration.feature"
 
-  compileSdk 32
+  compileSdk libs.versions.compileSdk.get() as int
 }
 
 dependencies {