ScoverageCompiler refactoring to support SJS

build.sbt

@@ -161,7 +161,7 @@ lazy val plugin =
  .settings(
  Test / unmanagedSourceDirectories += (Test / sourceDirectory).value / "scala-2.12+"
  )
- .dependsOn(domain, reporter % "test->compile", serializer)
+ .dependsOn(domain, reporter % "test->compile", serializer, buildInfo % Test)
 
 lazy val reporter =
  project
@@ -182,6 +182,15 @@ lazy val reporter =
  )
  .dependsOn(domain, serializer)
 
+lazy val buildInfo =
+ project
+ .settings(
+ buildInfoKeys += BuildInfoKey("scalaJSVersion", scalaJSVersion),
+ publishArtifact := false,
+ publishLocal := {}
+ )
+ .enablePlugins(BuildInfoPlugin)
+
 lazy val domain =
  project
  .settings(

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

@@ -11,6 +11,7 @@ import scala.tools.nsc.plugins.PluginComponent
 import scala.tools.nsc.transform.Transform
 import scala.tools.nsc.transform.TypingTransformers
 
+import buildinfo.BuildInfo
 import scoverage.reporter.IOUtils
 
 private[scoverage] object ScoverageCompiler {
@@ -24,9 +25,17 @@ private[scoverage] object ScoverageCompiler {
  def classPath: Seq[String] =
  getScalaJars.map(
  _.getAbsolutePath
- ) :+ sbtCompileDir.getAbsolutePath :+ runtimeClasses.getAbsolutePath
+ ) :+ sbtCompileDir.getAbsolutePath :+ runtimeClasses("jvm").getAbsolutePath
 
- def settings: Settings = {
+ def jsClassPath: Seq[String] =
+ getScalaJsJars.map(
+ _.getAbsolutePath
+ ) :+ sbtCompileDir.getAbsolutePath :+ runtimeClasses("js").getAbsolutePath
+
+ def settings: Settings = settings(classPath)
+ def jsSettings: Settings = settings(jsClassPath)
+
+ def settings(classPath: Seq[String]): Settings = {
  val s = new scala.tools.nsc.Settings
  s.Xprint.value = List("all", "_")
  s.deprecation.value = true
@@ -46,6 +55,11 @@ private[scoverage] object ScoverageCompiler {
  new ScoverageCompiler(settings, reporter)
  }
 
+ def defaultScalaJs: ScoverageCompiler = {
+ val reporter = new scala.tools.nsc.reporters.ConsoleReporter(jsSettings)
+ new ScoverageCompiler(jsSettings, reporter)
+ }
+
  def locationCompiler: LocationCompiler = {
  val reporter = new scala.tools.nsc.reporters.ConsoleReporter(settings)
  new LocationCompiler(settings, reporter)
@@ -56,6 +70,23 @@ private[scoverage] object ScoverageCompiler {
  scalaJars.map(findScalaJar)
  }
 
+ private def getScalaJsJars: List[File] = {
+ List(
+ findJar("org.scala-lang", "scala-compiler", ScalaVersion),
+ findJar("org.scala-lang", "scala-reflect", ScalaVersion),
+ findJar(
+ "org.scala-js",
+ s"scalajs-compiler_$ScalaVersion",
+ BuildInfo.scalaJSVersion
+ ),
+ findJar(
+ "org.scala-js",
+ s"scalajs-library_$ScalaVersion",
+ BuildInfo.scalaJSVersion
+ )
+ )
+ }
+
  private def sbtCompileDir: File = {
  val dir = new File(
  s"./plugin/target/scala-$ScalaVersion/classes"
@@ -67,20 +98,28 @@ private[scoverage] object ScoverageCompiler {
  dir
  }
 
- private def runtimeClasses: File = new File(
- s"./runtime/jvm/target/scala-$ScalaVersion/classes"
+ private def runtimeClasses(platform: String): File = new File(
+ s"./runtime/$platform/target/scala-$ScalaVersion/classes"
  )
 
  private def findScalaJar(artifactId: String): File =
- findIvyJar("org.scala-lang", artifactId, ScalaVersion)
- .orElse(findCoursierJar(artifactId, ScalaVersion))
+ findJar("org.scala-lang", artifactId, ScalaVersion)
+
+ private def findJar(
+ groupId: String,
+ artifactId: String,
+ version: String
+ ): File =
+ findIvyJar(groupId, artifactId, version)
+ .orElse(findCoursierJar(groupId, artifactId, version))
  .getOrElse {
  throw new FileNotFoundException(
- s"Could not locate $artifactId/$ScalaVersion"
+ s"Could not locate $groupId:$artifactId:$version"
  )
  }
 
  private def findCoursierJar(
+ groupId: String,
  artifactId: String,
  version: String
  ): Option[File] = {
@@ -89,9 +128,10 @@ private[scoverage] object ScoverageCompiler {
  ".cache/coursier", // Linux
  "Library/Caches/Coursier", // MacOSX
  "AppData/Local/Coursier/cache" // Windows
- ).map(loc =>
- s"$userHome/$loc/v1/https/repo1.maven.org/maven2/org/scala-lang/$artifactId/$version/$artifactId-$version.jar"
- )
+ ).map { loc =>
+ val gid = groupId.replace('.', '/')
+ s"$userHome/$loc/v1/https/repo1.maven.org/maven2/$gid/$artifactId/$version/$artifactId-$version.jar"
+ }
  jarPaths.map(new File(_)).find(_.exists())
  }
 

project/plugins.sbt

@@ -6,4 +6,6 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
 
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.33")
 
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
+
 libraryDependencies += "org.scala-js" %% "scalajs-env-jsdom-nodejs" % "1.1.0"