test: fix a number of Android functional tests failing on earlier versions of AGP.

autonomousapps · autonomousapps · commit c2cad36afedf · 2026-05-19T18:31:45.000-07:00
There are more to go.
diff --git a/src/functionalTest/groovy/com/autonomousapps/android/AdviceSpec.groovy b/src/functionalTest/groovy/com/autonomousapps/android/AdviceSpec.groovy
@@ -93,7 +93,6 @@ final class AdviceSpec extends AbstractAndroidSpec {
 
     where:
     [gradleVersion, agpVersion] << gradleAgpMatrix()
-//    [gradleVersion, agpVersion] << [[GradleVersion.version('8.11.1'), '8.10.1']]
   }
 
   def "can filter incorrect configuration dependencies (#gradleVersion AGP #agpVersion)"() {
diff --git a/src/functionalTest/groovy/com/autonomousapps/android/projects/AndroidAssetMutationProject.groovy b/src/functionalTest/groovy/com/autonomousapps/android/projects/AndroidAssetMutationProject.groovy
@@ -5,6 +5,7 @@ package com.autonomousapps.android.projects
 import com.autonomousapps.kit.GradleProject
 import com.autonomousapps.kit.Source
 import com.autonomousapps.kit.gradle.dependencies.Plugins
+import com.autonomousapps.kit.gradle.kotlin.Kotlin
 import com.autonomousapps.model.Advice
 import com.autonomousapps.model.ProjectAdvice
 
@@ -42,6 +43,7 @@ final class AndroidAssetMutationProject extends AbstractAndroidProject {
         lib.withBuildScript { bs ->
           bs.plugins(androidLib())
           bs.android = defaultAndroidLibBlock(true, 'com.example.lib')
+          bs.kotlin = Kotlin.DEFAULT
           bs.dependencies(
             implementation(':assets'),
             commonsCollections('implementation'),
diff --git a/src/functionalTest/groovy/com/autonomousapps/android/projects/AndroidFileMutationProject.groovy b/src/functionalTest/groovy/com/autonomousapps/android/projects/AndroidFileMutationProject.groovy
@@ -6,6 +6,7 @@ import com.autonomousapps.kit.GradleProject
 import com.autonomousapps.kit.Source
 import com.autonomousapps.kit.android.AndroidManifest
 import com.autonomousapps.kit.gradle.dependencies.Plugins
+import com.autonomousapps.kit.gradle.kotlin.Kotlin
 import com.autonomousapps.model.Advice
 import com.autonomousapps.model.ProjectAdvice
 
@@ -71,6 +72,7 @@ final class AndroidFileMutationProject extends AbstractAndroidProject {
         l.withBuildScript { bs ->
           bs.plugins(androidLib())
           bs.android = defaultAndroidLibBlock()
+          bs.kotlin = Kotlin.DEFAULT
           bs.dependencies = [
             commonsCollections('implementation'),
             constraintLayout('api'),
diff --git a/src/functionalTest/groovy/com/autonomousapps/android/projects/AndroidKotlinInlineProject.groovy b/src/functionalTest/groovy/com/autonomousapps/android/projects/AndroidKotlinInlineProject.groovy
@@ -7,6 +7,7 @@ import com.autonomousapps.kit.Source
 import com.autonomousapps.kit.SourceType
 import com.autonomousapps.kit.android.AndroidManifest
 import com.autonomousapps.kit.gradle.dependencies.Plugins
+import com.autonomousapps.kit.gradle.kotlin.Kotlin
 import com.autonomousapps.model.ProjectAdvice
 
 import static com.autonomousapps.AdviceHelper.actualProjectAdvice
@@ -33,6 +34,7 @@ final class AndroidKotlinInlineProject extends AbstractAndroidProject {
         l.withBuildScript { bs ->
           bs.plugins(androidLib())
           bs.android = defaultAndroidLibBlock()
+          bs.kotlin = Kotlin.DEFAULT
           bs.dependencies = [
             coreKtx('implementation'),
             core('implementation'),
diff --git a/src/functionalTest/groovy/com/autonomousapps/android/projects/AndroidResMutationProject.groovy b/src/functionalTest/groovy/com/autonomousapps/android/projects/AndroidResMutationProject.groovy
@@ -7,6 +7,7 @@ import com.autonomousapps.kit.Source
 import com.autonomousapps.kit.android.AndroidLayout
 import com.autonomousapps.kit.android.AndroidStringRes
 import com.autonomousapps.kit.gradle.dependencies.Plugins
+import com.autonomousapps.kit.gradle.kotlin.Kotlin
 import com.autonomousapps.model.Advice
 import com.autonomousapps.model.ProjectAdvice
 
@@ -73,6 +74,7 @@ final class AndroidResMutationProject extends AbstractAndroidProject {
         lib.withBuildScript { bs ->
           bs.plugins(androidLib())
           bs.android = defaultAndroidLibBlock(true, 'com.example.lib')
+          bs.kotlin = Kotlin.DEFAULT
           bs.dependencies(
             implementation(':res'),
             commonsCollections('implementation'),
diff --git a/src/functionalTest/groovy/com/autonomousapps/android/projects/AndroidTestSourceProject.groovy b/src/functionalTest/groovy/com/autonomousapps/android/projects/AndroidTestSourceProject.groovy
@@ -10,6 +10,7 @@ import com.autonomousapps.kit.android.AndroidManifest
 import com.autonomousapps.kit.android.AndroidStyleRes
 import com.autonomousapps.kit.gradle.Dependency
 import com.autonomousapps.kit.gradle.Plugin
+import com.autonomousapps.kit.gradle.kotlin.Kotlin
 import com.autonomousapps.model.Advice
 import com.autonomousapps.model.ProjectAdvice
 
@@ -42,20 +43,22 @@ final class AndroidTestSourceProject extends AbstractAndroidProject {
         subproject.sources = appSources()
         subproject.styles = AndroidStyleRes.DEFAULT
         subproject.colors = AndroidColorRes.DEFAULT
-        subproject.withBuildScript { buildScript ->
-          buildScript.plugins = appPlugins()
-          buildScript.android = defaultAndroidAppBlock()
-          buildScript.dependencies(appDependencies())
+        subproject.withBuildScript { bs ->
+          bs.plugins = appPlugins()
+          bs.android = defaultAndroidAppBlock()
+          bs.kotlin = Kotlin.DEFAULT
+          bs.dependencies(appDependencies())
         }
       }
     // TODO(tsr): use withAndroidLibProject() instead
       .withAndroidSubproject('lib') { subproject ->
         subproject.sources = androidLibSources
         subproject.manifest = null
-        subproject.withBuildScript { buildScript ->
-          buildScript.plugins(androidLib())
-          buildScript.android = defaultAndroidLibBlock(true, 'my.android.lib')
-          buildScript.dependencies(junit('implementation'))
+        subproject.withBuildScript { bs ->
+          bs.plugins(androidLib())
+          bs.android = defaultAndroidLibBlock(true, 'my.android.lib')
+          bs.kotlin = Kotlin.DEFAULT
+          bs.dependencies(junit('implementation'))
         }
       }
       .write()
diff --git a/src/functionalTest/groovy/com/autonomousapps/android/projects/AndroidToJvmInlineProject.groovy b/src/functionalTest/groovy/com/autonomousapps/android/projects/AndroidToJvmInlineProject.groovy
@@ -6,6 +6,7 @@ import com.autonomousapps.kit.GradleProject
 import com.autonomousapps.kit.Source
 import com.autonomousapps.kit.gradle.JvmToolchain
 import com.autonomousapps.kit.gradle.dependencies.Plugins
+import com.autonomousapps.kit.gradle.kotlin.Kotlin
 import com.autonomousapps.model.ProjectAdvice
 
 import static com.autonomousapps.AdviceHelper.actualProjectAdvice
@@ -30,6 +31,7 @@ final class AndroidToJvmInlineProject extends AbstractAndroidProject {
         l.withBuildScript { bs ->
           bs.plugins = androidLib(true)
           bs.android = defaultAndroidLibBlock(true, 'com.example.consumer')
+          bs.kotlin = Kotlin.DEFAULT
           bs.dependencies = [
             project('implementation', ':producer')
           ]
diff --git a/src/functionalTest/groovy/com/autonomousapps/android/projects/AutoValueProjectUsedByKapt.groovy b/src/functionalTest/groovy/com/autonomousapps/android/projects/AutoValueProjectUsedByKapt.groovy
@@ -5,6 +5,7 @@ package com.autonomousapps.android.projects
 import com.autonomousapps.kit.GradleProject
 import com.autonomousapps.kit.Source
 import com.autonomousapps.kit.android.AndroidManifest
+import com.autonomousapps.kit.gradle.kotlin.Kotlin
 import com.autonomousapps.model.Advice
 import com.autonomousapps.model.PluginAdvice
 import com.autonomousapps.model.ProjectAdvice
@@ -48,6 +49,7 @@ final class AutoValueProjectUsedByKapt extends AbstractAndroidProject {
         app.withBuildScript { bs ->
           bs.plugins(androidApp() + kapt())
           bs.android = defaultAndroidAppBlock()
+          bs.kotlin = Kotlin.DEFAULT
           bs.dependencies(kotlinStdLib('implementation'))
           if (spec != Spec.NO_KAPT_DECLARATIONS) {
             bs.dependencies += KAPT
diff --git a/src/functionalTest/groovy/com/autonomousapps/android/projects/DaggerKaptProject.groovy b/src/functionalTest/groovy/com/autonomousapps/android/projects/DaggerKaptProject.groovy
@@ -5,6 +5,7 @@ package com.autonomousapps.android.projects
 import com.autonomousapps.kit.GradleProject
 import com.autonomousapps.kit.Source
 import com.autonomousapps.kit.android.AndroidManifest
+import com.autonomousapps.kit.gradle.kotlin.Kotlin
 import com.autonomousapps.model.Advice
 import com.autonomousapps.model.PluginAdvice
 import com.autonomousapps.model.ProjectAdvice
@@ -49,6 +50,7 @@ final class DaggerKaptProject extends AbstractAndroidProject {
         app.withBuildScript { bs ->
           bs.plugins(androidApp() + kapt())
           bs.android = defaultAndroidAppBlock()
+          bs.kotlin = Kotlin.DEFAULT
           bs.dependencies(
             kotlinStdLib('implementation'),
           )
diff --git a/src/functionalTest/groovy/com/autonomousapps/android/projects/DataBindingUsagesExclusionsProject.groovy b/src/functionalTest/groovy/com/autonomousapps/android/projects/DataBindingUsagesExclusionsProject.groovy
@@ -9,6 +9,7 @@ import com.autonomousapps.kit.android.AndroidManifest
 import com.autonomousapps.kit.gradle.Dependency
 import com.autonomousapps.kit.gradle.Plugin
 import com.autonomousapps.kit.gradle.dependencies.Plugins
+import com.autonomousapps.kit.gradle.kotlin.Kotlin
 import com.autonomousapps.model.Advice
 import com.autonomousapps.model.ProjectAdvice
 
@@ -51,6 +52,7 @@ final class DataBindingUsagesExclusionsProject extends AbstractAndroidProject {
         app.withBuildScript { bs ->
           bs.plugins(androidApp())
           bs.android = defaultAndroidAppBlock(true, 'com.example.app')
+          bs.kotlin = Kotlin.DEFAULT
           bs.dependencies(appDependencies)
           bs.withGroovy('android.buildFeatures.dataBinding true')
         }
@@ -61,6 +63,7 @@ final class DataBindingUsagesExclusionsProject extends AbstractAndroidProject {
         lib.withBuildScript { bs ->
           bs.plugins(androidLib() + kapt())
           bs.android = defaultAndroidLibBlock(true, 'com.example.lib')
+          bs.kotlin = Kotlin.DEFAULT
           bs.withGroovy('android.buildFeatures.dataBinding true')
         }
         lib.sources = libSources
diff --git a/src/functionalTest/groovy/com/autonomousapps/android/projects/KaptProject.groovy b/src/functionalTest/groovy/com/autonomousapps/android/projects/KaptProject.groovy
@@ -7,6 +7,7 @@ import com.autonomousapps.kit.Source
 import com.autonomousapps.kit.SourceType
 import com.autonomousapps.kit.gradle.Dependency
 import com.autonomousapps.kit.gradle.dependencies.Plugins
+import com.autonomousapps.kit.gradle.kotlin.Kotlin
 
 import static com.autonomousapps.kit.gradle.dependencies.Dependencies.*
 
@@ -46,6 +47,7 @@ final class KaptProject extends AbstractAndroidProject {
         a.withBuildScript { bs ->
           bs.plugins(androidLib(true) + kapt())
           bs.android = defaultAndroidLibBlock(true)
+          bs.kotlin = Kotlin.DEFAULT
           bs.dependencies(dependencies)
         }
       }.write()
diff --git a/src/functionalTest/groovy/com/autonomousapps/android/projects/KotlinTestJunitProject.groovy b/src/functionalTest/groovy/com/autonomousapps/android/projects/KotlinTestJunitProject.groovy
@@ -7,6 +7,7 @@ import com.autonomousapps.kit.Source
 import com.autonomousapps.kit.SourceType
 import com.autonomousapps.kit.android.AndroidColorRes
 import com.autonomousapps.kit.android.AndroidStyleRes
+import com.autonomousapps.kit.gradle.kotlin.Kotlin
 import com.autonomousapps.model.Advice
 import com.autonomousapps.model.ProjectAdvice
 
@@ -35,6 +36,7 @@ final class KotlinTestJunitProject extends AbstractAndroidProject {
         subproject.withBuildScript { bs ->
           bs.plugins = androidApp(true)
           bs.android = defaultAndroidAppBlock()
+          bs.kotlin = Kotlin.DEFAULT
           bs.dependencies = [
             kotlinTestJunit,
 //            junit('androidTestImplementation'),
diff --git a/src/functionalTest/groovy/com/autonomousapps/android/projects/SettingsProject.groovy b/src/functionalTest/groovy/com/autonomousapps/android/projects/SettingsProject.groovy
@@ -9,6 +9,7 @@ import com.autonomousapps.kit.android.AndroidColorRes
 import com.autonomousapps.kit.android.AndroidManifest
 import com.autonomousapps.kit.android.AndroidStyleRes
 import com.autonomousapps.kit.gradle.dependencies.Plugins
+import com.autonomousapps.kit.gradle.kotlin.Kotlin
 import com.autonomousapps.model.ProjectAdvice
 
 import static com.autonomousapps.AdviceHelper.actualProjectAdvice
@@ -40,6 +41,7 @@ abstract class SettingsProject {
           app.withBuildScript { bs ->
             bs.plugins(androidApp() - Plugins.dependencyAnalysisNoVersion)
             bs.android = defaultAndroidAppBlock()
+            bs.kotlin = Kotlin.DEFAULT
             bs.dependencies = [
               project('implementation', ':lib'),
               project('implementation', ':lib2'),
@@ -51,15 +53,15 @@ abstract class SettingsProject {
           app.styles = AndroidStyleRes.DEFAULT
           app.colors = AndroidColorRes.DEFAULT
           app.withFile('src/main/res/layout/message_layout.xml', '''\
-        <?xml version="1.0" encoding="utf-8"?>
-        <com.example.app.MessageLayout xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:app="http://schemas.android.com/apk/res-auto"
-          xmlns:tools="http://schemas.android.com/tools"
-          android:id="@id/message_layout"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content">
-          
-        </com.example.app.MessageLayout>'''.stripIndent()
+            <?xml version="1.0" encoding="utf-8"?>
+            <com.example.app.MessageLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:id="@id/message_layout"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content">
+              
+            </com.example.app.MessageLayout>'''.stripIndent()
           )
         }
         .withAndroidLibProject('lib') { lib ->
diff --git a/src/functionalTest/groovy/com/autonomousapps/android/projects/TestFixturesDuplicatedWithMainProject.groovy b/src/functionalTest/groovy/com/autonomousapps/android/projects/TestFixturesDuplicatedWithMainProject.groovy
@@ -8,6 +8,7 @@ import com.autonomousapps.kit.SourceType
 import com.autonomousapps.kit.android.AndroidManifest
 import com.autonomousapps.kit.gradle.GradleProperties
 import com.autonomousapps.kit.gradle.android.TestFixturesOptions
+import com.autonomousapps.kit.gradle.kotlin.Kotlin
 import com.autonomousapps.model.ProjectAdvice
 
 import static com.autonomousapps.AdviceHelper.*
@@ -39,6 +40,7 @@ final class TestFixturesDuplicatedWithMainProject extends AbstractAndroidProject
           bs.android = defaultAndroidAppBlock(true,"com.example.app").tap {
             testFixturesOptions = TestFixturesOptions.enabled()
           }
+          bs.kotlin = Kotlin.DEFAULT
           bs.dependencies(
             project("implementation", ":lib-test-utils"),
             project("testFixturesImplementation", ":lib-test-utils"),
@@ -53,6 +55,7 @@ final class TestFixturesDuplicatedWithMainProject extends AbstractAndroidProject
           bs.android = defaultAndroidLibBlock(true).tap {
             testFixturesOptions = TestFixturesOptions.enabled()
           }
+          bs.kotlin = Kotlin.DEFAULT
           bs.dependencies(
             project("implementation", ":lib-test-utils"),
             project("testFixturesImplementation", ":lib-test-utils"),
diff --git a/src/functionalTest/groovy/com/autonomousapps/android/projects/TestFixturesUnusedDependencyProject.groovy b/src/functionalTest/groovy/com/autonomousapps/android/projects/TestFixturesUnusedDependencyProject.groovy
@@ -7,6 +7,7 @@ import com.autonomousapps.kit.Source
 import com.autonomousapps.kit.SourceType
 import com.autonomousapps.kit.gradle.GradleProperties
 import com.autonomousapps.kit.gradle.android.TestFixturesOptions
+import com.autonomousapps.kit.gradle.kotlin.Kotlin
 import com.autonomousapps.model.Advice
 import com.autonomousapps.model.ProjectAdvice
 
@@ -45,6 +46,7 @@ final class TestFixturesUnusedDependencyProject extends AbstractAndroidProject {
           bs.android = defaultAndroidLibBlock(true).tap {
             testFixturesOptions = new TestFixturesOptions(true)
           }
+          bs.kotlin = Kotlin.DEFAULT
           bs.dependencies = [
             project("implementation", ":lib-test-utils"),
             project("testFixturesImplementation", ":lib-test-utils")
diff --git a/src/functionalTest/groovy/com/autonomousapps/android/projects/TestSourceProject.groovy b/src/functionalTest/groovy/com/autonomousapps/android/projects/TestSourceProject.groovy
@@ -10,6 +10,7 @@ import com.autonomousapps.kit.android.AndroidManifest
 import com.autonomousapps.kit.android.AndroidStyleRes
 import com.autonomousapps.kit.gradle.Plugin
 import com.autonomousapps.kit.gradle.dependencies.Plugins
+import com.autonomousapps.kit.gradle.kotlin.Kotlin
 import com.autonomousapps.model.Advice
 import com.autonomousapps.model.ProjectAdvice
 
@@ -36,6 +37,7 @@ final class TestSourceProject extends AbstractAndroidProject {
         subproject.withBuildScript { bs ->
           bs.plugins = androidApp(true)
           bs.android = defaultAndroidAppBlock()
+          bs.kotlin = Kotlin.DEFAULT
           bs.dependencies = [
             kotlinStdLib('implementation'),
             appcompat('implementation'),
@@ -50,6 +52,7 @@ final class TestSourceProject extends AbstractAndroidProject {
         subproject.withBuildScript { bs ->
           bs.plugins = androidLib(true)
           bs.android = defaultAndroidLibBlock(true, 'my.android.lib')
+          bs.kotlin = Kotlin.DEFAULT
           bs.dependencies = [junit('implementation')]
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,6 @@ final class AdviceSpec extends AbstractAndroidSpec {`
`93`	`93`
`94`	`94`	`where:`
`95`	`95`	`[gradleVersion, agpVersion] << gradleAgpMatrix()`
`96`		`-// [gradleVersion, agpVersion] << [[GradleVersion.version('8.11.1'), '8.10.1']]`
`97`	`96`	`}`
`98`	`97`
`99`	`98`	`def "can filter incorrect configuration dependencies (#gradleVersion AGP #agpVersion)"() {`