From e2f9bbc0051bd45e64856f8ed16e57689632330e Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 18 Sep 2019 20:17:41 +0100 Subject: [PATCH] fix issue with compiling for scala 2.13.1 --- .travis.yml | 2 +- build.sbt | 2 +- .../src/test/scala/scoverage/ScoverageCompiler.scala | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 95cfe29a..f07fd159 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ scala: - 2.10.7 - 2.11.12 - 2.12.8 - - 2.13.0 + - 2.13.1 before_cache: - find "$HOME/.sbt/" -name '*.lock' -print0 | xargs -0 rm diff --git a/build.sbt b/build.sbt index c308b42e..12b85575 100644 --- 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.8", "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 index 7a8e403b..9c147bf2 100644 --- 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, nscReporter: scala.tools.nsc.reporters.Reporter) + extends scala.tools.nsc.Global(settings, nscReporter) { def addToClassPath(file: File): Unit = { settings.classpath.value = settings.classpath.value + File.pathSeparator + file.getAbsolutePath @@ -99,7 +99,7 @@ class ScoverageCompiler(settings: scala.tools.nsc.Settings, reporter: scala.tool compileSourceFiles(urls.map(_.getFile).map(new File(_)): _*) } - def assertNoErrors() = assert(!reporter.hasErrors, "There are compilation errors") + def assertNoErrors() = assert(!nscReporter.hasErrors, "There are compilation errors") def assertNoCoverage() = assert(!testStore.sources.mkString(" ").contains(s"scoverage.Invoker.invoked"), "There are scoverage.Invoker.invoked instructions added to the code")