From 9ccefdc9afaeaece6ec5943058f310600d2ce639 Mon Sep 17 00:00:00 2001
From: Alexander Zagniotov <azagniotov@gmail.com>
Date: Thu, 27 Feb 2025 14:12:19 -0800
Subject: [PATCH] Revisited JaCoCo config

---
 .github/workflows/ci.yml  | 10 +++++++---
 build.gradle              |  2 +-
 conf/gradle/jacoco.gradle | 10 ++++++----
 gradle.properties         |  2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 932fce5..85c3ea9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -63,19 +63,23 @@ jobs:
           cache: gradle
 
       - name: Run JaCoCo coverage
+        # test is finalizedBy jacocoTestReport
         run: |
-          ./gradlew clean test jacocoTestReport
+          ./gradlew clean test
 
       - name: Add JaCoCo coverage as a PR comment
         id: jacoco
         uses: madrapps/jacoco-report@v1.7.1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          paths: ${{ github.workspace }}/build/reports/jacoco/**/jacocoTestReport.xml
+          paths: ${{ github.workspace }}/build/reports/jacoco/test/jacocoTestReport.xml
           min-coverage-overall: 90
-          title: ' :robot: `Coverage Report`'
+          title: ' :robot: `JaCoCo Coverage Report` :robot: '
+          pass-emoji: ':green_circle:'
+          fail-emoji: ':red_circle:'
           update-comment: true
           min-coverage-changed-files: 60
+          debug-mode: true
 
       - name: Get the JaCoCo coverage info
         run: |
diff --git a/build.gradle b/build.gradle
index 4b16c17..6ee4d82 100644
--- a/build.gradle
+++ b/build.gradle
@@ -61,10 +61,10 @@ ext {
 }
 
 apply from: "$rootDir/conf/gradle/dependencies.gradle"
+apply from: "$rootDir/conf/gradle/jacoco.gradle"
 apply from: "$rootDir/conf/gradle/tests.gradle"
 apply from: "$rootDir/conf/gradle/jar.gradle"
 apply from: "$rootDir/conf/gradle/publish.gradle"
-apply from: "$rootDir/conf/gradle/jacoco.gradle"
 
 tasks.register('copyPreCommitHook', Copy) {
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
diff --git a/conf/gradle/jacoco.gradle b/conf/gradle/jacoco.gradle
index f355fa5..8383498 100644
--- a/conf/gradle/jacoco.gradle
+++ b/conf/gradle/jacoco.gradle
@@ -1,11 +1,9 @@
 def execData() {
-	return files(fileTree(layout.buildDirectory.get().asFile.absolutePath).include("jacoco/*.exec"))
+	return fileTree(layout.buildDirectory.file("jacoco/test.exec").get().asFile)
 }
 
 def static analysisExcludes() {
-	return [
-			"src/generated/**"
-	]
+	return []
 }
 
 ext {
@@ -46,3 +44,7 @@ jacocoTestCoverageVerification {
 		}
 	}
 }
+
+test {
+	finalizedBy jacocoTestReport
+}
diff --git a/gradle.properties b/gradle.properties
index 56ffc6e..46600ea 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,7 +22,7 @@ gsonVersion=2.8.9
 
 googleJavaFormatVersion=0.9
 googleJavaFormatToolVersion=1.22.0
-jacocoVersion=0.8.11
+jacocoVersion=0.8.12
 coverageMinimum=0.8
 
 #######################################################