From 4533dcea4ec302f58e3d3ed85f4daa1fc1585254 Mon Sep 17 00:00:00 2001
From: Dawid Weiss <dawid.weiss@carrotsearch.com>
Date: Thu, 12 Oct 2023 20:42:17 +0200
Subject: [PATCH] GITHUB#12655: upgrade jacoco aggregation plugin (failed with
 gradle 8.x), change html output property.

---
 build.gradle                   |  2 +-
 gradle/testing/coverage.gradle | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 52bf6393a2e..39b4c4c92b4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ plugins {
   id "de.undercouch.download" version "5.2.0" apply false
   id "net.ltgt.errorprone" version "3.1.0" apply false
   id 'com.diffplug.spotless' version "6.5.2" apply false
-  id 'org.barfuin.gradle.jacocolog' version "2.0.0" apply false
+  id 'org.barfuin.gradle.jacocolog' version "3.1.0" apply false
 }
 
 apply from: file('gradle/globals.gradle')
diff --git a/gradle/testing/coverage.gradle b/gradle/testing/coverage.gradle
index 66850a2a6ef..33683bf83e7 100644
--- a/gradle/testing/coverage.gradle
+++ b/gradle/testing/coverage.gradle
@@ -23,6 +23,21 @@ def withCoverage = gradle.startParameter.taskNames.contains("coverage") ||
     Boolean.parseBoolean(propertyOrDefault("tests.coverage", "false"))
 
 if (withCoverage) {
+  configure(rootProject) {
+    plugins.apply("org.barfuin.gradle.jacocolog")
+
+    // Synthetic task to enable test coverage (and aggregated reports).
+    task coverage() {
+      dependsOn jacocoAggregatedReport
+    }
+
+    configure(jacocoAggregatedReport) {
+      doLast {
+        logger.lifecycle("Code coverage report at: ${reports.html.entryPoint}\n")
+      }
+    }
+  }
+
   allprojects {
     plugins.withType(JavaPlugin) {
       // Apply jacoco once we know the project has a Java plugin too.
@@ -47,7 +62,7 @@ if (withCoverage) {
 
       configure(jacocoTestReport) {
         doLast {
-          logger.lifecycle("Code coverage report at: ${reports.html.destination}.\n")
+          logger.lifecycle("Code coverage report at: ${reports.html.entryPoint}.\n")
         }
       }
     }