Merge pull request #283 from nrinaudo/fix-2_13_1

Fix Scala 2.13.1 integration
scoverage · Oct 17, 2019 · 8882338 · 8882338
2 parents a3ef750 + 243db3a
commit 8882338
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,8 +9,8 @@ jdk:
 scala:
   - 2.10.7
   - 2.11.12
-  - 2.12.8
-  - 2.13.0
+  - 2.12.10
+  - 2.13.1
 
 before_cache:
   - find "$HOME/.sbt/" -name '*.lock' -print0 | xargs -0 rm

diff --git a/build.sbt b/build.sbt
@@ -11,7 +11,7 @@ val ScalatestVersion = "3.0.8"
 val appSettings = Seq(
     organization := Org,
     scalaVersion := "2.12.8",
-    crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.8", "2.13.0"),
+    crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.10", "2.13.1"),
     fork in Test := false,
     publishMavenStyle := true,
     publishArtifact in Test := false,

diff --git a/scalac-scoverage-plugin/src/test/scala/scoverage/ScoverageCompiler.scala b/scalac-scoverage-plugin/src/test/scala/scoverage/ScoverageCompiler.scala
@@ -69,8 +69,8 @@ object ScoverageCompiler {
   }
 }
 
-class ScoverageCompiler(settings: scala.tools.nsc.Settings, reporter: scala.tools.nsc.reporters.Reporter)
-  extends scala.tools.nsc.Global(settings, reporter) {
+class ScoverageCompiler(settings: scala.tools.nsc.Settings, rep: scala.tools.nsc.reporters.Reporter)
+  extends scala.tools.nsc.Global(settings, rep) {
 
   def addToClassPath(file: File): Unit = {
     settings.classpath.value = settings.classpath.value + File.pathSeparator + file.getAbsolutePath
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,8 +9,8 @@ jdk: @@
     scala:
       - 2.10.7
       - 2.11.12
-      - 2.12.8
-      - 2.13.0
+      - 2.12.10
+      - 2.13.1
     before_cache:
       - find "$HOME/.sbt/" -name '*.lock' -print0 | xargs -0 rm
@@ Expand Down @@