Skip to content

Commit 8882338

Browse files
authored
Merge pull request #283 from nrinaudo/fix-2_13_1
Fix Scala 2.13.1 integration
2 parents a3ef750 + 243db3a commit 8882338

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ jdk:
99
scala:
1010
- 2.10.7
1111
- 2.11.12
12-
- 2.12.8
13-
- 2.13.0
12+
- 2.12.10
13+
- 2.13.1
1414

1515
before_cache:
1616
- find "$HOME/.sbt/" -name '*.lock' -print0 | xargs -0 rm

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ val ScalatestVersion = "3.0.8"
1111
val appSettings = Seq(
1212
organization := Org,
1313
scalaVersion := "2.12.8",
14-
crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.8", "2.13.0"),
14+
crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.10", "2.13.1"),
1515
fork in Test := false,
1616
publishMavenStyle := true,
1717
publishArtifact in Test := false,

scalac-scoverage-plugin/src/test/scala/scoverage/ScoverageCompiler.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ object ScoverageCompiler {
6969
}
7070
}
7171

72-
class ScoverageCompiler(settings: scala.tools.nsc.Settings, reporter: scala.tools.nsc.reporters.Reporter)
73-
extends scala.tools.nsc.Global(settings, reporter) {
72+
class ScoverageCompiler(settings: scala.tools.nsc.Settings, rep: scala.tools.nsc.reporters.Reporter)
73+
extends scala.tools.nsc.Global(settings, rep) {
7474

7575
def addToClassPath(file: File): Unit = {
7676
settings.classpath.value = settings.classpath.value + File.pathSeparator + file.getAbsolutePath

0 commit comments

Comments
 (0)