Allow compileSdk overriding for old AGP versions

AGP 8.0 doesn't work with compileSdk=35, so force it to the maximum it does support. Also, remove optionality from the Gradle requirement, since each AGP version needs its own anyway

Author: mannodermaus

build-logic/src/main/kotlin/Environment.kt

@@ -6,9 +6,10 @@ import java.util.Properties
 
 enum class SupportedAgp(
     val version: String,
-    val gradle: String? = null
+    val gradle: String,
+    val compileSdk: Int? = null
 ) {
-    AGP_8_0("8.0.2", gradle = "8.0"),
+    AGP_8_0("8.0.2", gradle = "8.0", compileSdk = 33),
     AGP_8_1("8.1.4", gradle = "8.0"),
     AGP_8_2("8.2.2", gradle = "8.2"),
     AGP_8_3("8.3.2", gradle = "8.4"),

build-logic/src/main/kotlin/Tasks.kt

@@ -34,21 +34,28 @@ fun Project.configureTestResources() {
                 "JUNIT5_ANDROID_LIBS_VERSION" to Artifacts.Instrumentation.Core.latestStableVersion,
 
                 // Collect all supported AGP versions into a single string.
-                // This string is delimited with semicolons, and each of the separated values itself is a 3-tuple.
+                // This string is delimited with semicolons, and each of the separated values itself is a 4-tuple.
                 //
                 // Example:
-                // AGP_VERSIONS = 3.5|3.5.3|;3.6|3.6.3|6.4
+                // AGP_VERSIONS = 3.5|3.5.3|;3.6|3.6.3|6.4;3.7|3.7.0|8.0|33
                 //
                 // Can be parsed into this list of values:
                 // |___> Short: "3.5"
                 //       Full: "3.5.3"
-                //       Gradle Requirement: null
+                //       Gradle Requirement: ""
+                //       Compile SDK: null
                 //
                 // |___> Short: "3.6"
                 //       Full: "3.6.3"
                 //       Gradle Requirement: "6.4"
+                //       Compile SDK: null
+                //
+                // |___> Short: "3.7"
+                //       Full: "3.7.0"
+                //       Gradle Requirement: "8.0"
+                //       Compile SDK: 33
                 "AGP_VERSIONS" to SupportedAgp.values().joinToString(separator = ";") { plugin ->
-                    "${plugin.shortVersion}|${plugin.version}|${plugin.gradle ?: ""}"
+                    "${plugin.shortVersion}|${plugin.version}|${plugin.gradle}|${plugin.compileSdk ?: ""}"
                 }
         )
 

plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/ConfigurationCacheTests.kt

@@ -69,7 +69,7 @@ class ConfigurationCacheTests {
     private fun runGradle(project: File, task: String, expectSuccess: Boolean) =
         GradleRunner.create()
             .withProjectDir(project)
-            .apply { agp.requiresGradle?.let(::withGradleVersion) }
+            .withGradleVersion(agp.requiresGradle)
             .withArguments("--configuration-cache", "--stacktrace", task)
             .withPrunedPluginClasspath(agp)
             .run {

plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/FunctionalTests.kt

@@ -72,7 +72,12 @@ class FunctionalTests {
                 projectCreator.allSpecs.filterSpecs().map { spec ->
                     dynamicTest(spec.name) {
                         // Required for visibility inside IJ's logging console (display names are still bugged in the IDE)
-                        println("AGP: ${agp.version}, Project: ${spec.name}, Forced Gradle: ${agp.requiresGradle ?: "no"}")
+                        println(buildList {
+                            add("AGP: ${agp.version}")
+                            add("Project: ${spec.name}")
+                            add("Gradle: ${agp.requiresGradle}")
+                            agp.requiresCompileSdk?.let { add("SDK: $it") }
+                        }.joinToString(", "))
 
                         // Create a virtual project with the given settings & AGP version.
                         // This call will throw a TestAbortedException if the spec is not eligible for this version,
@@ -147,11 +152,7 @@ class FunctionalTests {
         }
 
         return GradleRunner.create()
-            .apply {
-                if (agpVersion.requiresGradle != null) {
-                    withGradleVersion(agpVersion.requiresGradle)
-                }
-            }
+            .withGradleVersion(agpVersion.requiresGradle)
             .withArguments(arguments)
             .withPrunedPluginClasspath(agpVersion)
     }

plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/util/TestEnvironment.kt

@@ -51,15 +51,16 @@ class TestEnvironment {
     junit5AndroidLibsVersion = envProps.getProperty(JUNIT5_ANDROID_PROP_NAME)
 
     // Each entry in this string is separated by semicolon.
-    // Within each entry, the pipe ("|") divides it into three properties
+    // Within each entry, the pipe ("|") divides it into four properties
     val agpVersionsString = envProps.getProperty(AGP_VERSIONS_PROP_NAME)
     supportedAgpVersions = agpVersionsString.split(";")
         .map { entry -> entry.split("|") }
         .map { values ->
           TestedAgp(
               shortVersion = values[0],
               version = values[1],
-              requiresGradle = values[2].ifEmpty { null }
+              requiresGradle = values[2],
+              requiresCompileSdk = values[3].toIntOrNull()
           )
         }
   }

plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/util/TestedAgp.kt

@@ -1,5 +1,10 @@
 package de.mannodermaus.gradle.plugins.junit5.util
 
-data class TestedAgp(val shortVersion: String, val version: String, val requiresGradle: String?) {
+data class TestedAgp(
+  val shortVersion: String,
+  val version: String,
+  val requiresGradle: String,
+  val requiresCompileSdk: Int?
+) {
   val fileKey: String = "agp${shortVersion.replace(".", "")}x"
 }