fixed coverage reports

compscidr · May 12, 2023 · 967f7a7 · 967f7a7
1 parent 8fa2d6a
commit 967f7a7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -31,8 +31,6 @@ jobs:
         run: ./gradlew jacocoTestReportDebug
       - name: Clean Packages
         run: bash ./scripts/clean-packages.sh
-#      - name: On-Device Instrumented Tests with CoverageReport
-#        run: ./gradlew coverageReport
       - name: On-Device Instrumented Tests
         run: ./gradlew connectedCheck
       - uses: actions/upload-artifact@v3
@@ -62,7 +60,7 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           flags: instrumentedtests
-          files: ./app/build/reports/jacoco.xml
+          files: ./app/build/reports/coverage/androidTest/debug/connected/report.xml
 
       - name: Export environment variables
         run: |

diff --git a/app/build.gradle b/app/build.gradle
@@ -7,6 +7,7 @@ plugins {
     id 'io.github.reactivecircus.app-versioning' version '1.1.2'
     id 'de.mannodermaus.android-junit5'
     id 'org.jmailen.kotlinter'
+    id 'jacoco'
     //id 'org.jetbrains.dokka'
 }
 
@@ -58,18 +59,20 @@ android {
     testOptions {
         unitTests.all {
             useJUnitPlatform()
-//            jacoco {
-//                includeNoLocationClasses = true
-//                excludes = ['jdk.internal.*']
-//            }
+            jacoco {
+                includeNoLocationClasses = true
+                excludes = [
+                        'jdk.internal.*',
+                ]
+            }
         }
         // should let the tests run with with gradle via -DincludeTags="tag1,tag2" -DexcludeTags="tag3,tag4"
         // https://github.com/mannodermaus/android-junit5/wiki/Configuration
         // https://junit.org/junit5/docs/current/user-guide/#writing-tests-tagging-and-filtering
         // https://www.vogella.com/tutorials/AndroidTesting/article.html
         junitPlatform {
             filters {
-                includeTags 'TEST1'
+                //includeTags 'TEST1'
                 //excludeTags 'TEST2'
             }
         }
@@ -142,22 +145,17 @@ dependencies {
 configurations.testImplementation {
     exclude module: 'logback-android'
 }
-//
-//jacoco {
-//    toolVersion = '0.8.7'
-//}
+
+jacoco {
+    toolVersion = '0.8.7'
+}
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
     kotlinOptions {
         jvmTarget = "11"
     }
 }
 
-//rootCoverage {
-//    includeAndroidTestResults true
-//    generateXml true
-//}
-
 // https://github.com/ReactiveCircus/app-versioning
 appVersioning {
     overrideVersionCode { gitTag, providers, variantInfo ->

diff --git a/build.gradle b/build.gradle
@@ -29,7 +29,6 @@ plugins {
     id "com.android.application" version "$agp_version" apply false
     id "org.jetbrains.kotlin.android" version "$kotlin_version" apply false
     id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version"
-    //id "nl.neotech.plugin.rootcoverage" version '1.6.0'
     id "org.jetbrains.kotlin.jvm" version "$kotlin_version" apply false
 }