Merge remote-tracking branch 'upstream/master' into fix-196

Author: exoego

.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

README.md

@@ -193,6 +193,7 @@ project you will need to use one of the build plugins:
 * [sbt-scoverage](https://github.com/scoverage/sbt-scoverage)
 * [gradle-scoverage](https://github.com/scoverage/gradle-scoverage)
 * [sbt-coveralls](https://github.com/scoverage/sbt-coveralls)
+* [mill-contrib-scoverage](https://www.lihaoyi.com/mill/page/contrib-modules.html#scoverage)
 * Upload report to [Codecov](https://codecov.io): [Example Scala Repository](https://github.com/codecov/example-scala)
 
 Scoverage support is available for the following tools:

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,

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

@@ -78,8 +78,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

version.sbt

@@ -1 +1 @@
-version in ThisBuild := "1.4.1-SNAPSHOT"
+version in ThisBuild := "1.4.2-SNAPSHOT"