Gradle 8 upgrade

.github/workflows/build.yml

@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        java_version: [11]
+        java_version: [17]
 
     steps:
       - name: Checkout

.github/workflows/publish-release.yml

@@ -15,10 +15,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Install JDK 11
+      - name: Install JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
 
       - name: Upload release
         run: ./gradlew publishAllPublicationsToMavenCentralRepository --no-daemon --no-parallel

build.gradle

@@ -9,28 +9,17 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.gradle.publish:plugin-publish-plugin:0.10.1'
-    classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.16.0'
+    classpath "com.gradle.publish:plugin-publish-plugin:1.2.0"
     classpath 'com.vanniktech:gradle-maven-publish-plugin:0.16.0'
   }
 }
 
 apply plugin: 'groovy'
 apply plugin: 'java-library'
 apply plugin: 'java-gradle-plugin'
-apply plugin: 'com.vanniktech.android.junit.jacoco'
 apply plugin: "com.vanniktech.maven.publish"
 apply plugin: 'com.gradle.plugin-publish'
 
-gradlePlugin {
-  plugins {
-    androidJUnitJacocoPlugin {
-      id = 'com.vanniktech.android.junit.jacoco'
-      implementationClass = 'com.vanniktech.android.junit.jacoco.GenerationPlugin'
-    }
-  }
-}
-
 repositories {
   mavenCentral()
   google()
@@ -41,12 +30,12 @@ dependencies {
   api gradleApi()
   api localGroovy()
 
-  compileOnly 'com.android.tools.build:gradle:7.1.2'
+  compileOnly 'com.android.tools.build:gradle:8.0.0'
 
-  testImplementation 'com.android.tools.build:gradle:7.1.2'
-  testImplementation 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10'
-  testImplementation 'junit:junit:4.13'
-  testImplementation 'org.spockframework:spock-core:2.2-M1-groovy-3.0', { exclude module: "groovy-all" } // Use localGroovy()
+  testImplementation 'com.android.tools.build:gradle:8.0.0'
+  testImplementation 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21'
+  testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.3'
+  testImplementation 'org.spockframework:spock-core:2.4-M1-groovy-3.0', { exclude module: "groovy-all" } // Use localGroovy()
 
   // https://github.com/gradle/gradle/issues/16774#issuecomment-893493869
   def toolingApiBuildersJar = (project as ProjectInternal).services.get(ModuleRegistry.class)
@@ -57,17 +46,19 @@ dependencies {
   testRuntimeOnly(files(toolingApiBuildersJar))
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_17
 
-pluginBundle {
+gradlePlugin {
   website = POM_URL
   vcsUrl = POM_SCM_URL
 
   plugins {
     androidJUnitJacocoPlugin {
+      id = POM_ARTIFACT_ID
+      implementationClass = POM_IMPLEMENTATION_CLASS
       displayName = POM_NAME
-      tags = ['gradle', 'android', 'jacoco', 'app module', 'library module', 'junit', 'unit', 'testing', 'coverage']
       description = POM_DESCRIPTION
+      tags.set(['gradle', 'android', 'jacoco', 'app module', 'library module', 'junit', 'unit', 'testing', 'coverage'])
     }
   }
 }
@@ -79,6 +70,6 @@ tasks.withType(Test).configureEach {
 }
 
 wrapper {
-  gradleVersion = '7.4'
+  gradleVersion = '8.0'
   distributionType = Wrapper.DistributionType.ALL
 }

gradle.properties

@@ -1,7 +1,8 @@
 GROUP=com.vanniktech
-VERSION_NAME=0.17.0-SNAPSHOT
+VERSION_NAME=0.17.0
 
-POM_ARTIFACT_ID=gradle-android-junit-jacoco-plugin
+POM_ARTIFACT_ID=com.vanniktech.android.junit.jacoco
+POM_IMPLEMENTATION_CLASS =com.vanniktech.android.junit.jacoco.JunitJacocoExtension
 POM_NAME=Gradle Android Jacoco Plugin
 POM_PACKAGING=jar
 
@@ -18,4 +19,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
 POM_LICENCE_DIST=repo
 
 POM_DEVELOPER_ID=vanniktech
-POM_DEVELOPER_NAME=Niklas Baudy
+POM_DEVELOPER_NAME=Niklas Baudy

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/groovy/com/vanniktech/android/junit/jacoco/GenerationPlugin.groovy

@@ -4,7 +4,6 @@ import com.android.build.gradle.api.BaseVariant
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.tasks.testing.Test
-import org.gradle.testing.jacoco.tasks.JacocoMerge
 import org.gradle.testing.jacoco.tasks.JacocoReport
 
 class GenerationPlugin implements Plugin<Project> {
@@ -15,12 +14,12 @@ class GenerationPlugin implements Plugin<Project> {
         final def hasSubProjects = rootProject.subprojects.size() > 0
 
         if (hasSubProjects) {
-            final def (JacocoMerge mergeTask, JacocoReport mergedReportTask) = addJacocoMergeToRootProject(rootProject, rootProject.junitJacoco)
+            final def JacocoReport mergedReportTask = addJacocoMergeToRootProject(rootProject, rootProject.junitJacoco)
 
             rootProject.subprojects { subProject ->
                 afterEvaluate {
                     final def extension = rootProject.junitJacoco
-                    addJacoco(subProject, extension, mergeTask, mergedReportTask)
+                    addJacoco(subProject, extension, mergedReportTask)
                 }
             }
         } else {
@@ -33,22 +32,22 @@ class GenerationPlugin implements Plugin<Project> {
     }
 
     protected static boolean addJacoco(final Project subProject, final JunitJacocoExtension extension) {
-        return addJacoco(subProject, extension, null, null)
+        return addJacoco(subProject, extension, null)
     }
 
-    protected static boolean addJacoco(final Project subProject, final JunitJacocoExtension extension, JacocoMerge mergeTask, JacocoReport mergedReportTask) {
+    protected static boolean addJacoco(final Project subProject, final JunitJacocoExtension extension, JacocoReport mergedReportTask) {
         if (!shouldIgnore(subProject, extension)) {
             if (isAndroidProject(subProject)) {
-                return addJacocoAndroid(subProject, extension, mergeTask, mergedReportTask)
+                return addJacocoAndroid(subProject, extension, mergedReportTask)
             } else if (isJavaProject(subProject) || isKotlinMultiplatform(subProject)) {
-                return addJacocoJava(subProject, extension, mergeTask, mergedReportTask)
+                return addJacocoJava(subProject, extension, mergedReportTask)
             }
         }
 
         return false
     }
 
-    private static boolean addJacocoJava(final Project subProject, final JunitJacocoExtension extension, JacocoMerge mergeTask, JacocoReport mergedReportTask) {
+    private static boolean addJacocoJava(final Project subProject, final JunitJacocoExtension extension, JacocoReport mergedReportTask) {
         subProject.plugins.apply('jacoco')
 
         subProject.jacoco {
@@ -62,9 +61,9 @@ class GenerationPlugin implements Plugin<Project> {
             description = 'Generate Jacoco coverage reports.'
 
             reports {
-                xml.enabled = extension.xml.enabled
-                csv.enabled = extension.csv.enabled
-                html.enabled = extension.html.enabled
+                xml.required = extension.xml.enabled
+                csv.required = extension.csv.enabled
+                html.required = extension.html.enabled
             }
 
             getClassDirectories().from(subProject.fileTree(
@@ -89,10 +88,8 @@ class GenerationPlugin implements Plugin<Project> {
                 getExecutionData().from(subProject.files(subProject.files("${subProject.buildDir}/jacoco/test.exec")))
             }
 
-            if (mergeTask != null) {
-                mergeTask.executionData.setFrom(executionData.files + mergeTask.executionData.files)
-            }
             if (mergedReportTask != null) {
+                mergedReportTask.executionData.setFrom(executionData.files + mergedReportTask.executionData.files)
                 mergedReportTask.classDirectories.setFrom(classDirectories.getFrom() + mergedReportTask.classDirectories.getFrom())
                 mergedReportTask.additionalSourceDirs.setFrom(additionalSourceDirs.getFrom() + mergedReportTask.additionalSourceDirs.getFrom())
                 mergedReportTask.sourceDirectories.setFrom(sourceDirectories.getFrom() + mergedReportTask.sourceDirectories.getFrom())
@@ -103,7 +100,7 @@ class GenerationPlugin implements Plugin<Project> {
         return true
     }
 
-    private static boolean addJacocoAndroid(final Project subProject, final JunitJacocoExtension extension, JacocoMerge mergeTask, JacocoReport mergedReportTask) {
+    private static boolean addJacocoAndroid(final Project subProject, final JunitJacocoExtension extension, JacocoReport mergedReportTask) {
         subProject.plugins.apply('jacoco')
 
         subProject.jacoco {
@@ -146,11 +143,11 @@ class GenerationPlugin implements Plugin<Project> {
             final def jvmTestTaskName = "test${sourceName.capitalize()}UnitTest"
             final def instrumentationTestTaskName = "create${sourceName.capitalize()}CoverageReport"
 
-            addJacocoTask(false, subProject, extension, mergeTask, mergedReportTask, jvmTaskName,
+            addJacocoTask(false, subProject, extension, mergedReportTask, jvmTaskName,
                 jvmTestTaskName, instrumentationTestTaskName, sourceName, sourcePath, productFlavorName, buildTypeName)
 
             if (buildType.testCoverageEnabled) {
-                addJacocoTask(true, subProject, extension, mergeTask, mergedReportTask, combinedTaskName,
+                addJacocoTask(true, subProject, extension, mergedReportTask, combinedTaskName,
                     jvmTestTaskName, instrumentationTestTaskName, sourceName, sourcePath, productFlavorName, buildTypeName)
             }
         }
@@ -159,7 +156,7 @@ class GenerationPlugin implements Plugin<Project> {
     }
 
     private static void addJacocoTask(final boolean combined, final Project subProject, final JunitJacocoExtension extension,
-                                      JacocoMerge mergeTask, JacocoReport mergedReportTask, final String taskName,
+                                      JacocoReport mergedReportTask, final String taskName,
                                       final String jvmTestTaskName, final String instrumentationTestTaskName, final String sourceName,
                                       final String sourcePath, final String productFlavorName, final String buildTypeName) {
         def destinationDir
@@ -181,15 +178,15 @@ class GenerationPlugin implements Plugin<Project> {
 
             reports {
                 xml {
-                    enabled = extension.xml.enabled
+                    required = extension.xml.enabled
                     destination subProject.file("$destinationDir/${sourceName}/jacoco.xml")
                 }
                 csv {
-                    enabled = extension.csv.enabled
+                    required = extension.csv.enabled
                     destination subProject.file("$destinationDir/${sourceName}/jacoco.csv")
                 }
                 html {
-                    enabled = extension.html.enabled
+                    required = extension.html.enabled
                     destination subProject.file("$destinationDir/${sourceName}")
                 }
             }
@@ -240,27 +237,17 @@ class GenerationPlugin implements Plugin<Project> {
 
             if (combined) {
                 // add instrumentation coverage execution data
-                doFirst {
-                    def instrumentationTestCoverageDirs = subProject.fileTree("${subProject.buildDir}/outputs/code_coverage")
-                            .matching { include "**/*.ec" }
-                    def allCodeCoverageFiles = instrumentationTestCoverageDirs.files + executionData.files
-                    subProject.logger.with {
-                        info("using following code coverage files for ${taskName}")
-                        allCodeCoverageFiles.each { coverageFile ->
-                            info(coverageFile.path)
-                        }
-                    }
-                    executionData.setFrom(allCodeCoverageFiles)
+                def codeCoverageDirs = subProject.fileTree("${subProject.buildDir}/outputs/code_coverage").matching {
+                    include "**/*.ec"
                 }
+                executionData.setFrom(codeCoverageDirs.files + executionData.files)
             }
 
             // add if true in extension or for the unit test Jacoco task
             def addToMergeTask = !combined || extension.includeInstrumentationCoverageInMergedReport
 
-            if (mergeTask != null && addToMergeTask) {
-                mergeTask.executionData.setFrom(executionData.files + mergeTask.executionData.files)
-            }
             if (mergedReportTask != null && addToMergeTask) {
+              mergedReportTask.executionData.setFrom(executionData.files + mergedReportTask.executionData.files)
               mergedReportTask.classDirectories.setFrom(classDirectories.getFrom() + mergedReportTask.classDirectories.getFrom())
               mergedReportTask.additionalSourceDirs.setFrom(additionalSourceDirs.getFrom() + mergedReportTask.additionalSourceDirs.getFrom())
               mergedReportTask.sourceDirectories.setFrom(sourceDirectories.getFrom() + mergedReportTask.sourceDirectories.getFrom())
@@ -280,38 +267,20 @@ class GenerationPlugin implements Plugin<Project> {
             }
         }
 
-        def mergeTask = project.task("mergeJacocoReports", type: JacocoMerge) {
+        def mergedReportTask = project.task("jacocoTestReportMerged", type: JacocoReport) {
             executionData project.files().asFileTree // Start with an empty collection.
-            destinationFile project.file("${project.buildDir}/jacoco/mergedReport.exec")
-
-            doFirst {
-                // Filter non existing files.
-                def realExecutionData = project.files()
-
-                executionData.each {
-                    if (it.exists()) {
-                        realExecutionData.setFrom(project.files(it) + realExecutionData.files)
-                    }
-                }
-
-                executionData = realExecutionData
-            }
-        }
-
-        def mergedReportTask = project.task("jacocoTestReportMerged", type: JacocoReport, dependsOn: mergeTask) {
-            executionData mergeTask.destinationFile
 
             reports {
                 xml {
-                    enabled = extension.xml.enabled
+                    required = extension.xml.enabled
                     destination project.file("${project.buildDir}/reports/jacoco/jacoco.xml")
                 }
                 csv {
-                    enabled = extension.csv.enabled
+                    required = extension.csv.enabled
                     destination project.file("${project.buildDir}/reports/jacoco/jacoco.csv")
                 }
                 html {
-                    enabled = extension.html.enabled
+                    required = extension.html.enabled
                     destination project.file("${project.buildDir}/reports/jacoco")
                 }
             }
@@ -322,7 +291,7 @@ class GenerationPlugin implements Plugin<Project> {
             getSourceDirectories().from(project.files())
         }
 
-        return [mergeTask, mergedReportTask]
+        return mergedReportTask
     }
 
     static List<String> getExcludes(final JunitJacocoExtension extension) {

src/main/groovy/com/vanniktech/android/junit/jacoco/JunitJacocoExtension.groovy

@@ -9,7 +9,7 @@ class JunitJacocoExtension {
      * define the version of jacoco which should be used
      * @since 0.3.0
      */
-    String jacocoVersion = '0.8.7'
+    String jacocoVersion = '0.8.10'
 
     /**
      * subprojects that should be ignored

src/test/groovy/com/vanniktech/android/junit/jacoco/GenerationPluginSpec.groovy

@@ -6,9 +6,9 @@ import spock.lang.Unroll
 
 final class GenerationPluginSpec extends Specification {
   final static ANDROID_PLUGINS = ["com.android.application", "com.android.library", "com.android.test", "com.android.dynamic-feature"]
-  final static COMPILE_SDK_VERSION = 28
-  final static BUILD_TOOLS_VERSION = "28.0.3"
-  final static APPLICATION_ID = "com.example"
+  final static COMPILE_SDK_VERSION = 33
+  final static BUILD_TOOLS_VERSION = "33.0.0"
+  final static APPLICATION_ID = "com.vanniktech"
 
   def project