Skip to content

Commit d86faca

Browse files
committed
feat: add support for 2.12.16 with newest scoverage
This bumps the version of scoverage to the 2.0.0-RC1. NOTE: That will this it also removes the long deprecated `coverageMinimum`. You'll need to replace it with `coverageMinimumStmtTotal`.
1 parent 636111f commit d86faca

File tree

10 files changed

+5
-14
lines changed

10 files changed

+5
-14
lines changed

build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name := "sbt-scoverage"
22

33
import sbt.ScriptedPlugin.autoImport.scriptedLaunchOpts
44

5-
lazy val scoverageVersion = "2.0.0-M5"
5+
lazy val scoverageVersion = "2.0.0-RC1"
66

77
inThisBuild(
88
List(

src/main/scala/scoverage/CoverageMinimum.scala

+1-3
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,9 @@ object CoverageMinimum {
8686

8787
def all = Def.setting {
8888
import ScoverageKeys._
89-
val stmtTotal =
90-
math.max(coverageMinimum.value, coverageMinimumStmtTotal.value)
9189
All(
9290
total = CoverageMinimum(
93-
statement = stmtTotal,
91+
statement = coverageMinimumStmtTotal.value,
9492
branch = coverageMinimumBranchTotal.value
9593
),
9694
perPackage = CoverageMinimum(

src/main/scala/scoverage/ScoverageKeys.scala

-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ object ScoverageKeys {
2222
lazy val coverageSourceRoot = settingKey[File]("the source root of the project")
2323
// format: on
2424

25-
@deprecated("Use coverageMinimumStmtTotal instead", "v1.8.0")
26-
lazy val coverageMinimum =
27-
settingKey[Double]("see coverageMinimumStmtTotal")
2825
lazy val coverageMinimumStmtTotal =
2926
settingKey[Double]("scoverage minimum coverage: statement total")
3027
lazy val coverageMinimumBranchTotal =

src/main/scala/scoverage/ScoverageSbtPlugin.scala

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ object ScoverageSbtPlugin extends AutoPlugin {
4141
coverageEnabled := false,
4242
coverageExcludedPackages := "",
4343
coverageExcludedFiles := "",
44-
coverageMinimum := 0, // default is no minimum
4544
coverageMinimumStmtTotal := 0,
4645
coverageMinimumBranchTotal := 0,
4746
coverageMinimumStmtPerPackage := 0,

src/sbt-test/scoverage/bad-coverage/build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ scalaVersion := "2.13.6"
44

55
libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
66

7-
coverageMinimum := 80
7+
coverageMinimumStmtTotal := 80
88

99
coverageFailOnMinimum := true
1010

src/sbt-test/scoverage/coverage-off/build.sbt

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ scalaVersion := "2.13.6"
44

55
libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
66

7-
coverageMinimum := 80
87
coverageMinimumStmtTotal := 100
98
coverageMinimumBranchTotal := 100
109
coverageMinimumStmtPerPackage := 100

src/sbt-test/scoverage/data-dir/build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ libraryDependencies += "org.specs2" %% "specs2-core" % "4.12.10" % "test"
66

77
coverageDataDir := target.value / "custom-test"
88

9-
coverageMinimum := 80
9+
coverageMinimumStmtTotal := 80
1010

1111
coverageFailOnMinimum := true
1212

src/sbt-test/scoverage/good-coverage/build.sbt

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ scalaVersion := "2.13.6"
44

55
libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
66

7-
coverageMinimum := 80
87
coverageMinimumStmtTotal := 100
98
coverageMinimumBranchTotal := 100
109
coverageMinimumStmtPerPackage := 100

src/sbt-test/scoverage/scala3-bad/build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ scalaVersion := "3.2.0-RC1-bin-20220523-6783853-NIGHTLY" // TODO: Should be upda
44

55
libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
66

7-
coverageMinimum := 80
7+
coverageMinimumStmtTotal := 80
88

99
coverageFailOnMinimum := true
1010

src/sbt-test/scoverage/scala3-good/build.sbt

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ scalaVersion := "3.2.0-RC1-bin-20220523-6783853-NIGHTLY" // TODO: Should be upda
44

55
libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
66

7-
coverageMinimum := 80
87
coverageMinimumStmtTotal := 100
98
coverageMinimumBranchTotal := 100
109
coverageMinimumStmtPerPackage := 100

0 commit comments

Comments
 (0)