Merge pull request scoverage#184 from lustefaniak/add-scala-js-support

Add support for scala.js runtime

Author: gslowikowski

src/main/scala/scoverage/ScoverageSbtPlugin.scala

@@ -33,8 +33,8 @@ object ScoverageSbtPlugin extends AutoPlugin {
  coverageScalacPluginVersion := DefaultScoverageVersion,
  libraryDependencies ++= {
  if (coverageEnabled.value) Seq(
- OrgScoverage % (ScalacRuntimeArtifact + "_" + scalaBinaryVersion.value) % coverageScalacPluginVersion.value,
- OrgScoverage % (ScalacPluginArtifact + "_" + scalaBinaryVersion.value) % coverageScalacPluginVersion.value % "scoveragePlugin->default(compile)"
+ OrgScoverage %% (ScalacRuntimeArtifact + optionalScalaJsSuffix(libraryDependencies.value)) % coverageScalacPluginVersion.value,
+ OrgScoverage %% ScalacPluginArtifact % coverageScalacPluginVersion.value % "scoveragePlugin->default(compile)"
  ) else Nil
  },
  scalacOptions in(Compile, compile) ++= scoverageScalacOptions.value,
@@ -63,6 +63,15 @@ object ScoverageSbtPlugin extends AutoPlugin {
  extracted.append(newSettings, state)
  }
 
+ // returns "_sjs$sjsVersion" for Scala.js projects or "" otherwise
+ private def optionalScalaJsSuffix(deps: Seq[ModuleID]): String = {
+ val sjsClassifier = deps.collectFirst{
+ case ModuleID("org.scala-js", "scalajs-library", v, _, _, _, _, _, _, _, _) => v
+ }.map(_.take(3)).map(sjsVersion => "_sjs" + sjsVersion)
+
+ sjsClassifier getOrElse ""
+ }
+
  private lazy val coverageReport0 = Def.task {
  val target = crossTarget.value
  val log = streams.value.log

src/sbt-test/scoverage/scalajs/build.sbt

@@ -3,7 +3,7 @@ lazy val root = (project in file(".")).aggregate(crossJS, crossJVM)
 lazy val cross = crossProject.in(file("sjstest")).settings(
  scalaVersion := "2.11.7",
  libraryDependencies ++= Seq(
- "org.scalatest" %%% "scalatest" % "3.0.0-M15" % "test"
+ "org.scalatest" %%% "scalatest" % "3.0.0" % "test"
  )
  )
 

src/sbt-test/scoverage/scalajs/project/plugins.sbt

@@ -12,4 +12,4 @@ resolvers += Classpaths.sbtPluginReleases
  else addSbtPlugin("org.scoverage" %% "sbt-scoverage" % pluginVersion)
 }
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.8")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.12")