Skip to content

Commit e51a7a9

Browse files
author
Oleksii Lisikh
committed
Issue #102: Use deprecated JavaConversions to maintain backward compatibility with Scala 2.11
1 parent 5ae6b76 commit e51a7a9

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/main/groovy/org/scoverage/ScoverageAggregate.groovy

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import org.gradle.api.provider.Property
66
import org.gradle.api.tasks.Input
77
import org.gradle.api.tasks.OutputDirectory
88
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
1011
import scoverage.IOUtils
1112
import scoverage.report.CoverageAggregator
1213

@@ -47,9 +48,9 @@ class ScoverageAggregate extends DefaultTask {
4748
coverage = CoverageAggregator.aggregate(rootDir, deleteReportsOnAggregation.get())
4849
} else {
4950
def reportFiles = dirsToAggregateFrom.get().collectMany {
50-
JavaConverters.seqAsJavaList(IOUtils.reportFileSearch(it, IOUtils.isReportFile()))
51+
JavaConversions.seqAsJavaList(IOUtils.reportFileSearch(it, IOUtils.isReportFile()))
5152
}
52-
coverage = CoverageAggregator.aggregate(JavaConverters.asScalaBuffer(reportFiles), deleteReportsOnAggregation.get())
53+
coverage = CoverageAggregator.aggregate(JavaConversions.asScalaBuffer(reportFiles), deleteReportsOnAggregation.get())
5354
}
5455

5556
reportDir.get().deleteDir()

src/main/groovy/org/scoverage/ScoverageReport.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import org.gradle.api.tasks.CacheableTask
66
import org.gradle.api.tasks.Input
77
import org.gradle.api.tasks.OutputDirectory
88
import org.gradle.api.tasks.TaskAction
9+
// don't use scala.collection.JavaConverters as it breaks backward compatibility with scala 2.11
910
import scala.collection.JavaConversions
1011
import scala.collection.Seq
1112
import scala.collection.Set

0 commit comments

Comments
 (0)