Fix AGP type InternalBaseVariant from leaking in the Anvil plugin, drop AGP 7.2.0 from CI test runs

Author: JoelWilcox

.github/workflows/ci.yml

@@ -173,7 +173,7 @@ jobs:
       fail-fast: false
       matrix:
         kotlin-version: [ 2.2.20 ]
-        agp-version: [ 7.2.0, 7.3.1 ]
+        agp-version: [ 7.3.1 ]
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

gradle-plugin/src/gradleTest/java/com/squareup/anvil/plugin/IncrementalTest.kt

@@ -753,7 +753,7 @@ class IncrementalTest : BaseGradleTest() {
 
       // now we have constructor parameters
       rootAnvilMainGenerated.injectClassFactory shouldExistWithTextContaining """
-        public class InjectClass_Factory(
+        public class InjectClass_Factory private constructor(
           private val name: Provider<String>,
         ) : Factory<InjectClass>
       """.trimIndent()
@@ -1338,7 +1338,7 @@ class IncrementalTest : BaseGradleTest() {
         .resolve("com/squareup/test/lib/AssistedClass_Factory_Impl.kt")
 
       assistedClassFactoryImpl shouldExistWithTextContaining """
-        public class AssistedClass_Factory_Impl(
+        public class AssistedClass_Factory_Impl private constructor(
           private val delegateFactory: AssistedClass_Factory,
         ) : AssistedClass.Factory {
           override fun create(arg1: String): AssistedClass = delegateFactory.get(arg1)
@@ -1357,7 +1357,7 @@ class IncrementalTest : BaseGradleTest() {
       }
 
       assistedClassFactoryImpl shouldExistWithTextContaining """
-        public class AssistedClass_Factory_Impl(
+        public class AssistedClass_Factory_Impl private constructor(
           private val delegateFactory: AssistedClass_Factory,
         ) : AssistedClass.Factory {
           override fun create(arg1: String, arg2: String): AssistedClass = delegateFactory.get(arg1, arg2)

gradle-plugin/src/main/java/com/squareup/anvil/plugin/AnvilPlugin.kt

@@ -8,6 +8,7 @@ import com.android.build.gradle.BaseExtension
 import com.android.build.gradle.LibraryExtension
 import com.android.build.gradle.TestExtension
 import com.android.build.gradle.TestedExtension
+import com.android.build.gradle.internal.core.InternalBaseVariant
 import org.gradle.api.Action
 import org.gradle.api.GradleException
 import org.gradle.api.Project
@@ -85,7 +86,7 @@ internal open class AnvilPlugin : KotlinCompilerPluginSupportPlugin {
     }
   }
 
-  @Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
+  @Suppress("TYPEALIAS_EXPANSION_DEPRECATION", "ObjectLiteralToLambda")
   private fun extendAndroidConfigurations(
     target: Project,
     commonConfiguration: Configuration,
@@ -131,14 +132,18 @@ internal open class AnvilPlugin : KotlinCompilerPluginSupportPlugin {
           // Essentially, an `Action<BaseVariant>` is okay but `(BaseVariant) -> Unit` is not.
           // If any types from AGP are in a signature,
           // then `AnvilPlugin` can only be applied to projects with AGP in their build classpath.
-          variants.configureEach { variant ->
-            val configuration = getConfiguration(target, buildType = variant.name)
-            when (variant) {
-              is UnitTestVariantDeprecated -> configuration.extendsFrom(testConfiguration)
-              is TestVariantDeprecated -> configuration.extendsFrom(androidTestVariant)
-              else -> configuration.extendsFrom(commonConfiguration)
-            }
-          }
+          variants.configureEach(
+            object : Action<InternalBaseVariant> {
+              override fun execute(variant: InternalBaseVariant) {
+                val configuration = getConfiguration(target, buildType = variant.name)
+                when (variant) {
+                  is UnitTestVariantDeprecated -> configuration.extendsFrom(testConfiguration)
+                  is TestVariantDeprecated -> configuration.extendsFrom(androidTestVariant)
+                  else -> configuration.extendsFrom(commonConfiguration)
+                }
+              }
+            },
+          )
         }
       }
     }