Move assetsCollection to Groovy to profit from its dynamic nature, so that the changed type doesn't matter to Kotlin

Author: mannodermaus

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

@@ -4,8 +4,11 @@ import com.android.annotations.NonNull
 import com.android.build.gradle.api.BaseVariant
 import com.android.build.gradle.internal.scope.VariantScope
 import com.android.build.gradle.internal.variant.BaseVariantData
+import com.android.build.gradle.tasks.factory.AndroidUnitTest
 import com.annimon.stream.Optional
 
+import javax.annotation.Nullable
+
 /**
  * Utility functions exposed to Kotlin consumers
  * that can't safely access Groovy members otherwise,
@@ -81,6 +84,19 @@ class GroovyInterop {
     }
   }
 
+  /**
+   * Obtains the Assets Collection of the given AndroidUnitTest.
+   *
+   * @because 'assetsCollection' 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 assets collection
+   */
+  @Nullable
+  static Set<File> androidUnitTest_assetsCollection(AndroidUnitTest test) {
+    def collection = test.assetsCollection
+    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

@@ -3,6 +3,7 @@ package de.mannodermaus.gradle.plugins.junit5
 import com.android.build.gradle.api.BaseVariant
 import com.android.build.gradle.internal.scope.VariantScope
 import com.android.build.gradle.internal.variant.BaseVariantData
+import com.android.build.gradle.tasks.factory.AndroidUnitTest
 import groovy.lang.Closure
 import java.io.File
 
@@ -19,6 +20,9 @@ val BaseVariant.variantData: BaseVariantData
 val VariantScope.safeJavaOutputDirs: Set<File>
   get() = GroovyInterop.variantScope_javaOutputDirs(this)
 
+val AndroidUnitTest.safeAssetsCollection: Set<File>?
+  get() = GroovyInterop.androidUnitTest_assetsCollection(this)
+
 /* Types */
 
 class VariantTypeCompat {

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

@@ -11,6 +11,7 @@ import de.mannodermaus.gradle.plugins.junit5.internal.junit5Info
 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.variantData
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
@@ -183,7 +184,7 @@ open class AndroidJUnit5UnitTest : JavaExec(), JUnit5UnitTest {
       // Connect to the default unit test task
       val variantUnitTestTask = this.getDefaultJUnit4Task()
       task.resCollection = variantUnitTestTask.resCollection?.files
-      task.assetsCollection = variantUnitTestTask.assetsCollection?.files
+      task.assetsCollection = variantUnitTestTask.safeAssetsCollection
 
       variantUnitTestTask.enabled = junit5.enableStandardTestTask
       variantUnitTestTask.dependsOn(task)