Make createCombinedReport to depend only on checkCoverage tasks.

yifanyang · yifanyang · commit ec077b4a3eca · 2019-12-09T13:36:32.000-08:00
diff --git a/tools/measurement/coverage/coverage.gradle b/tools/measurement/coverage/coverage.gradle
@@ -35,7 +35,7 @@ task uploadCoverageMeasurements(type: UploadMeasurementsTask) {
 }
 
 /* Creates a combined jacoco coverage reports of all products. */
-def jacocoReportTasks = rootProject.subprojects.tasks*.withType(JacocoReport)*.toArray().flatten()
+def jacocoReportTasks = rootProject.subprojects.tasks*.getAt("checkCoverage")
 task createCombinedReport(type: JacocoReport) {
     mustRunAfter jacocoReportTasks
     classDirectories = files(jacocoReportTasks.classDirectories)

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ task uploadCoverageMeasurements(type: UploadMeasurementsTask) {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`/* Creates a combined jacoco coverage reports of all products. */`
`38`		`-def jacocoReportTasks = rootProject.subprojects.tasks.withType(JacocoReport).toArray().flatten()`
	`38`	`+def jacocoReportTasks = rootProject.subprojects.tasks*.getAt("checkCoverage")`
`39`	`39`	`task createCombinedReport(type: JacocoReport) {`
`40`	`40`	`mustRunAfter jacocoReportTasks`
`41`	`41`	`classDirectories = files(jacocoReportTasks.classDirectories)`