chore: prepare release 4.0.0

ekino · Mar 9, 2023 · 9ca7fac · 9ca7fac
1 parent 4297bf3
commit 9ca7fac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 }
 
 group = "com.ekino.oss.plugin"
-version = "3.3.1"
+version = "4.0.0"
 findProperty("releaseVersion")?.let { version = it }
 
 repositories {

diff --git a/src/main/kotlin/com/ekino/oss/plugin/KotlinQualityPlugin.kt b/src/main/kotlin/com/ekino/oss/plugin/KotlinQualityPlugin.kt
@@ -14,6 +14,7 @@ import org.gradle.kotlin.dsl.getByType
 import org.gradle.kotlin.dsl.withType
 import org.gradle.testing.jacoco.plugins.JacocoPlugin
 import org.gradle.testing.jacoco.plugins.JacocoPluginExtension
+import org.gradle.testing.jacoco.plugins.JacocoReportAggregationPlugin
 import org.gradle.testing.jacoco.tasks.JacocoReport
 import org.jlleitschuh.gradle.ktlint.KtlintExtension
 import org.jlleitschuh.gradle.ktlint.KtlintPlugin
@@ -32,15 +33,13 @@ class KotlinQualityPlugin : Plugin<Project> {
       apply<SonarQubePlugin>()
       apply<KtlintPlugin>()
       apply<DetektPlugin>()
+      apply<JacocoReportAggregationPlugin>()
 
-      val jacocoXmlReportPath = "$buildDir/reports/jacoco/test/jacocoTestReport.xml"
-
-      tasks.withType<JacocoReport> {
+      val jacocoTestReports = tasks.withType<JacocoReport> {
         reports {
-          xml.outputLocation.set(file(jacocoXmlReportPath))
           xml.required.set(true)
           csv.required.set(false)
-          html.required.set(false)
+          html.required.set(true)
         }
       }
 
@@ -53,7 +52,7 @@ class KotlinQualityPlugin : Plugin<Project> {
           property("sonar.projectName", project.name)
           property("sonar.sourceEncoding", "UTF-8")
           property("sonar.host.url", extension.sonarUrl)
-          property("sonar.coverage.jacoco.xmlReportPaths", jacocoXmlReportPath)
+          property("sonar.coverage.jacoco.xmlReportPaths", "$buildDir/reports/jacoco/test/jacocoTestReport.xml")
         }
       }
 
@@ -68,7 +67,7 @@ class KotlinQualityPlugin : Plugin<Project> {
       }
 
       tasks.named(BUILD_GROUP) {
-        dependsOn("jacocoTestReport")
+        dependsOn(jacocoTestReports)
       }
     }
   }