Merge branch 'master' into fix-release-documentation

sksamuel · web-flow · commit 0894dce627f9 · 2020-09-04T20:50:55.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -7,10 +7,9 @@ jdk:
   - openjdk8
 
 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/README.md b/README.md
@@ -194,7 +194,9 @@ 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)
+* Upload report to [Codacy](https://www.codacy.com/): [Documentation](https://support.codacy.com/hc/en-us/articles/207279819-Coverage)
 
 Scoverage support is available for the following tools:
 
diff --git a/build.sbt b/build.sbt
@@ -6,12 +6,12 @@ import sbtcrossproject.CrossProject
 import sbtcrossproject.CrossType
 
 val Org = "org.scoverage"
-val ScalatestVersion = "3.0.8"
+val ScalatestVersion = "3.1.1"
 
 val appSettings = Seq(
     organization := Org,
-    scalaVersion := "2.12.8",
-    crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.8", "2.13.0"),
+    scalaVersion := "2.12.10",
+    crossScalaVersions := Seq("2.11.12", "2.12.10", "2.13.1"),
     fork in Test := false,
     publishMavenStyle := true,
     publishArtifact in Test := false,
@@ -69,43 +69,31 @@ lazy val runtime = CrossProject("scalac-scoverage-runtime", file("scalac-scovera
     .crossType(CrossType.Full)
     .settings(name := "scalac-scoverage-runtime")
     .settings(appSettings: _*)
+    .settings(
+      libraryDependencies += "org.scalatest" %%% "scalatest" % ScalatestVersion % Test
+    )
     .jvmSettings(
-      fork in Test := true,
-      libraryDependencies += "org.scalatest" %% "scalatest" % ScalatestVersion % "test"
+      fork in Test := true
     )
     .jsSettings(
-      libraryDependencies += "org.scalatest" %%% "scalatest" % ScalatestVersion % "test",
       scalaJSStage := FastOptStage
     )
 
 lazy val `scalac-scoverage-runtimeJVM` = runtime.jvm
 lazy val `scalac-scoverage-runtimeJS` = runtime.js
 
 lazy val plugin = Project("scalac-scoverage-plugin", file("scalac-scoverage-plugin"))
-    .dependsOn(`scalac-scoverage-runtimeJVM` % "test")
+    .dependsOn(`scalac-scoverage-runtimeJVM` % Test)
     .settings(name := "scalac-scoverage-plugin")
     .settings(appSettings: _*)
     .settings(
       libraryDependencies ++= Seq(
-        "org.scalatest" %% "scalatest" % ScalatestVersion % "test",
-        "org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided"
+        "org.scala-lang.modules" %% "scala-xml" % "1.2.0",
+        "org.scalatest" %% "scalatest" % ScalatestVersion % Test,
+        "org.scala-lang" % "scala-compiler" % scalaVersion.value % Provided
       )
     )
-    .settings(
-      unmanagedSourceDirectories in Test ++= {
-        CrossVersion.partialVersion(scalaVersion.value) match {
-          case Some((2, scalaMajor)) if scalaMajor > 10 =>
-            Seq((sourceDirectory in Test).value / "scala-2.11+")
-          case _ =>
-            Seq()
-        }
-      },
-      libraryDependencies ++= {
-        CrossVersion.partialVersion(scalaVersion.value) match {
-          case Some((2, scalaMajor)) if scalaMajor > 10 =>
-            Seq("org.scala-lang.modules" %% "scala-xml" % "1.2.0")
-          case _ =>
-            Seq()
-        }
-      }
-    )
+  .settings(
+    unmanagedSourceDirectories in Test += (sourceDirectory in Test).value / "scala-2.11+"
+  )
+
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.8
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -4,6 +4,6 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
 
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.11")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.28")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0")
 
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/plugin.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/plugin.scala
@@ -26,11 +26,11 @@ class ScoveragePlugin(val global: Global) extends Plugin {
 
     for (opt <- opts) {
       if (opt.startsWith("excludedPackages:")) {
-        options.excludedPackages = parseExclusionEntry("excludedPackages", opt)
+        options.excludedPackages = parseExclusionEntry("excludedPackages:", opt)
       } else if (opt.startsWith("excludedFiles:")) {
-        options.excludedFiles = parseExclusionEntry("excludedFiles", opt)
+        options.excludedFiles = parseExclusionEntry("excludedFiles:", opt)
       } else if (opt.startsWith("excludedSymbols:")) {
-        options.excludedSymbols = parseExclusionEntry("excludedSymbols", opt)
+        options.excludedSymbols = parseExclusionEntry("excludedSymbols:", opt)
       } else if (opt.startsWith("dataDir:")) {
         options.dataDir = opt.substring("dataDir:".length)
       } else if (opt.startsWith("extraAfterPhase:") || opt.startsWith("extraBeforePhase:")) {
diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/report/CoberturaXmlWriter.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/report/CoberturaXmlWriter.scala
@@ -31,7 +31,7 @@ class CoberturaXmlWriter(sourceDirectories: Seq[File], outputDir: File) extends
           <line
           number={stmt.line.toString}
           hits={stmt.count.toString}
-          branch="false"/>
+          branch={stmt.branch.toString}/>
       )}
       </lines>
     </method>
@@ -51,7 +51,7 @@ class CoberturaXmlWriter(sourceDirectories: Seq[File], outputDir: File) extends
           <line
           number={stmt.line.toString}
           hits={stmt.count.toString}
-          branch="false"/>
+          branch={stmt.branch.toString}/>
       )}
       </lines>
     </class>
diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/report/CoverageAggregator.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/report/CoverageAggregator.scala
@@ -11,6 +11,9 @@ object CoverageAggregator {
     aggregate(IOUtils.scoverageDataDirsSearch(baseDir))
   }
 
+  // to be used by gradle-scoverage plugin
+  def aggregate(dataDirs: Array[File]): Option[Coverage] = aggregate(dataDirs.toSeq)
+
   def aggregate(dataDirs: Seq[File]): Option[Coverage] = {
     println(s"[info] Found ${dataDirs.size} subproject scoverage data directories [${dataDirs.mkString(",")}]")
     if (dataDirs.size > 0) {
diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala
@@ -10,6 +10,11 @@ import scala.xml.Node
 /** @author Stephen Samuel */
 class ScoverageHtmlWriter(sourceDirectories: Seq[File], outputDir: File, sourceEncoding: Option[String]) extends BaseReportWriter(sourceDirectories, outputDir) {
 
+  // to be used by gradle-scoverage plugin
+  def this (sourceDirectories: Array[File], outputDir: File, sourceEncoding: Option[String]) {
+    this (sourceDirectories.toSeq, outputDir, sourceEncoding)
+  }
+
   // for backward compatibility only
   def this (sourceDirectories: Seq[File], outputDir: File) {
     this(sourceDirectories, outputDir, None);
diff --git a/scalac-scoverage-plugin/src/test/scala-2.10/scoverage/macrosupport/TesterMacro.scala b/scalac-scoverage-plugin/src/test/scala-2.10/scoverage/macrosupport/TesterMacro.scala
diff --git a/scalac-scoverage-plugin/src/test/scala/scoverage/CoberturaXmlWriterTest.scala b/scalac-scoverage-plugin/src/test/scala/scoverage/CoberturaXmlWriterTest.scala
@@ -4,14 +4,15 @@ import java.io.File
 import java.util.UUID
 import javax.xml.parsers.DocumentBuilderFactory
 
-import org.scalatest.{BeforeAndAfter, FunSuite, OneInstancePerTest}
+import org.scalatest.{BeforeAndAfter, OneInstancePerTest}
 import org.xml.sax.{ErrorHandler, SAXParseException}
 import scoverage.report.CoberturaXmlWriter
 
 import scala.xml.XML
+import org.scalatest.funsuite.AnyFunSuite
 
 /** @author Stephen Samuel */
-class CoberturaXmlWriterTest extends FunSuite with BeforeAndAfter with OneInstancePerTest {
+class CoberturaXmlWriterTest extends AnyFunSuite with BeforeAndAfter with OneInstancePerTest {
 
   def tempDir(): File = {
     val dir = new File(IOUtils.getTempDirectory, UUID.randomUUID.toString)
diff --git a/scalac-scoverage-plugin/src/test/scala/scoverage/CoverageAggregatorTest.scala b/scalac-scoverage-plugin/src/test/scala/scoverage/CoverageAggregatorTest.scala
@@ -3,10 +3,11 @@ package scoverage
 import java.io.{File, FileWriter}
 import java.util.UUID
 
-import org.scalatest.{FreeSpec, Matchers}
 import scoverage.report.CoverageAggregator
+import org.scalatest.freespec.AnyFreeSpec
+import org.scalatest.matchers.should.Matchers
 
-class CoverageAggregatorTest extends FreeSpec with Matchers {
+class CoverageAggregatorTest extends AnyFreeSpec with Matchers {
 
   // Let current directory be our source root
   private val sourceRoot = new File(".")
diff --git a/scalac-scoverage-plugin/src/test/scala/scoverage/CoverageMetricsTest.scala b/scalac-scoverage-plugin/src/test/scala/scoverage/CoverageMetricsTest.scala
@@ -1,8 +1,9 @@
 package scoverage
 
-import org.scalatest.{FreeSpec, Matchers}
+import org.scalatest.freespec.AnyFreeSpec
+import org.scalatest.matchers.should.Matchers
 
-class CoverageMetricsTest extends FreeSpec with Matchers {
+class CoverageMetricsTest extends AnyFreeSpec with Matchers {
 
   "no branches with at least one invoked statement should have 100% branch coverage" in {
     val metrics = new CoverageMetrics {
diff --git a/scalac-scoverage-plugin/src/test/scala/scoverage/CoverageTest.scala b/scalac-scoverage-plugin/src/test/scala/scoverage/CoverageTest.scala
@@ -1,9 +1,10 @@
 package scoverage
 
-import org.scalatest.{BeforeAndAfter, FunSuite, OneInstancePerTest}
+import org.scalatest.{BeforeAndAfter, OneInstancePerTest}
+import org.scalatest.funsuite.AnyFunSuite
 
 /** @author Stephen Samuel */
-class CoverageTest extends FunSuite with BeforeAndAfter with OneInstancePerTest {
+class CoverageTest extends AnyFunSuite with BeforeAndAfter with OneInstancePerTest {
 
   test("coverage for no statements is 1") {
     val coverage = Coverage()
diff --git a/scalac-scoverage-plugin/src/test/scala/scoverage/IOUtilsTest.scala b/scalac-scoverage-plugin/src/test/scala/scoverage/IOUtilsTest.scala
@@ -3,10 +3,12 @@ package scoverage
 import java.io.{File, FileWriter}
 import java.util.UUID
 
-import org.scalatest.{FreeSpec, Matchers, OneInstancePerTest}
+import org.scalatest.OneInstancePerTest
+import org.scalatest.freespec.AnyFreeSpec
+import org.scalatest.matchers.should.Matchers
 
 /** @author Stephen Samuel */
-class IOUtilsTest extends FreeSpec with OneInstancePerTest with Matchers {
+class IOUtilsTest extends AnyFreeSpec with OneInstancePerTest with Matchers {
 
   "io utils" - {
     "should parse measurement files" in {
diff --git a/scalac-scoverage-plugin/src/test/scala/scoverage/LocationTest.scala b/scalac-scoverage-plugin/src/test/scala/scoverage/LocationTest.scala
@@ -1,8 +1,9 @@
 package scoverage
 
-import org.scalatest.{FreeSpec, Matchers}
+import org.scalatest.freespec.AnyFreeSpec
+import org.scalatest.matchers.should.Matchers
 
-class LocationTest extends FreeSpec with Matchers {
+class LocationTest extends AnyFreeSpec with Matchers {
 
   "location function" - {
     "should correctly process top level types" - {
diff --git a/scalac-scoverage-plugin/src/test/scala/scoverage/PluginASTSupportTest.scala b/scalac-scoverage-plugin/src/test/scala/scoverage/PluginASTSupportTest.scala
@@ -1,10 +1,11 @@
 package scoverage
 
 import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 
 /** @author Stephen Samuel */
 class PluginASTSupportTest
-  extends FunSuite
+  extends AnyFunSuite
   with OneInstancePerTest
   with BeforeAndAfterEachTestData
   with MacroSupport {
diff --git a/scalac-scoverage-plugin/src/test/scala/scoverage/PluginCoverageTest.scala b/scalac-scoverage-plugin/src/test/scala/scoverage/PluginCoverageTest.scala
@@ -1,10 +1,11 @@
 package scoverage
 
-import org.scalatest.{BeforeAndAfterEachTestData, FunSuite, OneInstancePerTest}
+import org.scalatest.{BeforeAndAfterEachTestData, OneInstancePerTest}
+import org.scalatest.funsuite.AnyFunSuite
 
 /** @author Stephen Samuel */
 class PluginCoverageTest
-  extends FunSuite
+  extends AnyFunSuite
   with OneInstancePerTest
   with BeforeAndAfterEachTestData
   with MacroSupport {
diff --git a/scalac-scoverage-plugin/src/test/scala/scoverage/RegexCoverageFilterTest.scala b/scalac-scoverage-plugin/src/test/scala/scoverage/RegexCoverageFilterTest.scala
@@ -1,11 +1,12 @@
 package scoverage
 
-import org.scalatest.{FreeSpec, Matchers}
 
 import scala.reflect.internal.util.{BatchSourceFile, NoFile, SourceFile}
 import scala.reflect.io.VirtualFile
+import org.scalatest.freespec.AnyFreeSpec
+import org.scalatest.matchers.should.Matchers
 
-class RegexCoverageFilterTest extends FreeSpec with Matchers {
+class RegexCoverageFilterTest extends AnyFreeSpec with Matchers {
 
   "isClassIncluded" - {
 
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
diff --git a/scalac-scoverage-plugin/src/test/scala/scoverage/ScoverageHtmlWriterTest.scala b/scalac-scoverage-plugin/src/test/scala/scoverage/ScoverageHtmlWriterTest.scala
@@ -8,9 +8,9 @@ import scala.xml.XML
 
 import scoverage.report.ScoverageHtmlWriter
 
-import org.scalatest.FunSuite
+import org.scalatest.funsuite.AnyFunSuite
 
-class ScoverageHtmlWriterTest extends FunSuite {
+class ScoverageHtmlWriterTest extends AnyFunSuite {
 
   val rootDirForClasses = new File(getClass.getResource("forHtmlWriter/src/main/scala/").getFile)
 
diff --git a/scalac-scoverage-plugin/src/test/scala/scoverage/SerializerTest.scala b/scalac-scoverage-plugin/src/test/scala/scoverage/SerializerTest.scala
@@ -2,9 +2,10 @@ package scoverage
 
 import java.io.StringWriter
 
-import org.scalatest.{OneInstancePerTest, FunSuite}
+import org.scalatest.OneInstancePerTest
+import org.scalatest.funsuite.AnyFunSuite
 
-class SerializerTest extends FunSuite with OneInstancePerTest {
+class SerializerTest extends AnyFunSuite with OneInstancePerTest {
 
   test("coverage should be serializable into plain text") {
     val coverage = Coverage()
diff --git a/scalac-scoverage-runtime/js/src/main/scala/scalajssupport/File.scala b/scalac-scoverage-runtime/js/src/main/scala/scalajssupport/File.scala
@@ -56,9 +56,20 @@ class File(path: String) {
 }
 
 object File {
-  val jsFile: JsFileObject = if (js.Dynamic.global.hasOwnProperty("Packages").asInstanceOf[Boolean])
+  val globalObject: js.Dynamic = {
+    import js.Dynamic.{global => g}
+    if (js.typeOf(g.global) != "undefined" && (g.global.Object eq g.Object)) {
+      // Node.js environment detected
+      g.global
+    } else {
+      // In all other well-known environment, we can use the global `this`
+      js.special.fileLevelThis.asInstanceOf[js.Dynamic]
+    }
+  }
+
+  val jsFile: JsFileObject = if (globalObject.hasOwnProperty("Packages").asInstanceOf[Boolean])
     RhinoFile
-  else if (!js.Dynamic.global.hasOwnProperty("window").asInstanceOf[Boolean])
+  else if (!globalObject.hasOwnProperty("window").asInstanceOf[Boolean])
     NodeFile
   else
     PhantomFile
diff --git a/scalac-scoverage-runtime/js/src/main/scala/scalajssupport/PhantomFile.scala b/scalac-scoverage-runtime/js/src/main/scala/scalajssupport/PhantomFile.scala
@@ -72,9 +72,7 @@ private[scalajssupport] object PhantomFile extends JsFileObject {
   def removeDirectory(path: String): Boolean = fsCall("removeDirectory", path).asInstanceOf[Boolean]
   val separator: String = fsCall("separator").asInstanceOf[String]
   def write(path: String, content: String, mode: String): Unit = fsCallArray("write", js.Array(path, content, mode))
-  def pathJoin(path: String, child: String): String = {
-    return path + separator + child
-  }
+  def pathJoin(path: String, child: String): String = path + separator + child
 
   def apply(path: String) = {
     new PhantomFile(path)
diff --git a/scalac-scoverage-runtime/jvm/src/test/scala/scoverage/InvokerConcurrencyTest.scala b/scalac-scoverage-runtime/jvm/src/test/scala/scoverage/InvokerConcurrencyTest.scala
@@ -3,15 +3,16 @@ package scoverage
 import java.io.File
 import java.util.concurrent.Executors
 
-import org.scalatest.{BeforeAndAfter, FunSuite}
+import org.scalatest.BeforeAndAfter
 
 import scala.concurrent._
 import scala.concurrent.duration._
+import org.scalatest.funsuite.AnyFunSuite
 
 /**
  * Verify that [[Invoker.invoked()]] is thread-safe
  */
-class InvokerConcurrencyTest extends FunSuite with BeforeAndAfter {
+class InvokerConcurrencyTest extends AnyFunSuite with BeforeAndAfter {
 
   implicit val executor = ExecutionContext.fromExecutor(Executors.newFixedThreadPool(8))
 
diff --git a/scalac-scoverage-runtime/shared/src/main/scala/scoverage/Invoker.scala b/scalac-scoverage-runtime/shared/src/main/scala/scoverage/Invoker.scala
diff --git a/scalac-scoverage-runtime/shared/src/test/scala/scoverage/InvokerMultiModuleTest.scala b/scalac-scoverage-runtime/shared/src/test/scala/scoverage/InvokerMultiModuleTest.scala
diff --git a/version.sbt b/version.sbt

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@ object CoverageAggregator {`
`11`	`11`	`aggregate(IOUtils.scoverageDataDirsSearch(baseDir))`
`12`	`12`	`}`
`13`	`13`
	`14`	`+ // to be used by gradle-scoverage plugin`
	`15`	`+ def aggregate(dataDirs: Array[File]): Option[Coverage] = aggregate(dataDirs.toSeq)`
	`16`	`+`
`14`	`17`	`def aggregate(dataDirs: Seq[File]): Option[Coverage] = {`
`15`	`18`	`println(s"[info] Found ${dataDirs.size} subproject scoverage data directories [${dataDirs.mkString(",")}]")`
`16`	`19`	`if (dataDirs.size > 0) {`