Skip to content

Commit 8338469

Browse files
committed
Move from JavaConversions to JavaConverters as it is not available in Scala 2.13
1 parent affa56f commit 8338469

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +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-
// don't use scala.collection.JavaConverters as it breaks backward compatibility with scala 2.11
10-
import scala.collection.JavaConversions
9+
// don't use scala.collection.JavaConversions as it doesn't exist in Scala 2.13
10+
import scala.collection.JavaConverters
1111
import scoverage.IOUtils
1212
import scoverage.report.CoverageAggregator
1313

@@ -48,9 +48,9 @@ class ScoverageAggregate extends DefaultTask {
4848
coverage = CoverageAggregator.aggregate(rootDir, deleteReportsOnAggregation.get())
4949
} else {
5050
def reportFiles = dirsToAggregateFrom.get().collectMany {
51-
JavaConversions.seqAsJavaList(IOUtils.reportFileSearch(it, IOUtils.isReportFile()))
51+
JavaConverters.seqAsJavaList(IOUtils.reportFileSearch(it, IOUtils.isReportFile()))
5252
}
53-
coverage = CoverageAggregator.aggregate(JavaConversions.asScalaBuffer(reportFiles), deleteReportsOnAggregation.get())
53+
coverage = CoverageAggregator.aggregate(JavaConverters.asScalaBuffer(reportFiles), deleteReportsOnAggregation.get())
5454
}
5555

5656
reportDir.get().deleteDir()

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ 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
10-
import scala.collection.JavaConversions
9+
// don't use scala.collection.JavaConversions as it doesn't exist in Scala 2.13
10+
import scala.collection.JavaConverters
1111
import scala.collection.Seq
1212
import scala.collection.Set
1313
import scoverage.Coverage
@@ -48,7 +48,7 @@ class ScoverageReport extends DefaultTask {
4848
project.logger.info("[scoverage] Could not find coverage file, skipping...")
4949
} else {
5050
File[] array = IOUtils.findMeasurementFiles(dataDir.get())
51-
Seq<File> measurementFiles = JavaConversions.asScalaBuffer(Arrays.asList(array))
51+
Seq<File> measurementFiles = JavaConverters.asScalaBuffer(Arrays.asList(array)).toSeq()
5252

5353
Coverage coverage = Serializer.deserialize(coverageFile)
5454

0 commit comments

Comments
 (0)