Skip to content

Add support for scala.js runtime #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 18, 2016
Merged

Add support for scala.js runtime #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/main/scala/scoverage/ScoverageSbtPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/scoverage/scalajs/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
)

Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/scoverage/scalajs/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")