Merge pull request #624 from lolgab/update-scalac-plugin

tgodzik · web-flow · commit b707531c6382 · 2025-10-20T10:25:35.000+02:00
Update Scalac plugin and Scala versions
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
     )
 
diff --git 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")

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ name := "sbt-scoverage"`
`2`	`2`
`3`	`3`	`import sbt.ScriptedPlugin.autoImport.scriptedLaunchOpts`
`4`	`4`
`5`		`-lazy val scoverageVersion = "2.3.0"`
	`5`	`+lazy val scoverageVersion = "2.4.0"`
`6`	`6`
`7`	`7`	`inThisBuild(`
`8`	`8`	`List(`
`@@ -25,7 +25,7 @@ inThisBuild(`
`25`	`25`	`licenses := Seq(`
`26`	`26`	`"Apache-2.0" -> url("http://www.apache.org/license/LICENSE-2.0")`
`27`	`27`	`),`
`28`		`- scalaVersion := "2.12.19"`
	`28`	`+ scalaVersion := "2.12.20"`
`29`	`29`	`)`
`30`	`30`	`)`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`inThisBuild(`
`2`	`2`	`List(`
`3`	`3`	`organization := "org.scoverage",`
`4`		`- scalaVersion := "2.13.16",`
	`4`	`+ scalaVersion := "2.13.17",`
`5`	`5`	`libraryDependencies += "org.scalameta" %% "munit" % "1.0.4" % Test`
`6`	`6`	`)`
`7`	`7`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`lazy val commonSettings = Seq(`
`7`	`7`	`organization := "org.scoverage",`
`8`	`8`	`version := "0.1.0",`
`9`		`- scalaVersion := "2.13.16"`
	`9`	`+ scalaVersion := "2.13.17"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`def module(name: String) = {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ lazy val commonSettings = Seq(`
`7`	`7`	`organization := "org.scoverage",`
`8`	`8`	`allowUnsafeScalaLibUpgrade := true,`
`9`	`9`	`version := "0.1.0",`
`10`		`- scalaVersion := "2.13.13"`
	`10`	`+ scalaVersion := "2.13.17"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`def module(name: String) = {`