Merge pull request sbt#498 from xuwei-k/update-scala-versions

MasseGuillaume · Jun 4, 2023 · f2b4744 · f2b4744
2 parents c51d946 + 58f5973
commit f2b4744
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ For example, here's a multi-project `build.sbt`:
 ```scala
 ThisBuild / version := "0.1.0-SNAPSHOT"
 ThisBuild / organization := "com.example"
-ThisBuild / scalaVersion := "2.13.7"
+ThisBuild / scalaVersion := "2.13.11"
 
 lazy val app = (project in file("app"))
   .settings(

diff --git a/src/sbt-test/caching/caching/build.sbt b/src/sbt-test/caching/caching/build.sbt
@@ -1,7 +1,7 @@
 lazy val root = (project in file(".")).
   settings(
     version := "0.1",
-    scalaVersion := "2.12.15",
+    scalaVersion := "2.12.18",
     libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.10" % "test",
     libraryDependencies += "ch.qos.logback" % "logback-classic" % "0.9.29" % "runtime",
     assembly / assemblyJarName := "foo.jar",

diff --git a/src/sbt-test/merging/merging/build.sbt b/src/sbt-test/merging/merging/build.sbt
@@ -1,5 +1,5 @@
 ThisBuild / version := "0.1"
-ThisBuild / scalaVersion := "2.12.15"
+ThisBuild / scalaVersion := "2.12.18"
 ThisBuild / assemblyMergeStrategy := {
   case "a" => MergeStrategy.concat
   case "b" => MergeStrategy.first

diff --git a/src/sbt-test/sbt-assembly/appendhash/build.sbt b/src/sbt-test/sbt-assembly/appendhash/build.sbt
@@ -1,5 +1,5 @@
 ThisBuild / version := "0.1"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.18"
 ThisBuild / assemblyAppendContentHash := true
 
 lazy val root = (project in file("."))

diff --git a/src/sbt-test/sbt-assembly/config/build.sbt b/src/sbt-test/sbt-assembly/config/build.sbt
@@ -1,5 +1,5 @@
 ThisBuild / version := "0.1"
-ThisBuild / scalaVersion := "2.12.15"
+ThisBuild / scalaVersion := "2.12.18"
 
 lazy val root = (project in file("."))
   .settings(inConfig(Test)(baseAssemblySettings))

diff --git a/src/sbt-test/sbt-assembly/deps/build.sbt b/src/sbt-test/sbt-assembly/deps/build.sbt
@@ -1,5 +1,5 @@
 ThisBuild / version := "0.1"
-ThisBuild / scalaVersion := "2.12.15"
+ThisBuild / scalaVersion := "2.12.18"
 
 lazy val root = (project in file("."))
   .settings(

diff --git a/src/sbt-test/sbt-assembly/empty/build.sbt b/src/sbt-test/sbt-assembly/empty/build.sbt
@@ -1,2 +1,2 @@
 ThisBuild / version := "0.1"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.18"
diff --git a/src/sbt-test/sbt-assembly/piecemeal/build.sbt b/src/sbt-test/sbt-assembly/piecemeal/build.sbt
@@ -1,5 +1,5 @@
 ThisBuild / version := "0.1"
-ThisBuild / scalaVersion := "2.12.15"
+ThisBuild / scalaVersion := "2.12.18"
 
 ThisBuild / assemblyPackageScala / assembleArtifact := false
 ThisBuild / assemblyPackageDependency / assembleArtifact := false
@@ -24,7 +24,7 @@ lazy val root = (project in file("."))
     },
     TaskKey[Unit]("check2") := {
       val process = sys.process.Process("java", Seq("-cp",
-        (crossTarget.value / "scala-library-2.12.15-assembly.jar").toString +
+        (crossTarget.value / "scala-library-2.12.18-assembly.jar").toString +
         (if (scala.util.Properties.isWin) ";" else ":") +
         (crossTarget.value / "foo-assembly-0.1.jar").toString,
         "Main"))

diff --git a/src/sbt-test/sbt-assembly/piecemeal/test b/src/sbt-test/sbt-assembly/piecemeal/test
@@ -11,7 +11,7 @@ $ exists target/scala-2.12/foo-assembly-0.1-deps.jar
 
 # check if the file gets created
 > assemblyPackageScala
-$ exists target/scala-2.12/scala-library-2.12.15-assembly.jar
+$ exists target/scala-2.12/scala-library-2.12.18-assembly.jar
 
 # check if it says hello
 > check2
diff --git a/src/sbt-test/sbt-assembly/simple/build.sbt b/src/sbt-test/sbt-assembly/simple/build.sbt
@@ -1,5 +1,5 @@
 ThisBuild / version := "0.1"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.18"
 
 lazy val root = (project in file("."))
   .settings(

diff --git a/src/sbt-test/shading/directories/build.sbt b/src/sbt-test/shading/directories/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.12.15"
+ThisBuild / scalaVersion := "2.12.18"
 
 ThisBuild / assemblyShadeRules := Seq(
   ShadeRule.rename("somepackage.**" -> "shaded.@1").inAll

diff --git a/src/sbt-test/shading/jdk11/build.sbt b/src/sbt-test/shading/jdk11/build.sbt
@@ -1,7 +1,7 @@
 scalaVersion := scala212
 
-lazy val scala212 = "2.12.15"
-lazy val scala213 = "2.13.7"
+lazy val scala212 = "2.12.18"
+lazy val scala213 = "2.13.11"
 
 ThisBuild / crossScalaVersions := List(scala212, scala213)
 

diff --git a/src/sbt-test/shading/keeponly/build.sbt b/src/sbt-test/shading/keeponly/build.sbt
@@ -1,5 +1,5 @@
-lazy val scala212 = "2.12.15"
-lazy val scala213 = "2.13.7"
+lazy val scala212 = "2.12.18"
+lazy val scala213 = "2.13.11"
 
 scalaVersion := scala212
 crossScalaVersions := List(scala212, scala213)

diff --git a/src/sbt-test/shading/scalasigannot/build.sbt b/src/sbt-test/shading/scalasigannot/build.sbt
@@ -2,8 +2,8 @@ ThisBuild / version := "1.0-SNAPSHOT"
 ThisBuild / organization := "scalasigannottest"
 ThisBuild / scalaVersion := scala213
 
-lazy val scala212 = "2.12.15"
-lazy val scala213 = "2.13.7"
+lazy val scala212 = "2.12.18"
+lazy val scala213 = "2.13.11"
 
 ThisBuild / crossScalaVersions := List(scala212, scala213)
 

diff --git a/src/sbt-test/shading/shading/build.sbt b/src/sbt-test/shading/shading/build.sbt
@@ -2,7 +2,7 @@ lazy val testshade = (project in file(".")).
   settings(
     version := "0.1",
     assembly / assemblyJarName := "foo.jar",
-    scalaVersion := "2.12.15",
+    scalaVersion := "2.12.18",
     libraryDependencies += "commons-io" % "commons-io" % "2.4",
     assembly / assemblyShadeRules := Seq(
       ShadeRule.zap("remove.**").inProject,

diff --git a/src/sbt-test/shading/unmanagedjars/build.sbt b/src/sbt-test/shading/unmanagedjars/build.sbt
@@ -2,7 +2,7 @@ lazy val testshade = (project in file(".")).
   settings(
     version := "0.1",
     assembly / assemblyJarName := "foo.jar",
-    scalaVersion := "2.12.15",
+    scalaVersion := "2.12.18",
     libraryDependencies += "commons-io" % "commons-io" % "2.4",
     assembly / assemblyShadeRules := Seq(
       ShadeRule.zap("remove.**").inProject,