From 1162c8efc2e798d2e4eb2b018e8103466d86a168 Mon Sep 17 00:00:00 2001 From: Lorenzo Gabriele Date: Sat, 18 Oct 2025 09:17:29 +0200 Subject: [PATCH 1/2] Update Scalac plugin and Scala versions --- build.sbt | 4 ++-- src/sbt-test/scoverage/aggregate-disabled-module/build.sbt | 2 +- src/sbt-test/scoverage/aggregate-only/build.sbt | 2 +- src/sbt-test/scoverage/aggregate/build.sbt | 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 +- src/sbt-test/scoverage/coverage-excluded-packages/build.sbt | 2 +- src/sbt-test/scoverage/coverage-off/build.sbt | 2 +- src/sbt-test/scoverage/data-dir/build.sbt | 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 ++-- src/sbt-test/scoverage/scalajs/build.sbt | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-) diff --git a/build.sbt b/build.sbt index 06312e3..6a27c2d 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ name := "sbt-scoverage" import sbt.ScriptedPlugin.autoImport.scriptedLaunchOpts -lazy val scoverageVersion = "2.3.0" +lazy val scoverageVersion = "2.4.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.19" + scalaVersion := "2.12.20" ) ) diff --git a/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt b/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt index 35d4bf8..c36c7d0 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.16", + scalaVersion := "2.13.17", libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % Test ) ) diff --git a/src/sbt-test/scoverage/aggregate-only/build.sbt b/src/sbt-test/scoverage/aggregate-only/build.sbt index 74d376a..7802aa4 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.16" + scalaVersion := "2.13.17" ) def module(name: String) = { diff --git a/src/sbt-test/scoverage/aggregate/build.sbt b/src/sbt-test/scoverage/aggregate/build.sbt index 4bb5624..8e85356 100644 --- a/src/sbt-test/scoverage/aggregate/build.sbt +++ b/src/sbt-test/scoverage/aggregate/build.sbt @@ -7,7 +7,7 @@ lazy val commonSettings = Seq( organization := "org.scoverage", allowUnsafeScalaLibUpgrade := true, version := "0.1.0", - scalaVersion := "2.13.13" + scalaVersion := "2.13.17" ) def module(name: String) = { 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 e58ae12..9ff1e74 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.16" +scalaVersion := "2.13.17" libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % 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 8c22cd3..7139629 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.16" +scalaVersion := "2.13.17" libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % 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 9629f2c..4d4371c 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.16" +scalaVersion := "2.13.17" libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % 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 ce27bcb..4cf9879 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.16" +scalaVersion := "2.13.17" libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % 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 cb1592e..8f319cb 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.16" +scalaVersion := "2.13.17" libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % 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 6d6558f..23cc61d 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.16" +scalaVersion := "2.13.17" libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % Test diff --git a/src/sbt-test/scoverage/bad-coverage/build.sbt b/src/sbt-test/scoverage/bad-coverage/build.sbt index 6d6558f..23cc61d 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.16" +scalaVersion := "2.13.17" libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % Test diff --git a/src/sbt-test/scoverage/coverage-excluded-files/build.sbt b/src/sbt-test/scoverage/coverage-excluded-files/build.sbt index bb1bff7..aaae2ca 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.13" +scalaVersion := "2.13.17" allowUnsafeScalaLibUpgrade := true diff --git a/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt b/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt index 1dacb50..7c6dce9 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.16" +scalaVersion := "2.13.17" libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % Test diff --git a/src/sbt-test/scoverage/coverage-off/build.sbt b/src/sbt-test/scoverage/coverage-off/build.sbt index d2f2560..1f9c609 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.16" +scalaVersion := "2.13.17" libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % Test diff --git a/src/sbt-test/scoverage/data-dir/build.sbt b/src/sbt-test/scoverage/data-dir/build.sbt index a2f6e4e..2b50a7c 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.13" +scalaVersion := "2.13.17" allowUnsafeScalaLibUpgrade := true diff --git a/src/sbt-test/scoverage/good-coverage/build.sbt b/src/sbt-test/scoverage/good-coverage/build.sbt index d2f2560..1f9c609 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.16" +scalaVersion := "2.13.17" libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % Test diff --git a/src/sbt-test/scoverage/preserve-set/build.sbt b/src/sbt-test/scoverage/preserve-set/build.sbt index 61f803c..1513415 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.16" +scalaVersion := "2.13.17" -crossScalaVersions := Seq("2.13.16") +crossScalaVersions := Seq("2.13.17") libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % Test diff --git a/src/sbt-test/scoverage/preserve-set/test b/src/sbt-test/scoverage/preserve-set/test index 6b81590..140e32a 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.16" +> checkScalaVersion "2.13.17" > checkScoverageEnabled "false" > coverage > checkScoverageEnabled "true" > coverageOff -> checkScalaVersion "2.13.16" +> checkScalaVersion "2.13.17" > checkScoverageEnabled "false" diff --git a/src/sbt-test/scoverage/scalajs/build.sbt b/src/sbt-test/scoverage/scalajs/build.sbt index 1e54f4d..6c52e49 100644 --- a/src/sbt-test/scoverage/scalajs/build.sbt +++ b/src/sbt-test/scoverage/scalajs/build.sbt @@ -7,7 +7,7 @@ lazy val cross = CrossProject("sjstest", file("sjstest"))(JVMPlatform, JSPlatform) .crossType(CrossType.Full) .settings( - scalaVersion := "2.13.16", + scalaVersion := "2.13.17", libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % Test ) From aef8f30c7a15474201aa06b2dc5141b75c44e4a3 Mon Sep 17 00:00:00 2001 From: Lorenzo Gabriele Date: Mon, 20 Oct 2025 10:16:26 +0200 Subject: [PATCH 2/2] Update Scala.js to 1.20.1 --- src/sbt-test/scoverage/scalajs/project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sbt-test/scoverage/scalajs/project/plugins.sbt b/src/sbt-test/scoverage/scalajs/project/plugins.sbt index 41ded80..49fb336 100644 --- a/src/sbt-test/scoverage/scalajs/project/plugins.sbt +++ b/src/sbt-test/scoverage/scalajs/project/plugins.sbt @@ -8,6 +8,6 @@ val pluginVersion = sys.props.getOrElse( addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion) -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.1") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")