build: drop the AGP 9 built-in Kotlin opt-out

baselineprofile/build.gradle.kts

@@ -2,7 +2,6 @@
 
 plugins {
     alias(libs.plugins.android.test)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.baselineprofile)
 }
 

build-logic/convention/src/main/kotlin/com/revenuecat/purchases/android/buildlogic/convention/ConfigureAndroidApplication.kt

@@ -1,6 +1,6 @@
 package com.revenuecat.purchases.android.buildlogic.convention
 
-import com.android.build.gradle.BaseExtension
+import com.android.build.api.dsl.ApplicationExtension
 import com.revenuecat.purchases.android.buildlogic.ktx.getVersion
 import com.revenuecat.purchases.android.buildlogic.ktx.versionCatalog
 import org.gradle.api.JavaVersion
@@ -14,8 +14,8 @@ internal fun Project.configureAndroidApplication() {
     val minSdkVersion = libs.getVersion("android-minSdk").toInt()
     val targetSdkVersion = libs.getVersion("android-targetSdk").toInt()
 
-    extensions.configure<BaseExtension> {
-        compileSdkVersion(compileSdkVersion)
+    extensions.configure<ApplicationExtension> {
+        compileSdk = compileSdkVersion
 
         defaultConfig {
             minSdk = minSdkVersion

build-logic/convention/src/main/kotlin/com/revenuecat/purchases/android/buildlogic/convention/ConfigureAndroidLibrary.kt

@@ -1,8 +1,8 @@
 package com.revenuecat.purchases.android.buildlogic.convention
 
+import com.android.build.api.dsl.LibraryExtension
 import com.android.build.api.variant.HasUnitTestBuilder
 import com.android.build.api.variant.LibraryAndroidComponentsExtension
-import com.android.build.gradle.LibraryExtension
 import com.revenuecat.purchases.android.buildlogic.ktx.getVersion
 import com.revenuecat.purchases.android.buildlogic.ktx.versionCatalog
 import org.gradle.api.JavaVersion

build-logic/convention/src/main/kotlin/com/revenuecat/purchases/android/buildlogic/ktx/VersionCatalog.kt

@@ -26,7 +26,6 @@ internal val VersionCatalog.plugins: PluginAccessor
 
 internal class PluginAccessor(private val catalog: VersionCatalog) {
     val android: PluginGroup get() = PluginGroup(catalog, "android")
-    val kotlin: PluginGroup get() = PluginGroup(catalog, "kotlin")
     val kover: Provider<PluginDependency> get() = catalog.findPlugin("kover").get()
     val dokka: Provider<PluginDependency> get() = catalog.findPlugin("dokka").get()
     val mavenPublish: Provider<PluginDependency> get() = catalog.findPlugin("mavenPublish").get()
@@ -37,5 +36,4 @@ internal class PluginAccessor(private val catalog: VersionCatalog) {
 internal class PluginGroup(private val catalog: VersionCatalog, private val prefix: String) {
     val library: Provider<PluginDependency> get() = catalog.findPlugin("$prefix.library").get()
     val application: Provider<PluginDependency> get() = catalog.findPlugin("$prefix.application").get()
-    val android: Provider<PluginDependency> get() = catalog.findPlugin("$prefix.android").get()
 }

build-logic/convention/src/main/kotlin/com/revenuecat/purchases/android/buildlogic/plugin/AndroidApplicationConventionPlugin.kt

@@ -15,7 +15,6 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) = with(target) {
         with(pluginManager) {
             apply(libs.plugins.android.application.get().pluginId)
-            apply(libs.plugins.kotlin.android.get().pluginId)
         }
         configureAndroidApplication()
     }

build-logic/convention/src/main/kotlin/com/revenuecat/purchases/android/buildlogic/plugin/ApiTesterApplicationConventionPlugin.kt

@@ -16,7 +16,6 @@ class ApiTesterApplicationConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) = with(target) {
         with(pluginManager) {
             apply(libs.plugins.android.application.get().pluginId)
-            apply(libs.plugins.kotlin.android.get().pluginId)
         }
 
         configureAndroidApplication()

build-logic/convention/src/main/kotlin/com/revenuecat/purchases/android/buildlogic/plugin/PublicLibraryConventionPlugin.kt

@@ -19,7 +19,6 @@ class PublicLibraryConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) = with(target) {
         with(pluginManager) {
             apply(libs.plugins.android.library.get().pluginId)
-            apply(libs.plugins.kotlin.android.get().pluginId)
             apply(libs.plugins.kover.get().pluginId)
             apply(libs.plugins.baselineprofile.get().pluginId)
         }

build.gradle.kts

@@ -4,7 +4,6 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.compose.compiler) apply false
-    alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.jvm) apply false
     alias(libs.plugins.kover) apply false
     alias(libs.plugins.emerge) apply false

examples/CustomEntitlementComputationSample/app/build.gradle.kts

@@ -3,7 +3,6 @@ import java.util.Properties
 
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.compose.compiler)
 }
 

examples/CustomEntitlementComputationSample/build.gradle.kts

@@ -1,6 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     alias(libs.plugins.android.application).apply(false)
-    alias(libs.plugins.kotlin.android).apply(false)
     alias(libs.plugins.compose.compiler).apply(false)
 }

examples/CustomEntitlementComputationSample/gradle.properties

@@ -21,8 +21,3 @@ kotlin.code.style=official
 # 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
-
-# Built-in Kotlin rejects the kotlin-android plugin, and that plugin casts the android extension
-# to BaseExtension, which the new DSL drops. Both flags go away in AGP 10.
-android.builtInKotlin=false
-android.newDsl=false

examples/CustomEntitlementComputationSample/gradle/libs.versions.toml

@@ -6,7 +6,6 @@ androidxCore = "1.10.1"
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 
 [libraries]

examples/MagicWeatherCompose/app/build.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.compose.compiler)
 }
 

examples/MagicWeatherCompose/build.gradle.kts

@@ -1,6 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     alias(libs.plugins.android.application).apply(false)
-    alias(libs.plugins.kotlin.android).apply(false)
     alias(libs.plugins.compose.compiler).apply(false)
 }

examples/MagicWeatherCompose/gradle.properties

@@ -21,8 +21,3 @@ kotlin.code.style=official
 # 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
-
-# Built-in Kotlin rejects the kotlin-android plugin, and that plugin casts the android extension
-# to BaseExtension, which the new DSL drops. Both flags go away in AGP 10.
-android.builtInKotlin=false
-android.newDsl=false

examples/MagicWeatherCompose/gradle/libs.versions.toml

@@ -8,7 +8,6 @@ androidxCore = "1.10.1"
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 
 [libraries]

examples/rcttester/build.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.compose.compiler)
     alias(libs.plugins.kotlin.serialization)
 }

examples/web-purchase-redemption-sample/build.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.compose.compiler)
 }
 

feature/galaxy/build.gradle.kts

@@ -21,5 +21,5 @@ dependencies {
 
     implementation(libs.samsung.iap)
     testImplementation(libs.bundles.test)
-    testImplementation(libs.kotlin.test)
+    testImplementation(libs.kotlin.test.junit)
 }

gradle.properties

@@ -58,7 +58,3 @@ org.gradle.jvmargs=-Xmx4096M -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8
 
 # Enable the Gradle build cache (local task-output cache) for the main build.
 org.gradle.caching=true
-
-# backwards compatibility flags for AGP9, to be enabled in a future PR
-android.builtInKotlin=false
-android.newDsl=false

gradle/libs.versions.toml

@@ -13,7 +13,7 @@ amazon = "3.0.5"
 androidxCardView = "1.0.0"
 androidxConstraintLayout = "2.1.3"
 androidxCore = "1.8.0"
-androidxNavigation = "2.5.3"
+androidxNavigation = "2.9.8"
 annotation = "1.3.0"
 annotationExperimental = "1.5.1"
 appcompat = "1.4.1"
@@ -161,6 +161,7 @@ google-mobile-ads = { module = "com.google.android.gms:play-services-ads", versi
 hamcrest-core = { module = "org.hamcrest:hamcrest-core", version.ref = "hamcrest" }
 
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
+kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJSON" }
 
 material = { module = "com.google.android.material:material", version.ref = "material" }
@@ -194,7 +195,6 @@ dependencyGraph = { id = "com.savvasdalkitsis.module-dependency-graph", version.
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 dokka = { id ="org.jetbrains.dokka", version.ref = "dokka"}
 emerge = { id = "com.emergetools.android", version.ref = "emergeGradlePlugin" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

purchases/build.gradle.kts

@@ -251,14 +251,11 @@ fun DokkaSourceSetSpec.configureDocumentedSourceSet() {
 
 dokka {
     dokkaSourceSets {
-        named("customEntitlementComputation") {
+        // AGP registers variant source sets after this block runs, so they can only be reached lazily.
+        matching { it.name.startsWith("customEntitlementComputation") }.configureEach {
             suppress.set(true)
         }
-        named("defaults") {
-            dependentSourceSets.addLater(dokkaSourceSets.named("main").flatMap { it.sourceSetId })
-            configureDocumentedSourceSet()
-        }
-        named("main") {
+        matching { it.name == "defaultsRelease" }.configureEach {
             configureDocumentedSourceSet()
             sourceLink {
                 localDirectory.set(file("src/main/kotlin"))

test-apps/e2etests/build.gradle.kts

@@ -2,7 +2,6 @@ import java.util.Properties
 
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.compose.compiler)
 }
 

test-apps/testpurchasesandroidcompatibility/build.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {

test-apps/testpurchasesuiandroidcompatibility/build.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.emerge)
     alias(libs.plugins.compose.compiler)
 }

ui/debugview/api.txt

@@ -11,11 +11,3 @@ package com.revenuecat.purchases.ui.debugview {
 
 }
 
-package com.revenuecat.purchases.ui.debugview.models {
-
-  public final class InternalDebugRevenueCatScreenViewModelFactory extends androidx.lifecycle.ViewModelProvider.NewInstanceFactory {
-    ctor public InternalDebugRevenueCatScreenViewModelFactory(kotlin.jvm.functions.Function1<? super com.revenuecat.purchases.models.StoreTransaction,kotlin.Unit> onPurchaseCompleted, kotlin.jvm.functions.Function1<? super com.revenuecat.purchases.PurchasesTransactionException,kotlin.Unit> onPurchaseErrored);
-  }
-
-}
-

ui/revenuecatui/build.gradle.kts

@@ -142,10 +142,8 @@ dependencies {
 
 dokka {
     dokkaSourceSets {
-        named("defaults") {
-            dependentSourceSets.addLater(dokkaSourceSets.named("main").flatMap { it.sourceSetId })
-        }
-        named("main") {
+        // AGP registers variant source sets after this block runs, so they can only be reached lazily.
+        matching { it.name == "defaultsRelease" }.configureEach {
             reportUndocumented.set(true)
             skipDeprecated.set(true)