Apply changes to AndroidUnitTest.mergedManifest (#83)

Author: Marcel Schnelle

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

@@ -97,6 +97,19 @@ class GroovyInterop {
     return collection == null ? null : collection.files
   }
 
+  /**
+   * Obtains the Merged Manifest of the given AndroidUnitTest.
+   *
+   * @because 'mergedManifest' type changed from FileCollection to BuildArtifact in Android Gradle Plugin 3.2.0-alpha07
+   * @param test The Android JUnit 4 test to access
+   * @return Its merged manifest
+   */
+  @Nullable
+  static Set<File> androidUnitTest_mergedManifest(AndroidUnitTest test) {
+    def collection = test.mergedManifest
+    return collection == null ? null : collection.files
+  }
+
   /**
    * Obtains the task name prefix for Unit Test variants.
    *

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

@@ -23,6 +23,9 @@ val VariantScope.safeJavaOutputDirs: Set<File>
 val AndroidUnitTest.safeAssetsCollection: Set<File>?
   get() = GroovyInterop.androidUnitTest_assetsCollection(this)
 
+val AndroidUnitTest.safeMergedManifest: Set<File>?
+  get() = GroovyInterop.androidUnitTest_mergedManifest(this)
+
 /* Types */
 
 class VariantTypeCompat {

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

@@ -12,11 +12,11 @@ import de.mannodermaus.gradle.plugins.junit5.junitPlatform
 import de.mannodermaus.gradle.plugins.junit5.providers.DirectoryProvider
 import de.mannodermaus.gradle.plugins.junit5.providers.classDirectories
 import de.mannodermaus.gradle.plugins.junit5.safeAssetsCollection
+import de.mannodermaus.gradle.plugins.junit5.safeMergedManifest
 import de.mannodermaus.gradle.plugins.junit5.variantData
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
 import org.gradle.api.Task
-import org.gradle.api.file.FileCollection
 import org.gradle.api.internal.file.IdentityFileResolver
 import org.gradle.api.plugins.JavaBasePlugin
 import org.gradle.api.tasks.Input
@@ -71,7 +71,7 @@ open class AndroidJUnit5UnitTest : JavaExec(), JUnit5UnitTest {
   var sdkPlatformDirPath: String? = null
 
   @InputFiles
-  var mergedManifest: FileCollection? = null
+  var mergedManifest: Set<File>? = null
 
   override val isRunAllTask = false
 
@@ -199,7 +199,7 @@ open class AndroidJUnit5UnitTest : JavaExec(), JUnit5UnitTest {
       task.resCollection = variantUnitTestTask.resCollection?.files
       task.assetsCollection = variantUnitTestTask.safeAssetsCollection
       task.sdkPlatformDirPath = variantUnitTestTask.sdkPlatformDirPath
-      task.mergedManifest = variantUnitTestTask.mergedManifest
+      task.mergedManifest = variantUnitTestTask.safeMergedManifest
 
       variantUnitTestTask.enabled = junit5.enableStandardTestTask
       variantUnitTestTask.dependsOn(task)