jacoco improvements

.github/workflows/code-coverage-check.yml

@@ -24,8 +24,15 @@ jobs:
       - name: Build and test with Gradle
         run: ./gradlew clean generateJacocoCoverageReport
 
+      - name: Upload unit tests report
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: unit-tests-report
+          path: build/reports/tests/aggregate
+
       - name: Upload JaCoCo report
-        if: success()
+        if: always()
         uses: actions/upload-artifact@v4
         with:
           name: jacoco-report

app/build.gradle

@@ -118,8 +118,6 @@ dependencies {
     ksp libs.hilt.compiler
     ksp libs.hilt.android.compiler
 
-    implementation libs.org.jacoco.agent
-
     kspTest libs.hilt.android.compiler
     testImplementation libs.android.runner
     testImplementation libs.androidx.core.testing

build.gradle

@@ -8,8 +8,7 @@ buildscript {
         classpath(libs.agp)
         classpath(libs.karumi.shot)
         classpath libs.hilt.android.gradle.plugin
-        classpath libs.org.jacoco.core
-        classpath libs.jacoco.org.jacoco.ant
+        classpath libs.jacoco
     }
 }
 
@@ -55,13 +54,7 @@ project.afterEvaluate {
         group = "Reporting"
         description = "Generate JaCoCo coverage report for the debug build."
 
-        subprojects.collect { subproject ->
-            subproject.tasks.findAll { task ->
-                if (task.name == "testDebugUnitTest") {
-                    dependsOn task
-                }
-            }
-        }
+        dependsOn unitTests
 
         finalizedBy(tasks.named("jacocoCoverageVerification").get())
 
@@ -107,7 +100,6 @@ project.afterEvaluate {
         }
         def sources = subprojects.collect { project ->
             [
-                    "${project.projectDir.name}/src/main/java",
                     "${project.projectDir.name}/src/main/java"
             ]
         }.flatten()

gradle/libs.versions.toml

@@ -64,13 +64,11 @@ awaitility-kotlin = { module = "org.awaitility:awaitility-kotlin", version.ref =
 gradle = { group = "com.android.tools.build", name = "gradle", version.ref = "android-application" }
 agp = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin" }
 hilt-android-gradle-plugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hilt" }
-jacoco-org-jacoco-ant = { module = "org.jacoco:org.jacoco.ant", version.ref = "jacoco" }
 kotlin = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk7", version.ref = "kotlin" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockitoInline" }
-org-jacoco-agent = { module = "org.jacoco:org.jacoco.agent", version.ref = "jacoco" }
-org-jacoco-core = { module = "org.jacoco:org.jacoco.core", version.ref = "jacoco" }
+jacoco = { module = "org.jacoco:org.jacoco.core", version.ref = "jacoco" }
 window = { group = "androidx.window", name = "window", version.ref = "androidx-window" }
 recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recycler-view" }
 security = { group = "androidx.security", name = "security-crypto", version.ref = "security-crypto" }