File tree 2 files changed +7
-7
lines changed
src/main/groovy/org/scoverage
2 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -6,8 +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
- // 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
11
11
import scoverage.IOUtils
12
12
import scoverage.report.CoverageAggregator
13
13
@@ -48,9 +48,9 @@ class ScoverageAggregate extends DefaultTask {
48
48
coverage = CoverageAggregator . aggregate(rootDir, deleteReportsOnAggregation. get())
49
49
} else {
50
50
def reportFiles = dirsToAggregateFrom. get(). collectMany {
51
- JavaConversions . seqAsJavaList(IOUtils . reportFileSearch(it, IOUtils . isReportFile()))
51
+ JavaConverters . seqAsJavaList(IOUtils . reportFileSearch(it, IOUtils . isReportFile()))
52
52
}
53
- coverage = CoverageAggregator . aggregate(JavaConversions . asScalaBuffer(reportFiles), deleteReportsOnAggregation. get())
53
+ coverage = CoverageAggregator . aggregate(JavaConverters . asScalaBuffer(reportFiles), deleteReportsOnAggregation. get())
54
54
}
55
55
56
56
reportDir. get(). deleteDir()
Original file line number Diff line number Diff line change @@ -6,8 +6,8 @@ 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
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
11
11
import scala.collection.Seq
12
12
import scala.collection.Set
13
13
import scoverage.Coverage
@@ -48,7 +48,7 @@ class ScoverageReport extends DefaultTask {
48
48
project. logger. info(" [scoverage] Could not find coverage file, skipping..." )
49
49
} else {
50
50
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( )
52
52
53
53
Coverage coverage = Serializer . deserialize(coverageFile)
54
54
You can’t perform that action at this time.
0 commit comments