File tree Expand file tree Collapse file tree 1 file changed +6
-6
lines changed
src/main/groovy/com/vanniktech/android/junit/jacoco Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -89,9 +89,9 @@ class GenerationPlugin implements Plugin<Project> {
89
89
mergeTask. executionData. setFrom(executionData. files + mergeTask. executionData. files)
90
90
}
91
91
if (mergedReportTask != null ) {
92
- mergedReportTask. classDirectories. setFrom(classDirectories. files + mergedReportTask. classDirectories. files )
93
- mergedReportTask. additionalSourceDirs. setFrom(additionalSourceDirs. files + mergedReportTask. additionalSourceDirs. files )
94
- mergedReportTask. sourceDirectories. setFrom(sourceDirectories. files + mergedReportTask. sourceDirectories. files )
92
+ mergedReportTask. classDirectories. setFrom(classDirectories. getFrom() + mergedReportTask. classDirectories. getFrom() )
93
+ mergedReportTask. additionalSourceDirs. setFrom(additionalSourceDirs. getFrom() + mergedReportTask. additionalSourceDirs. getFrom() )
94
+ mergedReportTask. sourceDirectories. setFrom(sourceDirectories. getFrom() + mergedReportTask. sourceDirectories. getFrom() )
95
95
}
96
96
}
97
97
@@ -248,9 +248,9 @@ class GenerationPlugin implements Plugin<Project> {
248
248
mergeTask. executionData. setFrom(executionData. files + mergeTask. executionData. files)
249
249
}
250
250
if (mergedReportTask != null && addToMergeTask) {
251
- mergedReportTask. classDirectories. setFrom(classDirectories. files + mergedReportTask. classDirectories. files )
252
- mergedReportTask. additionalSourceDirs. setFrom(additionalSourceDirs. files + mergedReportTask. additionalSourceDirs. files )
253
- mergedReportTask. sourceDirectories. setFrom(sourceDirectories. files + mergedReportTask. sourceDirectories. files )
251
+ mergedReportTask. classDirectories. setFrom(classDirectories. getFrom() + mergedReportTask. classDirectories. getFrom() )
252
+ mergedReportTask. additionalSourceDirs. setFrom(additionalSourceDirs. getFrom() + mergedReportTask. additionalSourceDirs. getFrom() )
253
+ mergedReportTask. sourceDirectories. setFrom(sourceDirectories. getFrom() + mergedReportTask. sourceDirectories. getFrom() )
254
254
}
255
255
}
256
256
You can’t perform that action at this time.
0 commit comments