Redeclare Jacoco APIs that were renamed in Gradle 5.0 (#133)

Author: Marcel Schnelle

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

@@ -208,7 +208,7 @@ class PluginSpec : Spek({
               // Expected items: "src/main/java" & "src/<TypeName>/java"
               val sourceDirs = project.tasks.get<AndroidJUnit5JacocoReport>(
                   "jacocoTestReport${buildType.capitalize()}")
-                  .sourceDirectories
+                  .sourceDirectories!!
                   .map { it.absolutePath }
 
               val mainDir = sourceDirs.find { it.endsWith("src/main/java") }
@@ -224,7 +224,7 @@ class PluginSpec : Spek({
               // Expected omissions: "src/test/java" & "src/test<TypeName>/java"
               val sourceDirs = project.tasks.get<AndroidJUnit5JacocoReport>(
                   "jacocoTestReport${buildType.capitalize()}")
-                  .sourceDirectories.asPath
+                  .sourceDirectories!!.asPath
 
               assertAll(
                   "Mismatch! Actual dirs: $sourceDirs",
@@ -239,7 +239,7 @@ class PluginSpec : Spek({
               // Expected omissions: "classes/test"
               val classDirs = project.tasks.get<AndroidJUnit5JacocoReport>(
                   "jacocoTestReport${buildType.capitalize()}")
-                  .classDirectories.asPath
+                  .classDirectories!!.asPath
 
               assertThat(classDirs).doesNotContain("classes/test")
             }
@@ -384,7 +384,7 @@ class PluginSpec : Spek({
                 //  * SecondFile.class (through rule)
                 val fileNames = project.tasks.get<AndroidJUnit5JacocoReport>(
                     "jacocoTestReportDebug")
-                    .classDirectories.asFileTree.files
+                    .classDirectories!!.asFileTree.files
                     .map { it.name }
 
                 assertThat(fileNames)
@@ -403,7 +403,7 @@ class PluginSpec : Spek({
                 //  * SecondFile.class (through rule)
                 val fileNames = project.tasks.get<AndroidJUnit5JacocoReport>(
                     "jacocoTestReportRelease")
-                    .classDirectories.asFileTree.files
+                    .classDirectories!!.asFileTree.files
                     .map { it.name }
 
                 assertThat(fileNames)
@@ -427,7 +427,7 @@ class PluginSpec : Spek({
                 it("doesn't exclude R.class anymore for the $buildType build type") {
                   val fileNames = project.tasks.get<AndroidJUnit5JacocoReport>(
                       "jacocoTestReport${buildType.capitalize()}")
-                      .classDirectories.asFileTree.files
+                      .classDirectories!!.asFileTree.files
                       .map { it.name }
 
                   assertThat(fileNames).contains("R.class")

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

@@ -38,6 +38,26 @@ open class AndroidJUnit5JacocoReport : JacocoReport() {
     }
   }
 
+  /*
+   * Gradle 5.0 changed the return type of these methods from FileCollection to ConfigurableFileCollection.
+   * By explicitly re-declaring them here with the old return type, the binary incompatibility is bridged.
+   */
+
+  @Suppress("RedundantOverride")
+  override fun getExecutionData(): FileCollection? {
+    return super.getExecutionData()
+  }
+
+  @Suppress("RedundantOverride")
+  override fun getClassDirectories(): FileCollection? {
+    return super.getClassDirectories()
+  }
+
+  @Suppress("RedundantOverride")
+  override fun getSourceDirectories(): FileCollection? {
+    return super.getSourceDirectories()
+  }
+
   /**
    * Configuration closure for an Android JUnit5 Jacoco Report task.
    */
@@ -88,9 +108,9 @@ open class AndroidJUnit5JacocoReport : JacocoReport() {
 
       project.logger.junit5Info(
           "Assembled Jacoco Code Coverage for JUnit 5 Task '${testTask.name}':")
-      project.logger.junit5Info("|__ Execution Data: ${reportTask.executionData.asPath}")
-      project.logger.junit5Info("|__ Source Dirs: ${reportTask.sourceDirectories.asPath}")
-      project.logger.junit5Info("|__ Class Dirs: ${reportTask.classDirectories.asPath}")
+      project.logger.junit5Info("|__ Execution Data: ${reportTask.executionData?.asPath}")
+      project.logger.junit5Info("|__ Source Dirs: ${reportTask.sourceDirectories?.asPath}")
+      project.logger.junit5Info("|__ Class Dirs: ${reportTask.classDirectories?.asPath}")
 
       // Hook into the main Jacoco task
       val defaultJacocoTask = project.tasks.maybeCreate(