From 9cc1fe7ff41a7be4bc641422e71fc485ca8b26a1 Mon Sep 17 00:00:00 2001 From: Chris Kipp Date: Fri, 23 Feb 2024 17:22:45 +0100 Subject: [PATCH] chore: bump default scoverage to 2.1.0 This adds in support to 2.12.19 and 2.13.13 --- build.sbt | 4 ++-- project/build.properties | 2 +- src/sbt-test/scoverage/aggregate-disabled-module/build.sbt | 2 +- .../aggregate-disabled-module/project/build.properties | 2 +- src/sbt-test/scoverage/aggregate-only/build.sbt | 2 +- src/sbt-test/scoverage/aggregate/build.sbt | 2 +- src/sbt-test/scoverage/aggregate/project/build.properties | 2 +- src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt | 2 +- src/sbt-test/scoverage/bad-coverage/build.sbt | 2 +- src/sbt-test/scoverage/coverage-excluded-files/build.sbt | 2 +- .../coverage-excluded-files/project/build.properties | 2 +- src/sbt-test/scoverage/coverage-excluded-packages/build.sbt | 2 +- .../coverage-excluded-packages/project/build.properties | 2 +- src/sbt-test/scoverage/coverage-off/build.sbt | 2 +- src/sbt-test/scoverage/coverage-off/project/build.properties | 2 +- src/sbt-test/scoverage/data-dir/build.sbt | 2 +- src/sbt-test/scoverage/data-dir/project/build.properties | 2 +- src/sbt-test/scoverage/good-coverage/build.sbt | 2 +- src/sbt-test/scoverage/preserve-set/build.sbt | 4 ++-- src/sbt-test/scoverage/preserve-set/test | 4 ++-- .../scala3-coverage-excluded-files/project/build.properties | 2 +- 26 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build.sbt b/build.sbt index 2f5abf62..eed52071 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ name := "sbt-scoverage" import sbt.ScriptedPlugin.autoImport.scriptedLaunchOpts -lazy val scoverageVersion = "2.0.11" +lazy val scoverageVersion = "2.1.0" inThisBuild( List( @@ -25,7 +25,7 @@ inThisBuild( licenses := Seq( "Apache-2.0" -> url("http://www.apache.org/license/LICENSE-2.0") ), - scalaVersion := "2.12.15" + scalaVersion := "2.12.19" ) ) diff --git a/project/build.properties b/project/build.properties index abbbce5d..04267b14 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.8 +sbt.version=1.9.9 diff --git a/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt b/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt index 96b53f6d..45dfae25 100644 --- a/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt +++ b/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt @@ -1,7 +1,7 @@ inThisBuild( List( organization := "org.scoverage", - scalaVersion := "2.13.6", + scalaVersion := "2.13.13", libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test ) ) diff --git a/src/sbt-test/scoverage/aggregate-disabled-module/project/build.properties b/src/sbt-test/scoverage/aggregate-disabled-module/project/build.properties index 10fd9eee..40b3b8e7 100644 --- a/src/sbt-test/scoverage/aggregate-disabled-module/project/build.properties +++ b/src/sbt-test/scoverage/aggregate-disabled-module/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.5 +sbt.version=1.9.0 diff --git a/src/sbt-test/scoverage/aggregate-only/build.sbt b/src/sbt-test/scoverage/aggregate-only/build.sbt index 1562553d..e148019e 100644 --- a/src/sbt-test/scoverage/aggregate-only/build.sbt +++ b/src/sbt-test/scoverage/aggregate-only/build.sbt @@ -6,7 +6,7 @@ lazy val commonSettings = Seq( organization := "org.scoverage", version := "0.1.0", - scalaVersion := "2.13.6" + scalaVersion := "2.13.13" ) def module(name: String) = { diff --git a/src/sbt-test/scoverage/aggregate/build.sbt b/src/sbt-test/scoverage/aggregate/build.sbt index 1562553d..e148019e 100644 --- a/src/sbt-test/scoverage/aggregate/build.sbt +++ b/src/sbt-test/scoverage/aggregate/build.sbt @@ -6,7 +6,7 @@ lazy val commonSettings = Seq( organization := "org.scoverage", version := "0.1.0", - scalaVersion := "2.13.6" + scalaVersion := "2.13.13" ) def module(name: String) = { diff --git a/src/sbt-test/scoverage/aggregate/project/build.properties b/src/sbt-test/scoverage/aggregate/project/build.properties index 10fd9eee..04267b14 100644 --- a/src/sbt-test/scoverage/aggregate/project/build.properties +++ b/src/sbt-test/scoverage/aggregate/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.5 +sbt.version=1.9.9 diff --git a/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt b/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt index 575c5b90..49d93c86 100644 --- a/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "2.13.6" +scalaVersion := "2.13.13" libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test diff --git a/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt b/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt index b15693be..66e55557 100644 --- a/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "2.13.6" +scalaVersion := "2.13.13" libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test diff --git a/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt b/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt index 9fbe65eb..aba950e6 100644 --- a/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "2.13.6" +scalaVersion := "2.13.13" libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test diff --git a/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt b/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt index b93999ba..8afb7d2c 100644 --- a/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "2.13.6" +scalaVersion := "2.13.13" libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test diff --git a/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt b/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt index b56eb640..65588c14 100644 --- a/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "2.13.6" +scalaVersion := "2.13.13" libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test diff --git a/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt b/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt index 691dcfcb..323acd62 100644 --- a/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "2.13.6" +scalaVersion := "2.13.13" libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test diff --git a/src/sbt-test/scoverage/bad-coverage/build.sbt b/src/sbt-test/scoverage/bad-coverage/build.sbt index 09eb2a47..10f0b40b 100644 --- a/src/sbt-test/scoverage/bad-coverage/build.sbt +++ b/src/sbt-test/scoverage/bad-coverage/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "2.13.6" +scalaVersion := "2.13.13" libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test diff --git a/src/sbt-test/scoverage/coverage-excluded-files/build.sbt b/src/sbt-test/scoverage/coverage-excluded-files/build.sbt index 4fcc343e..1f595f00 100644 --- a/src/sbt-test/scoverage/coverage-excluded-files/build.sbt +++ b/src/sbt-test/scoverage/coverage-excluded-files/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "2.13.6" +scalaVersion := "2.13.13" libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test diff --git a/src/sbt-test/scoverage/coverage-excluded-files/project/build.properties b/src/sbt-test/scoverage/coverage-excluded-files/project/build.properties index abbbce5d..04267b14 100644 --- a/src/sbt-test/scoverage/coverage-excluded-files/project/build.properties +++ b/src/sbt-test/scoverage/coverage-excluded-files/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.8 +sbt.version=1.9.9 diff --git a/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt b/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt index 39d7fecc..b87f3382 100644 --- a/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt +++ b/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "2.13.6" +scalaVersion := "2.13.13" libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test diff --git a/src/sbt-test/scoverage/coverage-excluded-packages/project/build.properties b/src/sbt-test/scoverage/coverage-excluded-packages/project/build.properties index abbbce5d..04267b14 100644 --- a/src/sbt-test/scoverage/coverage-excluded-packages/project/build.properties +++ b/src/sbt-test/scoverage/coverage-excluded-packages/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.8 +sbt.version=1.9.9 diff --git a/src/sbt-test/scoverage/coverage-off/build.sbt b/src/sbt-test/scoverage/coverage-off/build.sbt index 5b850e62..d7a52356 100644 --- a/src/sbt-test/scoverage/coverage-off/build.sbt +++ b/src/sbt-test/scoverage/coverage-off/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "2.13.6" +scalaVersion := "2.13.13" libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test diff --git a/src/sbt-test/scoverage/coverage-off/project/build.properties b/src/sbt-test/scoverage/coverage-off/project/build.properties index abbbce5d..04267b14 100644 --- a/src/sbt-test/scoverage/coverage-off/project/build.properties +++ b/src/sbt-test/scoverage/coverage-off/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.8 +sbt.version=1.9.9 diff --git a/src/sbt-test/scoverage/data-dir/build.sbt b/src/sbt-test/scoverage/data-dir/build.sbt index e0c5c454..56753f62 100644 --- a/src/sbt-test/scoverage/data-dir/build.sbt +++ b/src/sbt-test/scoverage/data-dir/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "2.13.6" +scalaVersion := "2.13.13" libraryDependencies += "org.specs2" %% "specs2-core" % "4.12.10" % "test" diff --git a/src/sbt-test/scoverage/data-dir/project/build.properties b/src/sbt-test/scoverage/data-dir/project/build.properties index 67d27a1d..04267b14 100644 --- a/src/sbt-test/scoverage/data-dir/project/build.properties +++ b/src/sbt-test/scoverage/data-dir/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.3 +sbt.version=1.9.9 diff --git a/src/sbt-test/scoverage/good-coverage/build.sbt b/src/sbt-test/scoverage/good-coverage/build.sbt index 5b850e62..d7a52356 100644 --- a/src/sbt-test/scoverage/good-coverage/build.sbt +++ b/src/sbt-test/scoverage/good-coverage/build.sbt @@ -1,6 +1,6 @@ version := "0.1" -scalaVersion := "2.13.6" +scalaVersion := "2.13.13" libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test diff --git a/src/sbt-test/scoverage/preserve-set/build.sbt b/src/sbt-test/scoverage/preserve-set/build.sbt index 6a410576..eb97e244 100644 --- a/src/sbt-test/scoverage/preserve-set/build.sbt +++ b/src/sbt-test/scoverage/preserve-set/build.sbt @@ -2,9 +2,9 @@ import sbt.complete.DefaultParsers._ version := "0.1" -scalaVersion := "2.13.6" +scalaVersion := "2.13.13" -crossScalaVersions := Seq("2.13.6") +crossScalaVersions := Seq("2.13.13") libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test diff --git a/src/sbt-test/scoverage/preserve-set/test b/src/sbt-test/scoverage/preserve-set/test index cc273221..f66c1976 100644 --- a/src/sbt-test/scoverage/preserve-set/test +++ b/src/sbt-test/scoverage/preserve-set/test @@ -1,8 +1,8 @@ # check scalaVersion setting -> checkScalaVersion "2.13.6" +> checkScalaVersion "2.13.13" > checkScoverageEnabled "false" > coverage > checkScoverageEnabled "true" > coverageOff -> checkScalaVersion "2.13.6" +> checkScalaVersion "2.13.13" > checkScoverageEnabled "false" diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-files/project/build.properties b/src/sbt-test/scoverage/scala3-coverage-excluded-files/project/build.properties index abbbce5d..04267b14 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-files/project/build.properties +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-files/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.8 +sbt.version=1.9.9