Fixed aggregate task concurrent access

dylanowen · dylanowen · commit 00b4edefc24c · 2025-10-08T12:06:30.000-07:00
diff --git a/src/main/groovy/org/scoverage/ScoveragePlugin.groovy b/src/main/groovy/org/scoverage/ScoveragePlugin.groovy
@@ -298,10 +298,8 @@ class ScoveragePlugin implements Plugin<PluginAware> {
                             it.logger.warn("Scala sub-project '${it.name}' doesn't have Scoverage applied and will be ignored in parent project aggregation")
                         }
                     }
-                    def childReportTasks = project.subprojects.findResults {
-                        it.tasks.find { task ->
-                            task.name == REPORT_NAME && task instanceof ScoverageAggregate
-                        }
+                    def childReportTasks = project.subprojects.collectMany {
+                        it.tasks.withType(ScoverageAggregate).matching { it.name == REPORT_NAME }
                     }
                     def allReportTasks = childReportTasks + globalReportTask.get()
                     def allSources = project.objects.fileCollection()

Original file line number	Diff line number	Diff line change
`@@ -298,10 +298,8 @@ class ScoveragePlugin implements Plugin<PluginAware> {`
`298`	`298`	`it.logger.warn("Scala sub-project '${it.name}' doesn't have Scoverage applied and will be ignored in parent project aggregation")`
`299`	`299`	`}`
`300`	`300`	`}`
`301`		`- def childReportTasks = project.subprojects.findResults {`
`302`		`- it.tasks.find { task ->`
`303`		`- task.name == REPORT_NAME && task instanceof ScoverageAggregate`
`304`		`- }`
	`301`	`+ def childReportTasks = project.subprojects.collectMany {`
	`302`	`+ it.tasks.withType(ScoverageAggregate).matching { it.name == REPORT_NAME }`
`305`	`303`	`}`
`306`	`304`	`def allReportTasks = childReportTasks + globalReportTask.get()`
`307`	`305`	`def allSources = project.objects.fileCollection()`