Skip to content

Add coverageScalacPluginVersion setting key #183

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

Merged
merged 2 commits into from
Sep 18, 2016
Merged
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 coverageScalacPluginVersion = settingKey[String]("version of scalac-scoverage-plugin to use")
}
5 changes: 3 additions & 2 deletions src/main/scala/scoverage/ScoverageSbtPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@ object ScoverageSbtPlugin extends AutoPlugin {
coverageReport <<= coverageReport0,
coverageAggregate <<= coverageAggregate0,
ivyConfigurations := ivyConfigurations.value :+ ScoveragePluginConfig,
coverageScalacPluginVersion := DefaultScoverageVersion,
libraryDependencies ++= {
if (coverageEnabled.value) Seq(
OrgScoverage % (ScalacRuntimeArtifact + "_" + scalaBinaryVersion.value) % DefaultScoverageVersion,
OrgScoverage % (ScalacPluginArtifact + "_" + scalaBinaryVersion.value) % DefaultScoverageVersion % "scoveragePlugin->default(compile)"
OrgScoverage % (ScalacRuntimeArtifact + "_" + scalaBinaryVersion.value) % coverageScalacPluginVersion.value,
OrgScoverage % (ScalacPluginArtifact + "_" + scalaBinaryVersion.value) % coverageScalacPluginVersion.value % "scoveragePlugin->default(compile)"
) else Nil
},
scalacOptions in(Compile, compile) ++= scoverageScalacOptions.value,
Expand Down
11 changes: 11 additions & 0 deletions src/sbt-test/scoverage/scalac-plugin-version/build.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
lazy val root = (project in file(".")).settings(
coverageEnabled := true,
coverageScalacPluginVersion := "1.1.0"
)
TaskKey[Unit]("check") := {
assert(
libraryDependencies.value
.filter(module =>
module.organization == "org.scoverage" && module.revision == "1.1.0")
.size == 2)
}
15 changes: 15 additions & 0 deletions src/sbt-test/scoverage/scalac-plugin-version/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// The Typesafe repository
resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"

//scoverage needs this
resolvers += Classpaths.sbtPluginReleases

{
val pluginVersion = System.getProperty("plugin.version")
if(pluginVersion == null)
throw new RuntimeException("""|The system property 'plugin.version' is not defined.
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
else addSbtPlugin("org.scoverage" %% "sbt-scoverage" % pluginVersion)
}


2 changes: 2 additions & 0 deletions src/sbt-test/scoverage/scalac-plugin-version/test
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# assert coverageScalacPluginVersion is taken into account when generating libraryDependencies
> check