From 8ad6ada60f4d09e0f9e61b3d0cdaa0edc6b7099f Mon Sep 17 00:00:00 2001 From: kenji yoshida <6b656e6a69@gmail.com> Date: Mon, 6 Apr 2026 03:28:47 +0900 Subject: [PATCH] [2.x] Scala 3.8.3 (#8997) --- build.sbt | 2 +- contributing-docs/05_scripted_tests.md | 4 ++-- launcher-package/citest/build.sbt | 2 +- launcher-package/citest2/build.sbt | 2 +- .../src/test/scala/lmcoursier/LockFileSpec.scala | 6 +++--- project/Dependencies.scala | 2 +- sbt-app/src/sbt-test/cache/cached-compile/build.sbt | 2 +- sbt-app/src/sbt-test/cache/cached-test/build.sbt | 2 +- .../ivyless-publish-http/build.sbt | 2 +- .../ivyless-publish-local/build.sbt | 2 +- .../ivyless-publish-maven-http/build.sbt | 2 +- .../ivyless-publish-maven/build.sbt | 2 +- .../dependency-management/ivyless-publish/build.sbt | 2 +- .../dependency-management/stdlib-3.8/build.sbt | 4 ++-- sbt-app/src/sbt-test/nio/clean-symlinks/build.sbt | 2 +- sbt-app/src/sbt-test/nio/clean-symlinks/test | 4 ++-- .../sbt-test/plugins/auto-plugins-minimal/build.sbt | 2 +- sbt-app/src/sbt-test/plugins/pgp/build.sbt | 2 +- sbt-app/src/sbt-test/plugins/plugin-cross/build.sbt | 2 +- .../src/sbt-test/plugins/sbt-native-packager/build.sbt | 4 ++-- .../plugins/sbt-native-packager/project/plugins.sbt | 2 +- .../src/sbt-test/project-load/lazy-val-name/build.sbt | 2 +- sbt-app/src/sbt-test/project-load/werror/build.sbt | 2 +- .../src/sbt-test/project-load/werror/changes/build.sbt | 2 +- sbt-app/src/sbt-test/project-matrix/full/build.sbt | 2 +- sbt-app/src/sbt-test/project-matrix/full/test | 4 ++-- .../src/sbt-test/project-matrix/source-dep/build.sbt | 2 +- .../project-matrix/source-dep/ext/lib/build.sbt | 4 ++-- sbt-app/src/sbt-test/project/Class.forName/build.sbt | 2 +- sbt-app/src/sbt-test/project/nested-macro/build.sbt | 2 +- sbt-app/src/sbt-test/project/no-delegate/build.sbt | 2 +- sbt-app/src/sbt-test/project/remove/build.sbt | 10 +++++----- .../src/sbt-test/project/settings-delegate/build.sbt | 2 +- .../src/sbt-test/tests/fork-main-resources/build.sbt | 2 +- sbt-app/src/sbt-test/tests/fork2/build.sbt | 2 +- .../sbt-test/tests/incremental-object-deps/build.sbt | 2 +- sbt-app/src/sbt-test/tests/t543/build.sbt | 2 +- server-test/src/server-test/channel-cursor/build.sbt | 2 +- server-test/src/server-test/client/build.sbt | 2 +- 39 files changed, 51 insertions(+), 51 deletions(-) diff --git a/build.sbt b/build.sbt index 2b58ef014..0960720ef 100644 --- a/build.sbt +++ b/build.sbt @@ -1022,7 +1022,7 @@ lazy val sbtwProj = (project in file("sbtw")) commonSettings, name := "sbtw", description := "Windows drop-in launcher for sbt (replaces sbt.bat)", - scalaVersion := "3.8.2", + scalaVersion := "3.8.3", crossPaths := false, Compile / scalafix / unmanagedSources := { // https://github.com/scalameta/scalameta/issues/4531 diff --git a/contributing-docs/05_scripted_tests.md b/contributing-docs/05_scripted_tests.md index 29055b1f3..1d6d12b43 100644 --- a/contributing-docs/05_scripted_tests.md +++ b/contributing-docs/05_scripted_tests.md @@ -28,7 +28,7 @@ Create an initial build in `something`. Like a real build using sbt. I'm sure yo ```scala name := "foo" -scalaVersion := "3.8.2" +scalaVersion := "3.8.3" ``` I also have `Hello.scala`: @@ -107,7 +107,7 @@ import scala.sys.process.Process lazy val check = taskKey[Unit]("check") name := "foo" -scalaVersion := "3.8.2" +scalaVersion := "3.8.3" check := { val pkg = (Compile / packageBin).value val conv = fileConverter.value diff --git a/launcher-package/citest/build.sbt b/launcher-package/citest/build.sbt index ac1981213..db7cfff7d 100644 --- a/launcher-package/citest/build.sbt +++ b/launcher-package/citest/build.sbt @@ -3,7 +3,7 @@ lazy val check2 = taskKey[Unit]("") lazy val root = (project in file(".")) .settings( - scalaVersion := "3.8.2", + scalaVersion := "3.8.3", name := "Hello", libraryDependencies += "com.eed3si9n.verify" %% "verify" % "1.0.0" % Test, testFrameworks += new TestFramework("verify.runner.Framework"), diff --git a/launcher-package/citest2/build.sbt b/launcher-package/citest2/build.sbt index 9b8bfeb05..e71bb07cc 100644 --- a/launcher-package/citest2/build.sbt +++ b/launcher-package/citest2/build.sbt @@ -1,5 +1,5 @@ lazy val root = (project in file(".")) .settings( - scalaVersion := "3.8.2", + scalaVersion := "3.8.3", name := "Hello", ) diff --git a/lm-coursier/src/test/scala/lmcoursier/LockFileSpec.scala b/lm-coursier/src/test/scala/lmcoursier/LockFileSpec.scala index 774f87855..ffd5bad9f 100644 --- a/lm-coursier/src/test/scala/lmcoursier/LockFileSpec.scala +++ b/lm-coursier/src/test/scala/lmcoursier/LockFileSpec.scala @@ -38,7 +38,7 @@ class LockFileSpec extends AnyFunSuite { ), metadata = LockFileMetadata( sbtVersion = "2.0.0", - scalaVersion = Some("3.8.2") + scalaVersion = Some("3.8.3") ) ) @@ -59,7 +59,7 @@ class LockFileSpec extends AnyFunSuite { assert(readData.configurations.head.dependencies.head.organization == "org.scala-lang") assert(readData.configurations.head.dependencies.head.version == "2.13.16") assert(readData.metadata.sbtVersion == "2.0.0") - assert(readData.metadata.scalaVersion == Some("3.8.2")) + assert(readData.metadata.scalaVersion == Some("3.8.3")) } } @@ -111,7 +111,7 @@ class LockFileSpec extends AnyFunSuite { configurations = Vector.empty, metadata = LockFileMetadata( sbtVersion = "2.0.0", - scalaVersion = Some("3.8.2") + scalaVersion = Some("3.8.3") ) ) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 799ecf220..7036058fc 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,7 +4,7 @@ import Keys.* object Dependencies { // WARNING: Please Scala update versions in PluginCross.scala too val scala213 = "2.13.16" - val scala3 = "3.8.2" + val scala3 = "3.8.3" val scala212 = "2.12.21" val baseScalaVersion = scala3 def nightlyVersion: Option[String] = diff --git a/sbt-app/src/sbt-test/cache/cached-compile/build.sbt b/sbt-app/src/sbt-test/cache/cached-compile/build.sbt index 91b83d50c..ecfd9eb5b 100644 --- a/sbt-app/src/sbt-test/cache/cached-compile/build.sbt +++ b/sbt-app/src/sbt-test/cache/cached-compile/build.sbt @@ -5,7 +5,7 @@ lazy val checkMiss = inputKey[Unit]("") Global / localCacheDirectory := baseDirectory.value / "diskcache" -scalaVersion := "3.8.2" +scalaVersion := "3.8.3" checkMiss := { val expected: Int = (Space ~> NatBasic).parsed val s = streams.value diff --git a/sbt-app/src/sbt-test/cache/cached-test/build.sbt b/sbt-app/src/sbt-test/cache/cached-test/build.sbt index e68617a62..497d46d69 100644 --- a/sbt-app/src/sbt-test/cache/cached-test/build.sbt +++ b/sbt-app/src/sbt-test/cache/cached-test/build.sbt @@ -5,7 +5,7 @@ lazy val verify = "com.eed3si9n.verify" %% "verify" % "1.0.0" Global / localCacheDirectory := baseDirectory.value / "diskcache" -scalaVersion := "3.8.2" +scalaVersion := "3.8.3" libraryDependencies += verify % Test testFrameworks += new TestFramework("verify.runner.Framework") diff --git a/sbt-app/src/sbt-test/dependency-management/ivyless-publish-http/build.sbt b/sbt-app/src/sbt-test/dependency-management/ivyless-publish-http/build.sbt index ccb684413..4567ec7c5 100644 --- a/sbt-app/src/sbt-test/dependency-management/ivyless-publish-http/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/ivyless-publish-http/build.sbt @@ -3,7 +3,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c name := "lib1" organization := "com.example" version := "0.1.0-SNAPSHOT" -scalaVersion := "3.8.2" +scalaVersion := "3.8.3" val publishRepoBase = settingKey[File]("Base directory for publish repo (HTTP server writes here)") publishRepoBase := baseDirectory.value / "repo" diff --git a/sbt-app/src/sbt-test/dependency-management/ivyless-publish-local/build.sbt b/sbt-app/src/sbt-test/dependency-management/ivyless-publish-local/build.sbt index ca4dff458..fe670d2f8 100644 --- a/sbt-app/src/sbt-test/dependency-management/ivyless-publish-local/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/ivyless-publish-local/build.sbt @@ -3,7 +3,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c name := "lib1" organization := "com.example" version := "0.1.0-SNAPSHOT" -scalaVersion := "3.8.2" +scalaVersion := "3.8.3" // Use a fixed path for local ivy repo to avoid sbt 2.x output sharding val ivyLocalBase = settingKey[File]("Local Ivy repository base") diff --git a/sbt-app/src/sbt-test/dependency-management/ivyless-publish-maven-http/build.sbt b/sbt-app/src/sbt-test/dependency-management/ivyless-publish-maven-http/build.sbt index 8e543e3aa..b9763fb39 100644 --- a/sbt-app/src/sbt-test/dependency-management/ivyless-publish-maven-http/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/ivyless-publish-maven-http/build.sbt @@ -1,7 +1,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache" ThisBuild / organization := "com.example" ThisBuild / version := "0.1.0-SNAPSHOT" -ThisBuild / scalaVersion := "3.8.2" +ThisBuild / scalaVersion := "3.8.3" val publishRepoBase = settingKey[File]("Base directory for Maven publish repo (HTTP server writes here)") ThisBuild / publishRepoBase := (ThisBuild / baseDirectory).value / "repo" diff --git a/sbt-app/src/sbt-test/dependency-management/ivyless-publish-maven/build.sbt b/sbt-app/src/sbt-test/dependency-management/ivyless-publish-maven/build.sbt index 732de2138..03566e157 100644 --- a/sbt-app/src/sbt-test/dependency-management/ivyless-publish-maven/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/ivyless-publish-maven/build.sbt @@ -3,7 +3,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c name := "lib1" organization := "com.example" version := "0.1.0-SNAPSHOT" -scalaVersion := "3.8.2" +scalaVersion := "3.8.3" publishMavenStyle := true val publishRepoBase = settingKey[File]("Base directory for Maven publish repo") diff --git a/sbt-app/src/sbt-test/dependency-management/ivyless-publish/build.sbt b/sbt-app/src/sbt-test/dependency-management/ivyless-publish/build.sbt index 8bcb522d7..483b47282 100644 --- a/sbt-app/src/sbt-test/dependency-management/ivyless-publish/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/ivyless-publish/build.sbt @@ -3,7 +3,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c name := "lib1" organization := "com.example" version := "0.1.0-SNAPSHOT" -scalaVersion := "3.8.2" +scalaVersion := "3.8.3" // Publish to a file repo (tests ivyless publish without HTTP server) val publishRepoBase = settingKey[File]("Base directory for publish repo") diff --git a/sbt-app/src/sbt-test/dependency-management/stdlib-3.8/build.sbt b/sbt-app/src/sbt-test/dependency-management/stdlib-3.8/build.sbt index 3fc1fa0fd..491ca3d5a 100644 --- a/sbt-app/src/sbt-test/dependency-management/stdlib-3.8/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/stdlib-3.8/build.sbt @@ -1,9 +1,9 @@ lazy val a = project .settings( - scalaVersion := "3.8.2" + scalaVersion := "3.8.3" ) -// (b / update) sbt.librarymanagement.ResolveException: Error downloading org.scala-lang:scala-reflect:3.8.2 +// (b / update) sbt.librarymanagement.ResolveException: Error downloading org.scala-lang:scala-reflect:3.8.3 lazy val b = project .dependsOn(a) .settings( diff --git a/sbt-app/src/sbt-test/nio/clean-symlinks/build.sbt b/sbt-app/src/sbt-test/nio/clean-symlinks/build.sbt index b69492ba7..3b5cd245e 100644 --- a/sbt-app/src/sbt-test/nio/clean-symlinks/build.sbt +++ b/sbt-app/src/sbt-test/nio/clean-symlinks/build.sbt @@ -2,7 +2,7 @@ import java.nio.file.Files name := "clean-symlinks-test" -scalaVersion := "3.8.2" +scalaVersion := "3.8.3" TaskKey[Unit]("createSymlinkedDirectory") := { IO.createDirectory(target.value) diff --git a/sbt-app/src/sbt-test/nio/clean-symlinks/test b/sbt-app/src/sbt-test/nio/clean-symlinks/test index fd353b2d2..51fa24df1 100644 --- a/sbt-app/src/sbt-test/nio/clean-symlinks/test +++ b/sbt-app/src/sbt-test/nio/clean-symlinks/test @@ -1,9 +1,9 @@ > createSymlinkedDirectory -$ exists target/out/jvm/scala-3.8.2/clean-symlinks-test/foo/bar +$ exists target/out/jvm/scala-3.8.3/clean-symlinks-test/foo/bar $ exists foo/bar > clean -$ absent target/out/jvm/scala-3.8.2/clean-symlinks-test/foo +$ absent target/out/jvm/scala-3.8.3/clean-symlinks-test/foo $ exists foo/bar diff --git a/sbt-app/src/sbt-test/plugins/auto-plugins-minimal/build.sbt b/sbt-app/src/sbt-test/plugins/auto-plugins-minimal/build.sbt index 494f5417f..69074af7c 100644 --- a/sbt-app/src/sbt-test/plugins/auto-plugins-minimal/build.sbt +++ b/sbt-app/src/sbt-test/plugins/auto-plugins-minimal/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "3.8.2" +scalaVersion := "3.8.3" organization := "com.example" diff --git a/sbt-app/src/sbt-test/plugins/pgp/build.sbt b/sbt-app/src/sbt-test/plugins/pgp/build.sbt index f63dc09ca..fa9609bc6 100644 --- a/sbt-app/src/sbt-test/plugins/pgp/build.sbt +++ b/sbt-app/src/sbt-test/plugins/pgp/build.sbt @@ -1,2 +1,2 @@ -scalaVersion := "3.8.2" +scalaVersion := "3.8.3" publishLocal := {} diff --git a/sbt-app/src/sbt-test/plugins/plugin-cross/build.sbt b/sbt-app/src/sbt-test/plugins/plugin-cross/build.sbt index 398a2d1c1..bb7f00d89 100644 --- a/sbt-app/src/sbt-test/plugins/plugin-cross/build.sbt +++ b/sbt-app/src/sbt-test/plugins/plugin-cross/build.sbt @@ -19,4 +19,4 @@ lazy val plugin = (projectMatrix in file("plugin")) case _ => "2.0.0-RC3" }, ) - .jvmPlatform(scalaVersions = Seq("3.8.2", "2.12.21")) + .jvmPlatform(scalaVersions = Seq("3.8.3", "2.12.21")) diff --git a/sbt-app/src/sbt-test/plugins/sbt-native-packager/build.sbt b/sbt-app/src/sbt-test/plugins/sbt-native-packager/build.sbt index 3d99bcf14..efc5013d1 100644 --- a/sbt-app/src/sbt-test/plugins/sbt-native-packager/build.sbt +++ b/sbt-app/src/sbt-test/plugins/sbt-native-packager/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "3.8.2" +ThisBuild / scalaVersion := "3.8.3" name := "hello" enablePlugins(JavaAppPackaging) @@ -6,7 +6,7 @@ enablePlugins(JavaAppPackaging) lazy val check = taskKey[Unit]("") check := { - val cmd = "target/out/jvm/scala-3.8.2/hello/universal/stage/bin/hello" + val cmd = "target/out/jvm/scala-3.8.3/hello/universal/stage/bin/hello" val cmd0 = if (sys.props("os.name").toLowerCase(java.util.Locale.ROOT).contains("windows")) cmd + ".bat" diff --git a/sbt-app/src/sbt-test/plugins/sbt-native-packager/project/plugins.sbt b/sbt-app/src/sbt-test/plugins/sbt-native-packager/project/plugins.sbt index 4ddd3014c..a044a43ee 100644 --- a/sbt-app/src/sbt-test/plugins/sbt-native-packager/project/plugins.sbt +++ b/sbt-app/src/sbt-test/plugins/sbt-native-packager/project/plugins.sbt @@ -1,4 +1,4 @@ ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always // addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.20") -libraryDependencies += Defaults.sbtPluginExtra("com.github.sbt" % "sbt-native-packager" % "1.11.4", "2", "3.8.2") +libraryDependencies += Defaults.sbtPluginExtra("com.github.sbt" % "sbt-native-packager" % "1.11.4", "2", "3.8.3") diff --git a/sbt-app/src/sbt-test/project-load/lazy-val-name/build.sbt b/sbt-app/src/sbt-test/project-load/lazy-val-name/build.sbt index 76cf18d6b..c484c64c8 100644 --- a/sbt-app/src/sbt-test/project-load/lazy-val-name/build.sbt +++ b/sbt-app/src/sbt-test/project-load/lazy-val-name/build.sbt @@ -1,6 +1,6 @@ lazy val `a + b` = "2.13.18" -// https://github.com/scala/scala3/blob/3.8.2/library/src/scala/reflect/NameTransformer.scala#L47-L64 +// https://github.com/scala/scala3/blob/3.8.3/library/src/scala/reflect/NameTransformer.scala#L47-L64 lazy val ~=<>!#%^&|*/+-:\\?@ = "my-name" scalaVersion := `a + b` diff --git a/sbt-app/src/sbt-test/project-load/werror/build.sbt b/sbt-app/src/sbt-test/project-load/werror/build.sbt index 2c65d81e3..091230f32 100644 --- a/sbt-app/src/sbt-test/project-load/werror/build.sbt +++ b/sbt-app/src/sbt-test/project-load/werror/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "3.8.2" +scalaVersion := "3.8.3" @deprecated def foo = true diff --git a/sbt-app/src/sbt-test/project-load/werror/changes/build.sbt b/sbt-app/src/sbt-test/project-load/werror/changes/build.sbt index 3a8e0f3ac..443839160 100644 --- a/sbt-app/src/sbt-test/project-load/werror/changes/build.sbt +++ b/sbt-app/src/sbt-test/project-load/werror/changes/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "3.8.2" +scalaVersion := "3.8.3" @deprecated def foo = true diff --git a/sbt-app/src/sbt-test/project-matrix/full/build.sbt b/sbt-app/src/sbt-test/project-matrix/full/build.sbt index 9beae849a..af62b21fe 100644 --- a/sbt-app/src/sbt-test/project-matrix/full/build.sbt +++ b/sbt-app/src/sbt-test/project-matrix/full/build.sbt @@ -1,5 +1,5 @@ lazy val scala3_LTS = "3.3.5" -lazy val scala3_current = "3.8.2" +lazy val scala3_current = "3.8.3" lazy val check = taskKey[Unit]("") organization := "com.example" diff --git a/sbt-app/src/sbt-test/project-matrix/full/test b/sbt-app/src/sbt-test/project-matrix/full/test index 791f14c73..6be1d54a0 100644 --- a/sbt-app/src/sbt-test/project-matrix/full/test +++ b/sbt-app/src/sbt-test/project-matrix/full/test @@ -1,4 +1,4 @@ > packageBin $ exists target/**/app_3.3.5-0.1.0-SNAPSHOT.jar -$ exists target/**/app_3.8.2-0.1.0-SNAPSHOT.jar -> core3_8_2/check +$ exists target/**/app_3.8.3-0.1.0-SNAPSHOT.jar +> core3_8_3/check diff --git a/sbt-app/src/sbt-test/project-matrix/source-dep/build.sbt b/sbt-app/src/sbt-test/project-matrix/source-dep/build.sbt index 4cd63d118..554ccd414 100644 --- a/sbt-app/src/sbt-test/project-matrix/source-dep/build.sbt +++ b/sbt-app/src/sbt-test/project-matrix/source-dep/build.sbt @@ -1,5 +1,5 @@ // https://github.com/sbt/sbt/issues/8971 -ThisBuild / scalaVersion := "3.8.2" +ThisBuild / scalaVersion := "3.8.3" lazy val extLib = ProjectRef(file("ext/lib"), "lib") diff --git a/sbt-app/src/sbt-test/project-matrix/source-dep/ext/lib/build.sbt b/sbt-app/src/sbt-test/project-matrix/source-dep/ext/lib/build.sbt index 9e5c68ec1..9ac698ff6 100644 --- a/sbt-app/src/sbt-test/project-matrix/source-dep/ext/lib/build.sbt +++ b/sbt-app/src/sbt-test/project-matrix/source-dep/ext/lib/build.sbt @@ -1,7 +1,7 @@ -ThisBuild / scalaVersion := "3.8.2" +ThisBuild / scalaVersion := "3.8.3" lazy val lib = (projectMatrix in file(".")) .settings( name := "lib", ) - .jvmPlatform(scalaVersions = Seq("3.8.2")) + .jvmPlatform(scalaVersions = Seq("3.8.3")) diff --git a/sbt-app/src/sbt-test/project/Class.forName/build.sbt b/sbt-app/src/sbt-test/project/Class.forName/build.sbt index df172c5a2..768c1f6c5 100644 --- a/sbt-app/src/sbt-test/project/Class.forName/build.sbt +++ b/sbt-app/src/sbt-test/project/Class.forName/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "3.8.2" +scalaVersion := "3.8.3" crossPaths := false name := "definition-lib-forname-test" version := "1.0" diff --git a/sbt-app/src/sbt-test/project/nested-macro/build.sbt b/sbt-app/src/sbt-test/project/nested-macro/build.sbt index 4e50090cd..50df53547 100644 --- a/sbt-app/src/sbt-test/project/nested-macro/build.sbt +++ b/sbt-app/src/sbt-test/project/nested-macro/build.sbt @@ -1,6 +1,6 @@ lazy val a1 = settingKey[Boolean]("") -scalaVersion := "3.8.2" +scalaVersion := "3.8.3" a1 := true Compile / sourceGenerators += { diff --git a/sbt-app/src/sbt-test/project/no-delegate/build.sbt b/sbt-app/src/sbt-test/project/no-delegate/build.sbt index 37c578417..26462895c 100644 --- a/sbt-app/src/sbt-test/project/no-delegate/build.sbt +++ b/sbt-app/src/sbt-test/project/no-delegate/build.sbt @@ -1 +1 @@ -scalaVersion := "3.8.2" +scalaVersion := "3.8.3" diff --git a/sbt-app/src/sbt-test/project/remove/build.sbt b/sbt-app/src/sbt-test/project/remove/build.sbt index caf33b7d7..80f0ae435 100644 --- a/sbt-app/src/sbt-test/project/remove/build.sbt +++ b/sbt-app/src/sbt-test/project/remove/build.sbt @@ -11,7 +11,7 @@ lazy val intsSetting2 = Def.setting { Seq(1, 2, 3) } -scalaVersion := "3.8.2" +scalaVersion := "3.8.3" intsTask := Seq(1, 2, 3, 4, 5, 6, 7) intsTask -= 3 @@ -30,10 +30,10 @@ intsSetting -= intSetting2.value intsSetting --= intsSetting2.value intsFromScalaV := Seq(1, 2, 3, 4, 5, 6, 7) -intsFromScalaV -= { if scalaVersion.value == "3.8.2" then 3 else 5 } -intsFromScalaV --= { if scalaVersion.value == "3.8.2" then Seq(1, 2) else Seq(4) } -intsFromScalaV -= { if scalaVersion.value == "3.8.2" then Option(6) else None } -intsFromScalaV --= { if scalaVersion.value == "3.8.2" then Option(7) else None } +intsFromScalaV -= { if scalaVersion.value == "3.8.3" then 3 else 5 } +intsFromScalaV --= { if scalaVersion.value == "3.8.3" then Seq(1, 2) else Seq(4) } +intsFromScalaV -= { if scalaVersion.value == "3.8.3" then Option(6) else None } +intsFromScalaV --= { if scalaVersion.value == "3.8.3" then Option(7) else None } intsSetSetting := Set(1, 2, 3, 4, 5, 6, 7) intsSetSetting -= 3 diff --git a/sbt-app/src/sbt-test/project/settings-delegate/build.sbt b/sbt-app/src/sbt-test/project/settings-delegate/build.sbt index 37c578417..26462895c 100644 --- a/sbt-app/src/sbt-test/project/settings-delegate/build.sbt +++ b/sbt-app/src/sbt-test/project/settings-delegate/build.sbt @@ -1 +1 @@ -scalaVersion := "3.8.2" +scalaVersion := "3.8.3" diff --git a/sbt-app/src/sbt-test/tests/fork-main-resources/build.sbt b/sbt-app/src/sbt-test/tests/fork-main-resources/build.sbt index 21fc50e1b..ee5a70376 100644 --- a/sbt-app/src/sbt-test/tests/fork-main-resources/build.sbt +++ b/sbt-app/src/sbt-test/tests/fork-main-resources/build.sbt @@ -1,6 +1,6 @@ val scalatest = "org.scalatest" %% "scalatest" % "3.2.19" -scalaVersion := "3.8.2" +scalaVersion := "3.8.3" Test / fork := true libraryDependencies += scalatest % Test diff --git a/sbt-app/src/sbt-test/tests/fork2/build.sbt b/sbt-app/src/sbt-test/tests/fork2/build.sbt index e4b187af6..7a0fc6589 100644 --- a/sbt-app/src/sbt-test/tests/fork2/build.sbt +++ b/sbt-app/src/sbt-test/tests/fork2/build.sbt @@ -1,5 +1,5 @@ val scalatest = "org.scalatest" %% "scalatest" % "3.2.19" -scalaVersion := "3.8.2" +scalaVersion := "3.8.3" fork := true libraryDependencies += scalatest % Test diff --git a/sbt-app/src/sbt-test/tests/incremental-object-deps/build.sbt b/sbt-app/src/sbt-test/tests/incremental-object-deps/build.sbt index 711293b1d..bc5c7b183 100644 --- a/sbt-app/src/sbt-test/tests/incremental-object-deps/build.sbt +++ b/sbt-app/src/sbt-test/tests/incremental-object-deps/build.sbt @@ -1,3 +1,3 @@ -scalaVersion := "3.8.2" +scalaVersion := "3.8.3" libraryDependencies += "com.eed3si9n.verify" %% "verify" % "1.0.0" % Test testFrameworks += new TestFramework("verify.runner.Framework") diff --git a/sbt-app/src/sbt-test/tests/t543/build.sbt b/sbt-app/src/sbt-test/tests/t543/build.sbt index d759474fe..2a6120849 100644 --- a/sbt-app/src/sbt-test/tests/t543/build.sbt +++ b/sbt-app/src/sbt-test/tests/t543/build.sbt @@ -6,7 +6,7 @@ val marker = new File("marker") val check = TaskKey[Unit]("check", "Check correct error has been returned.") val scalatest = "org.scalatest" %% "scalatest" % "3.2.19" -ThisBuild / scalaVersion := "3.8.2" +ThisBuild / scalaVersion := "3.8.3" lazy val root = (project in file(".")). settings( diff --git a/server-test/src/server-test/channel-cursor/build.sbt b/server-test/src/server-test/channel-cursor/build.sbt index b48b042c4..4d170479b 100644 --- a/server-test/src/server-test/channel-cursor/build.sbt +++ b/server-test/src/server-test/channel-cursor/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "3.8.2" +scalaVersion := "3.8.3" val printCurrentProject = inputKey[Unit]("Prints current project name") diff --git a/server-test/src/server-test/client/build.sbt b/server-test/src/server-test/client/build.sbt index 8a1a07a43..b26c7209d 100644 --- a/server-test/src/server-test/client/build.sbt +++ b/server-test/src/server-test/client/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "3.8.2" +scalaVersion := "3.8.3" TaskKey[Unit]("willSucceed") := println("success")