Add support for Scala 2.13

src/functionalTest/java/org.scoverage/ScalaMultiModuleCrossVersionTest.java

@@ -20,9 +20,11 @@ public void checkAndAggregateScoverage() throws Exception {
         result.assertTaskSkipped(ScoveragePlugin.getREPORT_NAME());
         result.assertTaskSucceeded("2_11:" + ScoveragePlugin.getREPORT_NAME());
         result.assertTaskSucceeded("2_12:" + ScoveragePlugin.getREPORT_NAME());
+        result.assertTaskSucceeded("2_13:" + ScoveragePlugin.getREPORT_NAME());
         result.assertTaskSucceeded(ScoveragePlugin.getCHECK_NAME());
         result.assertTaskSucceeded("2_11:" + ScoveragePlugin.getCHECK_NAME());
         result.assertTaskSucceeded("2_12:" + ScoveragePlugin.getCHECK_NAME());
+        result.assertTaskSucceeded("2_13:" + ScoveragePlugin.getCHECK_NAME());
         result.assertTaskSucceeded(ScoveragePlugin.getAGGREGATE_NAME());
 
         assertAllReportFilesExist();
@@ -33,6 +35,7 @@ private void assertAllReportFilesExist() {
 
         assert211ReportFilesExist();
         assert212ReportFilesExist();
+        assert213ReportFilesExist();
         assertAggregationFilesExist();
     }
 
@@ -41,6 +44,7 @@ private void assertAggregationFilesExist() {
         Assert.assertTrue(resolve(reportDir(), "index.html").exists());
         Assert.assertTrue(resolve(reportDir(), "2_11/src/main/scala/org/hello/World211.scala.html").exists());
         Assert.assertTrue(resolve(reportDir(), "2_12/src/main/scala/org/hello/World212.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "2_13/src/main/scala/org/hello/World213.scala.html").exists());
     }
 
     private void assert211ReportFilesExist() {
@@ -56,4 +60,11 @@ private void assert212ReportFilesExist() {
         Assert.assertTrue(resolve(reportDir, "index.html").exists());
         Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/World212.scala.html").exists());
     }
+
+    private void assert213ReportFilesExist() {
+
+        File reportDir = reportDir(projectDir().toPath().resolve("2_13").toFile());
+        Assert.assertTrue(resolve(reportDir, "index.html").exists());
+        Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/World213.scala.html").exists());
+    }
 }

src/functionalTest/java/org.scoverage/ScalaSingleModuleTest.java

@@ -133,15 +133,6 @@ public void reportScoverageWithoutNormalCompilationAndWithExcludedClasses() thro
         Assert.assertFalse(resolve(buildDir(), "classes/scala/scoverage/org/hello/World.class").exists());
     }
 
-    @Test
-    public void reportScoverageUnder2_11() throws Exception {
-        run("clean", ScoveragePlugin.getREPORT_NAME(),
-                "-PscalaVersionMinor=11",
-                "-PscalaVersionBuild=8",
-                "-Pscoverage.scoverageScalaVersion=2_11");
-        assertReportFilesExist();
-    }
-
     private void assertReportFilesExist() {
 
         Assert.assertTrue(resolve(reportDir(), "index.html").exists());

src/functionalTest/java/org.scoverage/ScoverageFunctionalTest.java

@@ -122,7 +122,7 @@ private void configureArguments(String... arguments) {
         fullArguments.add("-PscalaVersionBuild=8");
         fullArguments.add("-PjunitVersion=5.3.2");
         fullArguments.add("-PjunitPlatformVersion=1.3.2");
-        fullArguments.add("-PscalatestVersion=3.0.5");
+        fullArguments.add("-PscalatestVersion=3.0.8");
         fullArguments.addAll(Arrays.asList(arguments));
 
         runner.withArguments(fullArguments);

src/functionalTest/resources/projects/scala-multi-module-cross-version/2_11/build.gradle

@@ -1,4 +1,4 @@
 dependencies {
-    compile group: 'org.scala-lang', name: 'scala-library', version: "2.11.12"
+    compile group: 'org.scala-lang', name: 'scala-library', version: "2.11.8"
     testCompile group: 'org.scalatest', name: "scalatest_2.11", version: scalatestVersion
 }

src/functionalTest/resources/projects/scala-multi-module-cross-version/2_13/build.gradle

@@ -0,0 +1,4 @@
+dependencies {
+    compile group: 'org.scala-lang', name: 'scala-library', version: "2.13.0"
+    testCompile group: 'org.scalatest', name: "scalatest_2.13", version: scalatestVersion
+}

src/functionalTest/resources/projects/scala-multi-module-cross-version/2_13/src/main/scala/org/hello/World213.scala

@@ -0,0 +1,9 @@
+package org.hello
+
+class World213 {
+
+  def foo(): String = {
+    val s = "2" + "13"
+    s
+  }
+}

src/functionalTest/resources/projects/scala-single-multi-lang-module/src/test/scala/org/hello/TestNothingSuite.scala → src/functionalTest/resources/projects/scala-multi-module-cross-version/2_13/src/test/scala/org/hello/World213Suite.scala

@@ -5,8 +5,9 @@ import org.scalatest.FunSuite
 import org.scalatest.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
-class TestNothingSuite extends FunSuite {
+class World213Suite extends FunSuite {
 
-  test("nothing") {
+  test("foo") {
+    new World213().foo()
   }
-}
+}

src/functionalTest/resources/projects/scala-multi-module-cross-version/build.gradle

@@ -33,4 +33,5 @@ scoverage {
     minimumRate = 0.5
 }
 
-project(":2_11").tasks.reportScoverage.mustRunAfter(project(":2_12").tasks.reportScoverage)
+project(":2_11").tasks.reportScoverage.mustRunAfter(project(":2_12").tasks.reportScoverage)
+project(":2_12").tasks.reportScoverage.mustRunAfter(project(":2_13").tasks.reportScoverage)

src/functionalTest/resources/projects/scala-multi-module-cross-version/settings.gradle

@@ -1 +1 @@
-include '2_11', '2_12'
+include '2_11', '2_12', '2_13'

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

@@ -6,8 +6,8 @@ import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
-// don't use scala.collection.JavaConverters as it breaks backward compatibility with scala 2.11
-import scala.collection.JavaConversions
+// don't use scala.collection.JavaConversions as it doesn't exist in Scala 2.13
+import scala.collection.JavaConverters
 import scoverage.IOUtils
 import scoverage.report.CoverageAggregator
 
@@ -48,9 +48,9 @@ class ScoverageAggregate extends DefaultTask {
                 coverage = CoverageAggregator.aggregate(rootDir, deleteReportsOnAggregation.get())
             } else {
                 def reportFiles = dirsToAggregateFrom.get().collectMany {
-                    JavaConversions.seqAsJavaList(IOUtils.reportFileSearch(it, IOUtils.isReportFile()))
+                    JavaConverters.seqAsJavaList(IOUtils.reportFileSearch(it, IOUtils.isReportFile()))
                 }
-                coverage = CoverageAggregator.aggregate(JavaConversions.asScalaBuffer(reportFiles), deleteReportsOnAggregation.get())
+                coverage = CoverageAggregator.aggregate(JavaConverters.asScalaBuffer(reportFiles), deleteReportsOnAggregation.get())
             }
 
             reportDir.get().deleteDir()

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

@@ -6,8 +6,8 @@ import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
-// don't use scala.collection.JavaConverters as it breaks backward compatibility with scala 2.11
-import scala.collection.JavaConversions
+// don't use scala.collection.JavaConversions as it doesn't exist in Scala 2.13
+import scala.collection.JavaConverters
 import scala.collection.Seq
 import scala.collection.Set
 import scoverage.Coverage
@@ -48,7 +48,7 @@ class ScoverageReport extends DefaultTask {
                 project.logger.info("[scoverage] Could not find coverage file, skipping...")
             } else {
                 File[] array = IOUtils.findMeasurementFiles(dataDir.get())
-                Seq<File> measurementFiles = JavaConversions.asScalaBuffer(Arrays.asList(array))
+                Seq<File> measurementFiles = JavaConverters.asScalaBuffer(Arrays.asList(array)).toSeq()
 
                 Coverage coverage = Serializer.deserialize(coverageFile)