Fix StackOverflowError with Gradle 5.0 regarding FileCollection (#151)

Laimiux · vanniktech · commit da3ab146b510 · 2019-02-26T10:30:26.000+01:00
Fixing issue discussed in: #136
diff --git a/src/main/groovy/com/vanniktech/android/junit/jacoco/GenerationPlugin.groovy b/src/main/groovy/com/vanniktech/android/junit/jacoco/GenerationPlugin.groovy
@@ -88,9 +88,9 @@ class GenerationPlugin implements Plugin<Project> {
                 mergeTask.executionData += executionData
             }
             if (mergedReportTask != null) {
-                mergedReportTask.classDirectories += classDirectories
-                mergedReportTask.additionalSourceDirs += additionalSourceDirs
-                mergedReportTask.sourceDirectories += sourceDirectories
+                mergedReportTask.classDirectories.setFrom(classDirectories.files + mergedReportTask.classDirectories.files)
+                mergedReportTask.additionalSourceDirs.setFrom(additionalSourceDirs.files + mergedReportTask.additionalSourceDirs.files)
+                mergedReportTask.sourceDirectories.setFrom(sourceDirectories.files + mergedReportTask.sourceDirectories.files)
             }
         }
 
@@ -247,9 +247,9 @@ class GenerationPlugin implements Plugin<Project> {
                 mergeTask.executionData += executionData
             }
             if (mergedReportTask != null && addToMergeTask) {
-                mergedReportTask.classDirectories += classDirectories
-                mergedReportTask.additionalSourceDirs += additionalSourceDirs
-                mergedReportTask.sourceDirectories += sourceDirectories
+                mergedReportTask.classDirectories.setFrom(classDirectories.files + mergedReportTask.classDirectories.files)
+                mergedReportTask.additionalSourceDirs.setFrom(additionalSourceDirs.files + mergedReportTask.additionalSourceDirs.files)
+                mergedReportTask.sourceDirectories.setFrom(sourceDirectories.files + mergedReportTask.sourceDirectories.files)
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -88,9 +88,9 @@ class GenerationPlugin implements Plugin<Project> {`
`88`	`88`	`mergeTask.executionData += executionData`
`89`	`89`	`}`
`90`	`90`	`if (mergedReportTask != null) {`
`91`		`- mergedReportTask.classDirectories += classDirectories`
`92`		`- mergedReportTask.additionalSourceDirs += additionalSourceDirs`
`93`		`- mergedReportTask.sourceDirectories += sourceDirectories`
	`91`	`+ mergedReportTask.classDirectories.setFrom(classDirectories.files + mergedReportTask.classDirectories.files)`
	`92`	`+ mergedReportTask.additionalSourceDirs.setFrom(additionalSourceDirs.files + mergedReportTask.additionalSourceDirs.files)`
	`93`	`+ mergedReportTask.sourceDirectories.setFrom(sourceDirectories.files + mergedReportTask.sourceDirectories.files)`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
`@@ -247,9 +247,9 @@ class GenerationPlugin implements Plugin<Project> {`
`247`	`247`	`mergeTask.executionData += executionData`
`248`	`248`	`}`
`249`	`249`	`if (mergedReportTask != null && addToMergeTask) {`
`250`		`- mergedReportTask.classDirectories += classDirectories`
`251`		`- mergedReportTask.additionalSourceDirs += additionalSourceDirs`
`252`		`- mergedReportTask.sourceDirectories += sourceDirectories`
	`250`	`+ mergedReportTask.classDirectories.setFrom(classDirectories.files + mergedReportTask.classDirectories.files)`
	`251`	`+ mergedReportTask.additionalSourceDirs.setFrom(additionalSourceDirs.files + mergedReportTask.additionalSourceDirs.files)`
	`252`	`+ mergedReportTask.sourceDirectories.setFrom(sourceDirectories.files + mergedReportTask.sourceDirectories.files)`
`253`	`253`	`}`
`254`	`254`	`}`
`255`	`255`