Add support for AGP 3.2.0-alpha07 (AndroidUnitTest.assetsCollection changed types)

Author: mannodermaus

android-junit5-tests/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/PluginSpec.kt

@@ -583,8 +583,11 @@ class PluginSpec : Spek({
               // Since the location of intermediate class files changed in different
               // versions of the Android Gradle Plugin,
               // create each class file in multiple directories to remain compatible with all approaches
+              // TODO Clean this mess up once the Android Gradle Plugin 3.2.0 finally decides on something. :|
               listOf(
-                  // AGP 3.2.0-alpha06 and above
+                  // AGP 3.2.0-alpha07 and above
+                  "build/intermediates/javac/debug/compileDebugJavaWithJavac/classes",
+                  // AGP 3.2.0-alpha06
                   "build/intermediates/artifact_transform/compileDebugJavaWithJavac/classes",
                   // AGP 3.2.0-alpha04 and above
                   "build/intermediates/artifact_transform/javac/debug/classes",
@@ -597,7 +600,9 @@ class PluginSpec : Spek({
               }
 
               listOf(
-                  // AGP 3.2.0-alpha06 and above
+                  // AGP 3.2.0-alpha07 and above
+                  "build/intermediates/javac/release/compileReleaseJavaWithJavac/classes",
+                  // AGP 3.2.0-alpha06
                   "build/intermediates/artifact_transform/compileReleaseJavaWithJavac/classes",
                   // AGP 3.2.0-alpha04 and above
                   "build/intermediates/artifact_transform/javac/release/classes",

android-junit5/src/main/groovy/de/mannodermaus/gradle/plugins/junit5/GroovyInterop.groovy

@@ -51,6 +51,7 @@ class GroovyInterop {
 
   /**
    * Obtains the Java output directory of the provided VariantScope in a safe manner.
+   * TODO Clean this mess up once the Android Gradle Plugin 3.2.0 finally decides on something. :|
    *
    * @because In Android Gradle Plugin 3.2.0-alpha02, the original method was removed
    * @param variant VariantScope to retrieve the Java output directory from
@@ -64,7 +65,7 @@ class GroovyInterop {
           .get()
       if (scope.buildArtifactsHolder.hasArtifact(artifactType)) {
         // 3.2.0-alpha04 and above:
-        // Java outputs are moved into an "artifacts_transform" subdirectory
+        // Java outputs are moved into a subdirectory exposed by the compilation BuildArtifact
         return scope.buildArtifactsHolder.getArtifactFiles(artifactType).files
       } else {
         // 3.2.0-alpha02 and above:

android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/tasks/UnitTest.kt

@@ -53,11 +53,11 @@ open class AndroidJUnit5UnitTest : JavaExec(), JUnit5UnitTest {
 
   @InputFiles
   @Optional
-  var resCollection: FileCollection? = null
+  var resCollection: Set<File>? = null
 
   @InputFiles
   @Optional
-  var assetsCollection: FileCollection? = null
+  var assetsCollection: Set<File>? = null
 
   override val isRunAllTask = false
 
@@ -182,8 +182,8 @@ open class AndroidJUnit5UnitTest : JavaExec(), JUnit5UnitTest {
         junit5: AndroidJUnitPlatformExtension) {
       // Connect to the default unit test task
       val variantUnitTestTask = this.getDefaultJUnit4Task()
-      task.resCollection = variantUnitTestTask.resCollection
-      task.assetsCollection = variantUnitTestTask.assetsCollection
+      task.resCollection = variantUnitTestTask.resCollection?.files
+      task.assetsCollection = variantUnitTestTask.assetsCollection?.files
 
       variantUnitTestTask.enabled = junit5.enableStandardTestTask
       variantUnitTestTask.dependsOn(task)