Skip to content

Make plugin depend on coverageEnabled setting, allow changing runtime scoverage version, add support for Scala.js #166

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.

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

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/main/scala/scoverage/ScoverageKeys.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ object ScoverageKeys {
lazy val coverageOutputDebug = settingKey[Boolean]("turn on the debug report")
lazy val coverageCleanSubprojectFiles = settingKey[Boolean]("removes subproject data after an aggregation")
lazy val coverageOutputTeamCity = settingKey[Boolean]("turn on teamcity reporting")
lazy val coveragePluginVersion = settingKey[String]("version of scalac-scoverage-plugin to use")
}
51 changes: 33 additions & 18 deletions src/main/scala/scoverage/ScoverageSbtPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,15 @@ object ScoverageSbtPlugin extends AutoPlugin {
coverageOutputCobertura := true,
coverageOutputDebug := false,
coverageCleanSubprojectFiles := true,
coverageOutputTeamCity := false
coverageOutputTeamCity := false,
coveragePluginVersion := DefaultScoverageVersion,
libraryDependencies <<= (libraryDependencies, coverageEnabled, scalaBinaryVersion, coveragePluginVersion) {
(deps, enabled, binaryVersion, pluginVersion) =>
if (enabled) deps ++ Seq(
OrgScoverage % (ScalacRuntimeArtifact + runtimeClassifier(deps, binaryVersion)) % pluginVersion % "provided" intransitive(),
OrgScoverage % (ScalacPluginArtifact + "_" + binaryVersion) % pluginVersion % "compile" intransitive()
) else deps
}
)

/**
Expand All @@ -51,18 +59,20 @@ object ScoverageSbtPlugin extends AutoPlugin {
val extracted = Project.extract(state)
val newSettings = extracted.structure.allProjectRefs flatMap { proj =>
Seq(
coverageEnabled in proj := status,
libraryDependencies in proj ++= {
if (status) Seq(
OrgScoverage % (ScalacRuntimeArtifact + "_" + scalaBinaryVersion.value) % DefaultScoverageVersion % "provided" intransitive(),
OrgScoverage % (ScalacPluginArtifact + "_" + scalaBinaryVersion.value) % DefaultScoverageVersion % "provided" intransitive()
) else Nil
}
coverageEnabled in proj := status
)
}
extracted.append(newSettings, state)
}

private def runtimeClassifier(deps: Seq[ModuleID], binaryVersion:String): String = {
val sjsClassifier = deps.collectFirst{
case ModuleID("org.scala-js", "scalajs-library", v, _, _, _, _, _, _, _, _) => v
}.map(_.take(3)).map(sjsVersion => "_sjs" + sjsVersion + "_" + binaryVersion)

sjsClassifier getOrElse "_" + binaryVersion
}

private lazy val coverageReport0 = Def.task {
val target = crossTarget.value
val log = streams.value.log
Expand Down Expand Up @@ -118,16 +128,21 @@ object ScoverageSbtPlugin extends AutoPlugin {
}

private lazy val scoverageScalacOptions = Def.task {
val scoverageDeps: Seq[File] = update.value matching configurationFilter("provided")
scoverageDeps.find(_.getAbsolutePath.contains(ScalacPluginArtifact)) match {
case None => throw new Exception(s"Fatal: $ScalacPluginArtifact not in libraryDependencies")
case Some(pluginPath) =>
scalaArgs(coverageEnabled.value,
pluginPath,
crossTarget.value,
coverageExcludedPackages.value,
coverageExcludedFiles.value,
coverageHighlighting.value)
val isEnabled = coverageEnabled.value
if (isEnabled) {
val scoverageDeps: Seq[File] = update.value matching configurationFilter("compile")
scoverageDeps.find(_.getAbsolutePath.contains(ScalacPluginArtifact)) match {
case None => throw new Exception(s"Fatal: $ScalacPluginArtifact not in libraryDependencies")
case Some(pluginPath) =>
scalaArgs(coverageEnabled.value,
pluginPath,
crossTarget.value,
coverageExcludedPackages.value,
coverageExcludedFiles.value,
coverageHighlighting.value)
}
} else {
Nil
}
}

Expand Down