Fix merging of JaCoCo reports

This commit is contained in:
Gary Tierney
2018-08-27 02:06:04 +01:00
parent b1a687be34
commit 0f009882af
+12 -15
View File
@@ -1,4 +1,4 @@
apply plugin: 'jacoco' apply plugin: "jacoco"
def jacocoCoverageAggregate = "$buildDir/jacoco/jacocoTestAll.exec" def jacocoCoverageAggregate = "$buildDir/jacoco/jacocoTestAll.exec"
@@ -6,17 +6,14 @@ def testedProjects() {
subprojects.findAll { subproject -> subproject.plugins.hasPlugin('java') || subproject.plugins.hasPlugin('kotlin') } subprojects.findAll { subproject -> subproject.plugins.hasPlugin('java') || subproject.plugins.hasPlugin('kotlin') }
} }
configure(testedProjects()) { gradle.projectsEvaluated {
configure(testedProjects()) {
apply plugin: "jacoco"
jacoco { jacoco {
toolVersion = '0.8.1' toolVersion = '0.8.1'
} }
jacocoTestReport {
sourceDirectories = files(sourceSets.main.allSource.srcDirs)
classDirectories = files(sourceSets.main.output)
}
test { test {
reports { reports {
junitXml.enabled = true junitXml.enabled = true
@@ -28,16 +25,15 @@ configure(testedProjects()) {
destinationFile = file("$buildDir/jacoco/jacocoTest.exec") destinationFile = file("$buildDir/jacoco/jacocoTest.exec")
classDumpDir = file("$buildDir/jacoco/classpathdumps") classDumpDir = file("$buildDir/jacoco/classpathdumps")
} }
} }
} }
task jacocoMerge(type: JacocoMerge) { task jacocoMerge(type: JacocoMerge) {
destinationFile = file(jacocoCoverageAggregate) destinationFile = file(jacocoCoverageAggregate)
executionData = project.fileTree(dir: '.', include: '**/build/jacoco/test.exec') executionData = project.fileTree(dir: '.', include: '**/build/jacoco/jacocoTest.exec')
} }
sonarqube { sonarqube {
properties { properties {
property "sonar.organization", "apollo-rsps" property "sonar.organization", "apollo-rsps"
property "sonar.projectKey", "apollo:org.apollo" property "sonar.projectKey", "apollo:org.apollo"
@@ -45,7 +41,8 @@ sonarqube {
property "sonar.kotlin.file.suffixes", ".kt,.kts" property "sonar.kotlin.file.suffixes", ".kt,.kts"
property "sonar.jacoco.reportPaths", jacocoCoverageAggregate property "sonar.jacoco.reportPaths", jacocoCoverageAggregate
} }
}
tasks["sonarqube"].dependsOn(jacocoMerge)
} }
tasks["sonarqube"].dependsOn(jacocoMerge)