Fix coverage report

Author: frimtec

.github/workflows/buid.yml

@@ -21,9 +21,12 @@ jobs:
           java-version: 17
 
       - name: Build and Test coverage Report
-        run: bash ./gradlew test jacocoTestReport --stacktrace
+        run: bash ./gradlew test unitTestCoverageReport --stacktrace
 
       - uses: codecov/codecov-action@v5.1.2
+        with:
+          files: ./app/build/reports/jacoco/unitTestCoverageReport/unitTestCoverageReport.xml,./securesmsproxyapi/build/reports/jacoco/unitTestCoverageReport/unitTestCoverageReport.xml
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   apk:
     name: Generate APK

app/build.gradle

@@ -13,7 +13,19 @@ int vcode = Integer.parseInt((versionProps['VERSION_CODE'] == null || versionPro
 String vname = (versionProps['VERSION_NAME'] == null || versionProps['VERSION_NAME'].startsWith('$')) ? '3.5.0-dev' : versionProps['VERSION_NAME']
 
 jacoco {
-    toolVersion = "0.8.7"
+    toolVersion = "0.8.12"
+}
+
+tasks.register("unitTestCoverageReport", JacocoReport) {
+    group = "Coverage"
+    dependsOn tasks.testDebugUnitTest
+    reports {
+        html.required = true
+        xml.required = true
+    }
+    executionData.from = layout.buildDirectory.dir("outputs/unit_test_code_coverage/debugUnitTest/testDebugUnitTest.exec")
+    classDirectories.from = layout.buildDirectory.dir("intermediates/javac/debug/compileDebugJavaWithJavac/classes")
+    sourceDirectories.from = layout.projectDirectory.dir("src/main/java")
 }
 
 android {
@@ -27,6 +39,9 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
+        debug {
+            enableUnitTestCoverage true
+        }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'

securesmsproxyapi/build.gradle

@@ -26,7 +26,19 @@ ext["ossUsername"] = System.getenv('OSS_USERNAME')
 ext["ossPassword"] = System.getenv('OSS_PASSWORD')
 
 jacoco {
-    toolVersion = "0.8.7"
+    toolVersion = "0.8.12"
+}
+
+tasks.register("unitTestCoverageReport", JacocoReport) {
+    group = "Coverage"
+    dependsOn tasks.testDebugUnitTest
+    reports {
+        html.required = true
+        xml.required = true
+    }
+    executionData.from = layout.buildDirectory.dir("outputs/unit_test_code_coverage/debugUnitTest/testDebugUnitTest.exec")
+    classDirectories.from = layout.buildDirectory.dir("intermediates/javac/debug/compileDebugJavaWithJavac/classes")
+    sourceDirectories.from = layout.projectDirectory.dir("src/main/java")
 }
 
 android {
@@ -43,6 +55,9 @@ android {
     }
 
     buildTypes {
+        debug {
+            enableUnitTestCoverage true
+        }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'