Add coverage reports to include them in sonar upload

wmontwe · wmontwe · commit 6cda711fab5f · 2022-11-23T19:41:54.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -28,7 +28,9 @@ reportConfig {
     sonarOrganization.set("bitfunk")
     coverageReportSourceDirs.set(
         listOf(
-            "$projectDir/plugin-development/build/reports/jacoco/testCodeCoverageReport",
+            "$projectDir/plugin-development/gradle-test-util/build/reports/jacoco/testCodeCoverageReport",
+            "$projectDir/plugin-development/gradle-plugin-convention/build/reports/jacoco/testCodeCoverageReport",
+            "$projectDir/plugin-development/version-catalog-accessor/build/reports/jacoco/testCodeCoverageReport",
             "$projectDir/plugins/build/reports/jacoco/testCodeCoverageReport"
         )
     )
diff --git a/plugin-development/gradle-plugin-convention/build.gradle.kts b/plugin-development/gradle-plugin-convention/build.gradle.kts
@@ -29,6 +29,7 @@ plugins {
     alias(libsPluginConvention.plugins.binaryCompatibilityValidator)
     alias(libsPluginConvention.plugins.mavenPublishPlugin)
     alias(libsPluginConvention.plugins.versionCatalogAccessor)
+    id("jacoco-report-aggregation")
 }
 
 group = "eu.bitfunk.gradle.plugin.development.convention"
diff --git a/plugin-development/gradle-test-util/build.gradle.kts b/plugin-development/gradle-test-util/build.gradle.kts
@@ -27,6 +27,7 @@ plugins {
     jacoco
     alias(libsGradleTestUtil.plugins.binaryCompatibilityValidator)
     alias(libsGradleTestUtil.plugins.gradleMavenPublishPlugin)
+    id("jacoco-report-aggregation")
 }
 
 group = "eu.bitfunk.gradle.plugin.development.test"
diff --git a/plugin-development/version-catalog-accessor/build.gradle.kts b/plugin-development/version-catalog-accessor/build.gradle.kts
@@ -19,6 +19,7 @@
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libsCatalogAccessor.plugins.gradlePluginConvention)
+    id("jacoco-report-aggregation")
 }
 
 group = "eu.bitfunk.gradle.plugin.development"

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,9 @@ reportConfig {`
`28`	`28`	`sonarOrganization.set("bitfunk")`
`29`	`29`	`coverageReportSourceDirs.set(`
`30`	`30`	`listOf(`
`31`		`- "$projectDir/plugin-development/build/reports/jacoco/testCodeCoverageReport",`
	`31`	`+ "$projectDir/plugin-development/gradle-test-util/build/reports/jacoco/testCodeCoverageReport",`
	`32`	`+ "$projectDir/plugin-development/gradle-plugin-convention/build/reports/jacoco/testCodeCoverageReport",`
	`33`	`+ "$projectDir/plugin-development/version-catalog-accessor/build/reports/jacoco/testCodeCoverageReport",`
`32`	`34`	`"$projectDir/plugins/build/reports/jacoco/testCodeCoverageReport"`
`33`	`35`	`)`
`34`	`36`	`)`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ plugins {`
`29`	`29`	`alias(libsPluginConvention.plugins.binaryCompatibilityValidator)`
`30`	`30`	`alias(libsPluginConvention.plugins.mavenPublishPlugin)`
`31`	`31`	`alias(libsPluginConvention.plugins.versionCatalogAccessor)`
	`32`	`+ id("jacoco-report-aggregation")`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`group = "eu.bitfunk.gradle.plugin.development.convention"`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ plugins {`
`27`	`27`	`jacoco`
`28`	`28`	`alias(libsGradleTestUtil.plugins.binaryCompatibilityValidator)`
`29`	`29`	`alias(libsGradleTestUtil.plugins.gradleMavenPublishPlugin)`
	`30`	`+ id("jacoco-report-aggregation")`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`group = "eu.bitfunk.gradle.plugin.development.test"`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`@Suppress("DSL_SCOPE_VIOLATION")`
`20`	`20`	`plugins {`
`21`	`21`	`alias(libsCatalogAccessor.plugins.gradlePluginConvention)`
	`22`	`+ id("jacoco-report-aggregation")`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`group = "eu.bitfunk.gradle.plugin.development"`