File tree 2 files changed +5
-3
lines changed
src/main/groovy/org/scoverage
2 files changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -6,7 +6,8 @@ import org.gradle.api.provider.Property
6
6
import org.gradle.api.tasks.Input
7
7
import org.gradle.api.tasks.OutputDirectory
8
8
import org.gradle.api.tasks.TaskAction
9
- import scala.collection.JavaConverters
9
+ // don't use scala.collection.JavaConverters as it breaks backward compatibility with scala 2.11
10
+ import scala.collection.JavaConversions
10
11
import scoverage.IOUtils
11
12
import scoverage.report.CoverageAggregator
12
13
@@ -47,9 +48,9 @@ class ScoverageAggregate extends DefaultTask {
47
48
coverage = CoverageAggregator . aggregate(rootDir, deleteReportsOnAggregation. get())
48
49
} else {
49
50
def reportFiles = dirsToAggregateFrom. get(). collectMany {
50
- JavaConverters . seqAsJavaList(IOUtils . reportFileSearch(it, IOUtils . isReportFile()))
51
+ JavaConversions . seqAsJavaList(IOUtils . reportFileSearch(it, IOUtils . isReportFile()))
51
52
}
52
- coverage = CoverageAggregator . aggregate(JavaConverters . asScalaBuffer(reportFiles), deleteReportsOnAggregation. get())
53
+ coverage = CoverageAggregator . aggregate(JavaConversions . asScalaBuffer(reportFiles), deleteReportsOnAggregation. get())
53
54
}
54
55
55
56
reportDir. get(). deleteDir()
Original file line number Diff line number Diff line change @@ -6,6 +6,7 @@ import org.gradle.api.tasks.CacheableTask
6
6
import org.gradle.api.tasks.Input
7
7
import org.gradle.api.tasks.OutputDirectory
8
8
import org.gradle.api.tasks.TaskAction
9
+ // don't use scala.collection.JavaConverters as it breaks backward compatibility with scala 2.11
9
10
import scala.collection.JavaConversions
10
11
import scala.collection.Seq
11
12
import scala.collection.Set
You can’t perform that action at this time.
0 commit comments