From 1254bd33e504501356cf10fb418efe9b5d779f0f Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 8 Nov 2025 14:17:00 -0500 Subject: [PATCH 01/13] Use internal config for dependency tree (for Provided) **Problem** dependency-tree currently doesn't include Provided configuration, because technically it isn't part of the Compile configuration, however, Provided does become part of the Compile classpath during compilation. **Solution** This changes the implementation to use the internal configuration, e.g. CompileInternal, which includes the auxilary configurations. There's a tradeoff here since it means that we lose the tree view of the platonic Compile configuration. --- main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala b/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala index 85618a77d..977703744 100644 --- a/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala +++ b/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala @@ -70,8 +70,9 @@ object DependencyTreeSettings { ), dependencyTreeModuleGraph0 := { val sv = scalaVersion.value + val internalConfig = Configurations.internalMap(configuration.value) val g = dependencyTreeIgnoreMissingUpdate.value - .configuration(configuration.value) + .configuration(internalConfig) .map( report => SbtUpdateReport.fromConfigurationReport(report, dependencyTreeCrossProjectId.value) From 724027f8adbf837d7cacd6887a56a1a299207581 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Mon, 1 Dec 2025 14:50:38 +0100 Subject: [PATCH 02/13] Scala 2.13.18 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 47d798632..619910d9d 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -5,7 +5,7 @@ import sbt.contraband.ContrabandPlugin.autoImport._ object Dependencies { // WARNING: Please Scala update versions in PluginCross.scala too val scala212 = "2.12.20" - val scala213 = "2.13.17" + val scala213 = "2.13.18" val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up") val baseScalaVersion = scala212 def nightlyVersion: Option[String] = From e8e44aab10bc4aab7e637c976e4ff6f746c08ccc Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 8 Dec 2025 23:51:39 -0500 Subject: [PATCH 03/13] launcher 1.5.2 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 619910d9d..cfac2cf71 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -22,7 +22,7 @@ object Dependencies { private val libraryManagementCore = "org.scala-sbt" %% "librarymanagement-core" % lmVersion private val libraryManagementIvy = "org.scala-sbt" %% "librarymanagement-ivy" % lmVersion - val launcherVersion = "1.5.1" + val launcherVersion = "1.5.2" val launcherInterface = "org.scala-sbt" % "launcher-interface" % launcherVersion val rawLauncher = "org.scala-sbt" % "launcher" % launcherVersion val testInterface = "org.scala-sbt" % "test-interface" % "1.0" From 70960744e7db38dcf2a46005adf90e92bd5e710e Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Tue, 9 Dec 2025 17:06:51 +0900 Subject: [PATCH 04/13] Scala 2.12.21 --- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- launcher-package/build.sbt | 6 +++--- main/src/main/scala/sbt/PluginCross.scala | 2 +- main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala | 2 +- project/Dependencies.scala | 2 +- sbt-app/src/sbt-test/actions/cross-advanced/build.sbt | 2 +- sbt-app/src/sbt-test/actions/cross-advanced/test | 2 +- sbt-app/src/sbt-test/actions/cross-incremental/build.sbt | 4 ++-- sbt-app/src/sbt-test/actions/cross-multi-parser/build.sbt | 2 +- sbt-app/src/sbt-test/actions/cross-multi-parser/test | 4 ++-- sbt-app/src/sbt-test/actions/cross-multiproject/build.sbt | 2 +- .../src/sbt-test/actions/cross-multiproject/ref/build.sbt | 2 +- sbt-app/src/sbt-test/actions/cross-multiproject/test | 6 +++--- .../actions/cross-strict-aggregation-scala-3/build.sbt | 6 +++--- .../src/sbt-test/actions/cross-strict-aggregation/build.sbt | 2 +- sbt-app/src/sbt-test/actions/doc-file-options/build.sbt | 2 +- sbt-app/src/sbt-test/actions/doc/build.sbt | 4 ++-- sbt-app/src/sbt-test/actions/generator/build.sbt | 2 +- sbt-app/src/sbt-test/actions/multi-command/build.sbt | 2 +- sbt-app/src/sbt-test/actions/multi-command/test | 2 +- .../src/sbt-test/actions/package-delete-target/build.sbt | 2 +- .../src/sbt-test/actions/remote-cache-semanticdb/build.sbt | 2 +- sbt-app/src/sbt-test/actions/remote-cache/build.sbt | 2 +- .../sbt-test/classloader-cache/akka-actor-system/build.sbt | 2 +- sbt-app/src/sbt-test/classloader-cache/jni/build.sbt | 2 +- .../sbt-test/classloader-cache/library-mismatch/build.sbt | 2 +- .../src/sbt-test/classloader-cache/runtime-layers/build.sbt | 2 +- sbt-app/src/sbt-test/classloader-cache/spark/build.sbt | 2 +- sbt-app/src/sbt-test/classloader-cache/utest/build.sbt | 2 +- .../compiler-project/error-in-invalidated/build.sbt | 2 +- .../src/sbt-test/compiler-project/macro-config/build.sbt | 2 +- sbt-app/src/sbt-test/compiler-project/no-bootclasspath/test | 2 +- sbt-app/src/sbt-test/compiler-project/run-test/build.sbt | 2 +- .../compiler-project/separate-analysis-per-scala/build.sbt | 2 +- .../console/project-compiler-bridge/project/build.sbt | 2 +- .../sbt-test/dependency-graph/cachedResolution/build.sbt | 2 +- .../sbt-test/dependency-graph/ignoreScalaLibrary/build.sbt | 2 +- .../src/sbt-test/dependency-graph/toFileSubTask/build.sbt | 2 +- .../src/sbt-test/dependency-management/artifact/build.sbt | 2 +- .../dependency-management/cache-classifiers/multi.sbt | 2 +- .../cached-resolution-interproj/multi.sbt | 2 +- .../dependency-management/compiler-bridge-binary/build.sbt | 2 +- .../dependency-management/conflict-coursier/build.sbt | 2 +- .../dependency-management/ext-pom-classifier/build.sbt | 2 +- .../dependency-management/force-update-period/build.sbt | 2 +- .../sbt-test/dependency-management/global-plugins/build.sbt | 2 +- .../sbt-test/dependency-management/snapshot-local/build.sbt | 2 +- .../dependency-management/snapshot-resolution/build.sbt | 2 +- sbt-app/src/sbt-test/java/cross/build.sbt | 2 +- sbt-app/src/sbt-test/java/cross/changes/build.sbt | 2 +- sbt-app/src/sbt-test/plugins/hydra/build.sbt | 2 +- sbt-app/src/sbt-test/plugins/sbt-native-packager/build.sbt | 2 +- sbt-app/src/sbt-test/plugins/unidoc/build.sbt | 2 +- sbt-app/src/sbt-test/project/aggregate/projA/build.sbt | 2 +- .../src/sbt-test/project/cross-plugins-defaults/build.sbt | 4 ++-- sbt-app/src/sbt-test/project/flatten/build.sbt | 2 +- sbt-app/src/sbt-test/project/internal-tracking/build.sbt | 2 +- sbt-app/src/sbt-test/project/sbt-plugin/build.sbt | 2 +- .../sbt-test/project/sbt-plugin/changes/oldSbtPlugin.sbt | 2 +- sbt-app/src/sbt-test/project/semanticdb/build.sbt | 2 +- sbt-app/src/sbt-test/project/unified/build.sbt | 2 +- sbt-app/src/sbt-test/run/fork-loader/build.sbt | 2 +- sbt-app/src/sbt-test/run/jep-512/build.sbt | 2 +- sbt-app/src/sbt-test/source-dependencies/binary/build.sbt | 2 +- sbt-app/src/sbt-test/source-dependencies/constants/test | 2 +- sbt-app/src/sbt-test/source-dependencies/cross-source/test | 2 +- .../sbt-test/source-dependencies/macro-annotation/build.sbt | 2 +- .../source-dependencies/macro-arg-dep-nested/build.sbt | 2 +- .../macro-arg-dep-stackoverflow/build.sbt | 2 +- .../sbt-test/source-dependencies/macro-arg-dep/build.sbt | 2 +- sbt-app/src/sbt-test/source-dependencies/macro/build.sbt | 2 +- sbt-app/src/sbt-test/tests/arguments/build.sbt | 2 +- sbt-app/src/sbt-test/tests/do-not-discover/build.sbt | 2 +- sbt-app/src/sbt-test/tests/done/build.sbt | 2 +- sbt-app/src/sbt-test/tests/filter-runners/build.sbt | 2 +- sbt-app/src/sbt-test/tests/fork-async/build.sbt | 2 +- sbt-app/src/sbt-test/tests/fork-parallel/build.sbt | 2 +- .../tests/fork-test-group-parallel-custom-tags/build.sbt | 2 +- .../src/sbt-test/tests/fork-test-group-parallel/build.sbt | 2 +- sbt-app/src/sbt-test/tests/fork-uncaught2/build.sbt | 2 +- sbt-app/src/sbt-test/tests/fork/build.sbt | 2 +- sbt-app/src/sbt-test/tests/fork2/build.sbt | 2 +- .../src/sbt-test/tests/incremental-object-sources/build.sbt | 2 +- sbt-app/src/sbt-test/tests/incremental/build.sbt | 2 +- sbt-app/src/sbt-test/tests/it/build.sbt | 2 +- sbt-app/src/sbt-test/tests/junit-xml-report/build.sbt | 2 +- sbt-app/src/sbt-test/tests/munit/build.sbt | 2 +- sbt-app/src/sbt-test/tests/nested-inproc-par/build.sbt | 2 +- sbt-app/src/sbt-test/tests/nested-inproc-seq/build.sbt | 2 +- sbt-app/src/sbt-test/tests/nested-subproc/build.sbt | 2 +- sbt-app/src/sbt-test/tests/nested-tests/build.sbt | 2 +- .../src/sbt-test/tests/one-class-multi-framework/build.sbt | 2 +- sbt-app/src/sbt-test/tests/order/build.sbt | 2 +- sbt-app/src/sbt-test/tests/resources/build.sbt | 2 +- .../src/sbt-test/tests/scala-instance-classloader/build.sbt | 2 +- sbt-app/src/sbt-test/tests/serial/build.sbt | 2 +- sbt-app/src/sbt-test/tests/setup-cleanup/base.sbt | 2 +- sbt-app/src/sbt-test/tests/single-runner/build.sbt | 2 +- sbt-app/src/sbt-test/tests/specs-run/build.sbt | 2 +- sbt-app/src/sbt-test/tests/t543/build.sbt | 2 +- sbt-app/src/sbt-test/tests/task/build.sbt | 2 +- sbt-app/src/sbt-test/tests/test-exclude/build.sbt | 2 +- sbt-app/src/sbt-test/watch/commands/build.sbt | 2 +- server-test/src/server-test/response/build.sbt | 2 +- 105 files changed, 115 insertions(+), 115 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c3e3d839..b4097aa0a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,7 @@ jobs: env: JAVA_OPTS: -Xms800M -Xmx2G -Xss6M -XX:ReservedCodeCacheSize=128M -server -Dsbt.io.virtual=false -Dfile.encoding=UTF-8 JVM_OPTS: -Xms800M -Xmx2G -Xss6M -XX:ReservedCodeCacheSize=128M -server -Dsbt.io.virtual=false -Dfile.encoding=UTF-8 - SCALA_212: 2.12.20 + SCALA_212: 2.12.21 UTIL_TESTS: "utilCache/test utilControl/test utilInterface/test utilLogging/test utilPosition/test utilRelation/test utilScripted/test utilTracking/test" SBT_ETC_FILE: $HOME/etc/sbt/sbtopts JDK11: adopt@1.11.0-9 diff --git a/build.sbt b/build.sbt index 8f6afffae..d6118bab8 100644 --- a/build.sbt +++ b/build.sbt @@ -48,7 +48,7 @@ ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" Global / semanticdbEnabled := !(Global / insideCI).value // Change main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala too, if you change this. -Global / semanticdbVersion := "4.14.1" +Global / semanticdbVersion := "4.14.2" val excludeLint = SettingKey[Set[Def.KeyedInitialize[_]]]("excludeLintKeys") Global / excludeLint := (Global / excludeLint).?.value.getOrElse(Set.empty) Global / excludeLint += componentID diff --git a/launcher-package/build.sbt b/launcher-package/build.sbt index a65414f16..53e00cb55 100755 --- a/launcher-package/build.sbt +++ b/launcher-package/build.sbt @@ -26,7 +26,7 @@ lazy val sbtVersionToRelease = sys.props.getOrElse("sbt.build.version", sys.env. })) lazy val scala210 = "2.10.7" -lazy val scala212 = "2.12.20" +lazy val scala212 = "2.12.21" lazy val scala210Jline = "org.scala-lang" % "jline" % scala210 lazy val jansi = { if (sbtVersionToRelease startsWith "1.") "org.fusesource.jansi" % "jansi" % "1.12" @@ -34,8 +34,8 @@ lazy val jansi = { } lazy val scala212Compiler = "org.scala-lang" % "scala-compiler" % scala212 lazy val scala212Jline = "jline" % "jline" % "2.14.6" -// use the scala-xml version used by the compiler not the latest: https://github.com/scala/scala/blob/v2.12.20/versions.properties -lazy val scala212Xml = "org.scala-lang.modules" % "scala-xml_2.12" % "2.2.0" +// use the scala-xml version used by the compiler not the latest: https://github.com/scala/scala/blob/v2.12.21/versions.properties +lazy val scala212Xml = "org.scala-lang.modules" % "scala-xml_2.12" % "2.3.0" lazy val sbtActual = "org.scala-sbt" % "sbt" % sbtVersionToRelease lazy val sbt013ExtraDeps = { diff --git a/main/src/main/scala/sbt/PluginCross.scala b/main/src/main/scala/sbt/PluginCross.scala index 6ce9bc5c5..69defd595 100644 --- a/main/src/main/scala/sbt/PluginCross.scala +++ b/main/src/main/scala/sbt/PluginCross.scala @@ -100,7 +100,7 @@ private[sbt] object PluginCross { VersionNumber(sv) match { case VersionNumber(Seq(0, 12, _*), _, _) => "2.9.2" case VersionNumber(Seq(0, 13, _*), _, _) => "2.10.7" - case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.20" + case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.21" case _ => sys.error(s"Unsupported sbt binary version: $sv") } } diff --git a/main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala b/main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala index 040d5bbf8..af859bf03 100644 --- a/main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala +++ b/main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala @@ -27,7 +27,7 @@ object SemanticdbPlugin extends AutoPlugin { semanticdbEnabled := SysProp.semanticdb, semanticdbIncludeInJar := false, semanticdbOptions := List(), - semanticdbVersion := "4.14.1" + semanticdbVersion := "4.14.2" ) override lazy val projectSettings: Seq[Def.Setting[_]] = Seq( diff --git a/project/Dependencies.scala b/project/Dependencies.scala index cfac2cf71..211051ebc 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,7 +4,7 @@ import sbt.contraband.ContrabandPlugin.autoImport._ object Dependencies { // WARNING: Please Scala update versions in PluginCross.scala too - val scala212 = "2.12.20" + val scala212 = "2.12.21" val scala213 = "2.13.18" val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up") val baseScalaVersion = scala212 diff --git a/sbt-app/src/sbt-test/actions/cross-advanced/build.sbt b/sbt-app/src/sbt-test/actions/cross-advanced/build.sbt index 703f9b26a..6a2111332 100644 --- a/sbt-app/src/sbt-test/actions/cross-advanced/build.sbt +++ b/sbt-app/src/sbt-test/actions/cross-advanced/build.sbt @@ -1,6 +1,6 @@ lazy val check = taskKey[Unit]("") lazy val compile2 = taskKey[Unit]("") -lazy val scala212 = "2.12.20" +lazy val scala212 = "2.12.21" lazy val scala213 = "2.13.12" lazy val root = (project in file(".")) diff --git a/sbt-app/src/sbt-test/actions/cross-advanced/test b/sbt-app/src/sbt-test/actions/cross-advanced/test index 47912f43c..9d3363300 100644 --- a/sbt-app/src/sbt-test/actions/cross-advanced/test +++ b/sbt-app/src/sbt-test/actions/cross-advanced/test @@ -17,7 +17,7 @@ ## test + with command or alias > clean ## for command cross building you do need crossScalaVerions on root -> set root/crossScalaVersions := Seq("2.12.20", "2.13.12") +> set root/crossScalaVersions := Seq("2.12.21", "2.13.12") > + build $ exists foo/target/scala-2.12 $ exists foo/target/scala-2.13 diff --git a/sbt-app/src/sbt-test/actions/cross-incremental/build.sbt b/sbt-app/src/sbt-test/actions/cross-incremental/build.sbt index 79b7bdf27..750ad2d40 100644 --- a/sbt-app/src/sbt-test/actions/cross-incremental/build.sbt +++ b/sbt-app/src/sbt-test/actions/cross-incremental/build.sbt @@ -1,5 +1,5 @@ -scalaVersion := "2.12.20" -crossScalaVersions := List("2.12.20", "2.13.12") +scalaVersion := "2.12.21" +crossScalaVersions := List("2.12.21", "2.13.12") val setLastModified = taskKey[Unit]("Sets the last modified time for classfiles") setLastModified := { diff --git a/sbt-app/src/sbt-test/actions/cross-multi-parser/build.sbt b/sbt-app/src/sbt-test/actions/cross-multi-parser/build.sbt index bb4a1ec0e..78940329b 100644 --- a/sbt-app/src/sbt-test/actions/cross-multi-parser/build.sbt +++ b/sbt-app/src/sbt-test/actions/cross-multi-parser/build.sbt @@ -1 +1 @@ -crossScalaVersions := Seq[String]("2.11.12", "2.12.20") +crossScalaVersions := Seq[String]("2.11.12", "2.12.21") diff --git a/sbt-app/src/sbt-test/actions/cross-multi-parser/test b/sbt-app/src/sbt-test/actions/cross-multi-parser/test index 005518291..901942626 100644 --- a/sbt-app/src/sbt-test/actions/cross-multi-parser/test +++ b/sbt-app/src/sbt-test/actions/cross-multi-parser/test @@ -1,5 +1,5 @@ > ++2.11.12; compile -> ++ 2.12.20 ; compile; +> ++ 2.12.21 ; compile; -> ++ 2.12.20 ; compile +> ++ 2.12.21 ; compile diff --git a/sbt-app/src/sbt-test/actions/cross-multiproject/build.sbt b/sbt-app/src/sbt-test/actions/cross-multiproject/build.sbt index 4f2d58d77..da44e375d 100644 --- a/sbt-app/src/sbt-test/actions/cross-multiproject/build.sbt +++ b/sbt-app/src/sbt-test/actions/cross-multiproject/build.sbt @@ -1,4 +1,4 @@ -lazy val scala212 = "2.12.20" +lazy val scala212 = "2.12.21" lazy val scala213 = "2.13.12" ThisBuild / crossScalaVersions := Seq(scala212, scala213) diff --git a/sbt-app/src/sbt-test/actions/cross-multiproject/ref/build.sbt b/sbt-app/src/sbt-test/actions/cross-multiproject/ref/build.sbt index 32936b7d0..fa7c04a58 100644 --- a/sbt-app/src/sbt-test/actions/cross-multiproject/ref/build.sbt +++ b/sbt-app/src/sbt-test/actions/cross-multiproject/ref/build.sbt @@ -1,4 +1,4 @@ lazy val external = (project in file(".")) .settings( - scalaVersion := "2.12.20" + scalaVersion := "2.12.21" ) diff --git a/sbt-app/src/sbt-test/actions/cross-multiproject/test b/sbt-app/src/sbt-test/actions/cross-multiproject/test index 03a96cb83..41e4d9401 100644 --- a/sbt-app/src/sbt-test/actions/cross-multiproject/test +++ b/sbt-app/src/sbt-test/actions/cross-multiproject/test @@ -13,7 +13,7 @@ $ exists lib/target/scala-2.13 # test safe switching > clean -> ++ 2.12.20 -v compile +> ++ 2.12.21 -v compile $ exists lib/target/scala-2.12 -$ exists lib/target/scala-2.13 $ exists sbt-foo/target/scala-2.12 @@ -23,7 +23,7 @@ $ exists ref/target/scala-2.12 # test safe switching > clean -> ++ 2.12.20 -v libProj/compile +> ++ 2.12.21 -v libProj/compile $ exists lib/target/scala-2.12 -$ exists lib/target/scala-2.13 @@ -37,7 +37,7 @@ $ exists lib/target/scala-2.12 # Test ++ leaves crossScalaVersions unchanged > clean -> ++2.12.20 +> ++2.12.21 > +extrasProj/compile $ exists extras/target/scala-2.13 $ exists extras/target/scala-2.12 diff --git a/sbt-app/src/sbt-test/actions/cross-strict-aggregation-scala-3/build.sbt b/sbt-app/src/sbt-test/actions/cross-strict-aggregation-scala-3/build.sbt index 6e5d27874..1fcdde88c 100644 --- a/sbt-app/src/sbt-test/actions/cross-strict-aggregation-scala-3/build.sbt +++ b/sbt-app/src/sbt-test/actions/cross-strict-aggregation-scala-3/build.sbt @@ -1,14 +1,14 @@ -scalaVersion := "2.12.20" +scalaVersion := "2.12.21" lazy val core = project .settings( - crossScalaVersions := Seq("2.12.20", "3.3.1", "3.5.1") + crossScalaVersions := Seq("2.12.21", "3.3.1", "3.5.1") ) lazy val subproj = project .dependsOn(core) .settings( - crossScalaVersions := Seq("2.12.20", "3.5.1"), + crossScalaVersions := Seq("2.12.21", "3.5.1"), // a random library compiled against Scala 3.1 libraryDependencies += "org.http4s" %% "http4s-core" % "0.23.28" ) diff --git a/sbt-app/src/sbt-test/actions/cross-strict-aggregation/build.sbt b/sbt-app/src/sbt-test/actions/cross-strict-aggregation/build.sbt index d5b43e321..d4c721125 100644 --- a/sbt-app/src/sbt-test/actions/cross-strict-aggregation/build.sbt +++ b/sbt-app/src/sbt-test/actions/cross-strict-aggregation/build.sbt @@ -1,4 +1,4 @@ -lazy val scala212 = "2.12.20" +lazy val scala212 = "2.12.21" lazy val scala213 = "2.13.12" ThisBuild / scalaVersion := scala212 diff --git a/sbt-app/src/sbt-test/actions/doc-file-options/build.sbt b/sbt-app/src/sbt-test/actions/doc-file-options/build.sbt index a8b68c48a..757537c04 100644 --- a/sbt-app/src/sbt-test/actions/doc-file-options/build.sbt +++ b/sbt-app/src/sbt-test/actions/doc-file-options/build.sbt @@ -2,7 +2,7 @@ val newContents = "bbbbbbbbb" val rootContentFile = "root.txt" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" lazy val root = (project in file(".")) .settings( diff --git a/sbt-app/src/sbt-test/actions/doc/build.sbt b/sbt-app/src/sbt-test/actions/doc/build.sbt index da46ccd46..c507844f7 100644 --- a/sbt-app/src/sbt-test/actions/doc/build.sbt +++ b/sbt-app/src/sbt-test/actions/doc/build.sbt @@ -5,8 +5,8 @@ import Parsers._ lazy val root = (project in file(".")) .settings( crossPaths := false, - crossScalaVersions := Seq("2.12.20", "2.13.12"), - scalaVersion := "2.12.20", + crossScalaVersions := Seq("2.12.21", "2.13.12"), + scalaVersion := "2.12.21", Compile / doc / scalacOptions += "-Xfatal-warnings", commands += Command.command("excludeB") { s => val impl = """val src = (sources in Compile).value; src.filterNot(_.getName.contains("B"))""" diff --git a/sbt-app/src/sbt-test/actions/generator/build.sbt b/sbt-app/src/sbt-test/actions/generator/build.sbt index 3537ae7b0..24c52d184 100644 --- a/sbt-app/src/sbt-test/actions/generator/build.sbt +++ b/sbt-app/src/sbt-test/actions/generator/build.sbt @@ -1,6 +1,6 @@ val buildInfo = taskKey[Seq[File]]("generates the build info") -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" lazy val root = (project in file(".")) .settings( diff --git a/sbt-app/src/sbt-test/actions/multi-command/build.sbt b/sbt-app/src/sbt-test/actions/multi-command/build.sbt index 606ba1657..0a9496169 100644 --- a/sbt-app/src/sbt-test/actions/multi-command/build.sbt +++ b/sbt-app/src/sbt-test/actions/multi-command/build.sbt @@ -19,4 +19,4 @@ val dynamicTask = taskKey[Unit]("dynamic input task") dynamicTask := { println("not yet et") } -crossScalaVersions := "2.11.12" :: "2.12.20" :: Nil +crossScalaVersions := "2.11.12" :: "2.12.21" :: Nil diff --git a/sbt-app/src/sbt-test/actions/multi-command/test b/sbt-app/src/sbt-test/actions/multi-command/test index 323702a6d..71ae4189b 100644 --- a/sbt-app/src/sbt-test/actions/multi-command/test +++ b/sbt-app/src/sbt-test/actions/multi-command/test @@ -37,4 +37,4 @@ > ++ 2.11.12 compile; setStringValue bar; checkStringValue bar -> ++2.12.20 compile; setStringValue foo; checkStringValue foo +> ++2.12.21 compile; setStringValue foo; checkStringValue foo diff --git a/sbt-app/src/sbt-test/actions/package-delete-target/build.sbt b/sbt-app/src/sbt-test/actions/package-delete-target/build.sbt index 01163a404..43cbc1012 100644 --- a/sbt-app/src/sbt-test/actions/package-delete-target/build.sbt +++ b/sbt-app/src/sbt-test/actions/package-delete-target/build.sbt @@ -1,5 +1,5 @@ lazy val root = (project in file(".")) .settings( name := "delete-target", - scalaVersion := "2.12.20" + scalaVersion := "2.12.21" ) diff --git a/sbt-app/src/sbt-test/actions/remote-cache-semanticdb/build.sbt b/sbt-app/src/sbt-test/actions/remote-cache-semanticdb/build.sbt index 3153cb66d..fe2c9971e 100644 --- a/sbt-app/src/sbt-test/actions/remote-cache-semanticdb/build.sbt +++ b/sbt-app/src/sbt-test/actions/remote-cache-semanticdb/build.sbt @@ -1,6 +1,6 @@ name := "my-project" -scalaVersion := "2.12.20" +scalaVersion := "2.12.21" semanticdbIncludeInJar := true diff --git a/sbt-app/src/sbt-test/actions/remote-cache/build.sbt b/sbt-app/src/sbt-test/actions/remote-cache/build.sbt index e99d9a854..8d4bf4b98 100644 --- a/sbt-app/src/sbt-test/actions/remote-cache/build.sbt +++ b/sbt-app/src/sbt-test/actions/remote-cache/build.sbt @@ -8,7 +8,7 @@ lazy val CustomArtifact = config("custom-artifact") val recordPreviousIterations = taskKey[Unit]("Record previous iterations.") val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.") -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" ThisBuild / pushRemoteCacheTo := Some( MavenCache("local-cache", (ThisBuild / baseDirectory).value / "r") ) diff --git a/sbt-app/src/sbt-test/classloader-cache/akka-actor-system/build.sbt b/sbt-app/src/sbt-test/classloader-cache/akka-actor-system/build.sbt index f2309bb9b..496c7966f 100644 --- a/sbt-app/src/sbt-test/classloader-cache/akka-actor-system/build.sbt +++ b/sbt-app/src/sbt-test/classloader-cache/akka-actor-system/build.sbt @@ -2,7 +2,7 @@ ThisBuild / turbo := true val akkaTest = (project in file(".")).settings( name := "akka-test", - scalaVersion := "2.12.20", + scalaVersion := "2.12.21", libraryDependencies ++= Seq( "com.typesafe.akka" %% "akka-actor" % "2.5.16", "com.lihaoyi" %% "utest" % "0.6.6" % "test" diff --git a/sbt-app/src/sbt-test/classloader-cache/jni/build.sbt b/sbt-app/src/sbt-test/classloader-cache/jni/build.sbt index abbc5b082..94b25608b 100644 --- a/sbt-app/src/sbt-test/classloader-cache/jni/build.sbt +++ b/sbt-app/src/sbt-test/classloader-cache/jni/build.sbt @@ -13,7 +13,7 @@ def wrap(task: InputKey[Unit]): Def.Initialize[Task[Unit]] = ThisBuild / turbo := true val root = (project in file(".")).settings( - scalaVersion := "2.12.20", + scalaVersion := "2.12.21", javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-h", sourceDirectory.value.toPath.resolve("main/native/include").toString), libraryDependencies += "com.lihaoyi" %% "utest" % "0.6.6" % "test", diff --git a/sbt-app/src/sbt-test/classloader-cache/library-mismatch/build.sbt b/sbt-app/src/sbt-test/classloader-cache/library-mismatch/build.sbt index fb6fcaac0..231779239 100644 --- a/sbt-app/src/sbt-test/classloader-cache/library-mismatch/build.sbt +++ b/sbt-app/src/sbt-test/classloader-cache/library-mismatch/build.sbt @@ -2,7 +2,7 @@ ThisBuild / turbo := true val snapshot = (project in file(".")).settings( name := "mismatched-libraries", - scalaVersion := "2.12.20", + scalaVersion := "2.12.21", libraryDependencies ++= Seq("com.lihaoyi" %% "utest" % "0.6.6" % "test"), testFrameworks := Seq(TestFramework("utest.runner.Framework")), resolvers += "Local Maven" at file("libraries/ivy").toURI.toURL.toString, diff --git a/sbt-app/src/sbt-test/classloader-cache/runtime-layers/build.sbt b/sbt-app/src/sbt-test/classloader-cache/runtime-layers/build.sbt index 215014a80..0f61a2281 100644 --- a/sbt-app/src/sbt-test/classloader-cache/runtime-layers/build.sbt +++ b/sbt-app/src/sbt-test/classloader-cache/runtime-layers/build.sbt @@ -1,6 +1,6 @@ val layeringStrategyTest = (project in file(".")).settings( name := "layering-strategy-test", - scalaVersion := "2.12.20", + scalaVersion := "2.12.21", organization := "sbt", libraryDependencies += "com.typesafe.akka" %% "akka-actor" % "2.5.16", ) diff --git a/sbt-app/src/sbt-test/classloader-cache/spark/build.sbt b/sbt-app/src/sbt-test/classloader-cache/spark/build.sbt index b105446d8..3cf15fcbd 100644 --- a/sbt-app/src/sbt-test/classloader-cache/spark/build.sbt +++ b/sbt-app/src/sbt-test/classloader-cache/spark/build.sbt @@ -2,7 +2,7 @@ name := "Simple Project" version := "1.0" -scalaVersion := "2.12.20" +scalaVersion := "2.12.21" libraryDependencies += "org.apache.spark" %% "spark-sql" % "2.4.3" diff --git a/sbt-app/src/sbt-test/classloader-cache/utest/build.sbt b/sbt-app/src/sbt-test/classloader-cache/utest/build.sbt index 369160320..ae883b209 100644 --- a/sbt-app/src/sbt-test/classloader-cache/utest/build.sbt +++ b/sbt-app/src/sbt-test/classloader-cache/utest/build.sbt @@ -2,7 +2,7 @@ ThisBuild / turbo := true val utestTest = (project in file(".")).settings( name := "utest-test", - scalaVersion := "2.12.20", + scalaVersion := "2.12.21", libraryDependencies ++= Seq( "com.lihaoyi" %% "utest" % "0.6.6" % "test" ), diff --git a/sbt-app/src/sbt-test/compiler-project/error-in-invalidated/build.sbt b/sbt-app/src/sbt-test/compiler-project/error-in-invalidated/build.sbt index 442a697f7..07d07e336 100644 --- a/sbt-app/src/sbt-test/compiler-project/error-in-invalidated/build.sbt +++ b/sbt-app/src/sbt-test/compiler-project/error-in-invalidated/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" lazy val root = (project in file(".")). settings( diff --git a/sbt-app/src/sbt-test/compiler-project/macro-config/build.sbt b/sbt-app/src/sbt-test/compiler-project/macro-config/build.sbt index 114444c6f..159369733 100644 --- a/sbt-app/src/sbt-test/compiler-project/macro-config/build.sbt +++ b/sbt-app/src/sbt-test/compiler-project/macro-config/build.sbt @@ -5,7 +5,7 @@ val Macro = config("macro").hide.extend(Compile) lazy val root = (project in file(".")) .settings( - scalaVersion := "2.12.20", + scalaVersion := "2.12.21", // Adds a "macro" configuration for macro dependencies. ivyConfigurations.value += Macro, diff --git a/sbt-app/src/sbt-test/compiler-project/no-bootclasspath/test b/sbt-app/src/sbt-test/compiler-project/no-bootclasspath/test index 59b1e34b3..e7e431fff 100644 --- a/sbt-app/src/sbt-test/compiler-project/no-bootclasspath/test +++ b/sbt-app/src/sbt-test/compiler-project/no-bootclasspath/test @@ -1,4 +1,4 @@ > set scalaVersion := "2.13.12" > check213 -> set scalaVersion := "2.12.20" +> set scalaVersion := "2.12.21" > check212 diff --git a/sbt-app/src/sbt-test/compiler-project/run-test/build.sbt b/sbt-app/src/sbt-test/compiler-project/run-test/build.sbt index 60bfe1f86..1689e05e7 100644 --- a/sbt-app/src/sbt-test/compiler-project/run-test/build.sbt +++ b/sbt-app/src/sbt-test/compiler-project/run-test/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" libraryDependencies ++= Seq( "com.novocode" % "junit-interface" % "0.5" % Test, diff --git a/sbt-app/src/sbt-test/compiler-project/separate-analysis-per-scala/build.sbt b/sbt-app/src/sbt-test/compiler-project/separate-analysis-per-scala/build.sbt index bab8177e6..7e2b3f7bb 100644 --- a/sbt-app/src/sbt-test/compiler-project/separate-analysis-per-scala/build.sbt +++ b/sbt-app/src/sbt-test/compiler-project/separate-analysis-per-scala/build.sbt @@ -1,4 +1,4 @@ -lazy val scala212 = "2.12.20" +lazy val scala212 = "2.12.21" lazy val scala213 = "2.13.12" ThisBuild / scalaVersion := scala212 diff --git a/sbt-app/src/sbt-test/console/project-compiler-bridge/project/build.sbt b/sbt-app/src/sbt-test/console/project-compiler-bridge/project/build.sbt index 76f36acc2..9d9f7c53f 100644 --- a/sbt-app/src/sbt-test/console/project-compiler-bridge/project/build.sbt +++ b/sbt-app/src/sbt-test/console/project-compiler-bridge/project/build.sbt @@ -1 +1 @@ -scalaVersion := "2.12.20" +scalaVersion := "2.12.21" diff --git a/sbt-app/src/sbt-test/dependency-graph/cachedResolution/build.sbt b/sbt-app/src/sbt-test/dependency-graph/cachedResolution/build.sbt index 4ecda4a16..a259a9022 100644 --- a/sbt-app/src/sbt-test/dependency-graph/cachedResolution/build.sbt +++ b/sbt-app/src/sbt-test/dependency-graph/cachedResolution/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.12.20" +scalaVersion := "2.12.21" libraryDependencies += "org.slf4j" % "slf4j-api" % "1.7.28" updateOptions := updateOptions.value.withCachedResolution(true) diff --git a/sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/build.sbt b/sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/build.sbt index c05b42e71..986df77dc 100644 --- a/sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/build.sbt +++ b/sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" libraryDependencies ++= Seq( "org.slf4j" % "slf4j-api" % "1.7.2", diff --git a/sbt-app/src/sbt-test/dependency-graph/toFileSubTask/build.sbt b/sbt-app/src/sbt-test/dependency-graph/toFileSubTask/build.sbt index 66a6c1bff..95e4f99d0 100644 --- a/sbt-app/src/sbt-test/dependency-graph/toFileSubTask/build.sbt +++ b/sbt-app/src/sbt-test/dependency-graph/toFileSubTask/build.sbt @@ -1,5 +1,5 @@ // ThisBuild / useCoursier := false -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" ThisBuild / organization := "org.example" ThisBuild / version := "0.1" diff --git a/sbt-app/src/sbt-test/dependency-management/artifact/build.sbt b/sbt-app/src/sbt-test/dependency-management/artifact/build.sbt index 077b2a06b..32a55431d 100644 --- a/sbt-app/src/sbt-test/dependency-management/artifact/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/artifact/build.sbt @@ -6,7 +6,7 @@ lazy val check = taskKey[Unit]("") lazy val checkArtifact = taskKey[Unit]("") ThisBuild / useCoursier := false -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" ThisBuild / version := "0.1.0-SNAPSHOT" ThisBuild / organization := "com.example" ThisBuild / organizationName := "example" diff --git a/sbt-app/src/sbt-test/dependency-management/cache-classifiers/multi.sbt b/sbt-app/src/sbt-test/dependency-management/cache-classifiers/multi.sbt index f84a40e2b..d337df981 100644 --- a/sbt-app/src/sbt-test/dependency-management/cache-classifiers/multi.sbt +++ b/sbt-app/src/sbt-test/dependency-management/cache-classifiers/multi.sbt @@ -1,6 +1,6 @@ import xsbti.AppConfiguration -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" // TTL of Coursier is 24h ThisBuild / useCoursier := false diff --git a/sbt-app/src/sbt-test/dependency-management/cached-resolution-interproj/multi.sbt b/sbt-app/src/sbt-test/dependency-management/cached-resolution-interproj/multi.sbt index 2ea6028a3..a0c14c8d6 100644 --- a/sbt-app/src/sbt-test/dependency-management/cached-resolution-interproj/multi.sbt +++ b/sbt-app/src/sbt-test/dependency-management/cached-resolution-interproj/multi.sbt @@ -3,7 +3,7 @@ lazy val check = taskKey[Unit]("Runs the check") val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" val junit = "junit" % "junit" % "4.13.1" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache" def commonSettings: Seq[Def.Setting[_]] = diff --git a/sbt-app/src/sbt-test/dependency-management/compiler-bridge-binary/build.sbt b/sbt-app/src/sbt-test/dependency-management/compiler-bridge-binary/build.sbt index f9cf8fddd..621e4b26c 100644 --- a/sbt-app/src/sbt-test/dependency-management/compiler-bridge-binary/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/compiler-bridge-binary/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" lazy val check = taskKey[Unit]("") diff --git a/sbt-app/src/sbt-test/dependency-management/conflict-coursier/build.sbt b/sbt-app/src/sbt-test/dependency-management/conflict-coursier/build.sbt index 19d25ed0b..db72607c9 100644 --- a/sbt-app/src/sbt-test/dependency-management/conflict-coursier/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/conflict-coursier/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" libraryDependencies ++= List( "org.webjars.npm" % "randomatic" % "1.1.7", "org.webjars.npm" % "is-odd" % "2.0.0", diff --git a/sbt-app/src/sbt-test/dependency-management/ext-pom-classifier/build.sbt b/sbt-app/src/sbt-test/dependency-management/ext-pom-classifier/build.sbt index 9ac56bac5..7cdc4ab8e 100644 --- a/sbt-app/src/sbt-test/dependency-management/ext-pom-classifier/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/ext-pom-classifier/build.sbt @@ -2,6 +2,6 @@ ThisBuild / useCoursier := false lazy val root = (project in file(".")) .settings( - scalaVersion := "2.12.20", + scalaVersion := "2.12.21", externalPom() ) diff --git a/sbt-app/src/sbt-test/dependency-management/force-update-period/build.sbt b/sbt-app/src/sbt-test/dependency-management/force-update-period/build.sbt index a6a466465..6b36e11ea 100644 --- a/sbt-app/src/sbt-test/dependency-management/force-update-period/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/force-update-period/build.sbt @@ -1,7 +1,7 @@ ThisBuild / useCoursier := false name := "force-update-period" -scalaVersion := "2.12.20" +scalaVersion := "2.12.21" libraryDependencies += "log4j" % "log4j" % "1.2.16" % "compile" autoScalaLibrary := false diff --git a/sbt-app/src/sbt-test/dependency-management/global-plugins/build.sbt b/sbt-app/src/sbt-test/dependency-management/global-plugins/build.sbt index 76f36acc2..9d9f7c53f 100644 --- a/sbt-app/src/sbt-test/dependency-management/global-plugins/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/global-plugins/build.sbt @@ -1 +1 @@ -scalaVersion := "2.12.20" +scalaVersion := "2.12.21" diff --git a/sbt-app/src/sbt-test/dependency-management/snapshot-local/build.sbt b/sbt-app/src/sbt-test/dependency-management/snapshot-local/build.sbt index 15ac28821..43503771a 100644 --- a/sbt-app/src/sbt-test/dependency-management/snapshot-local/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/snapshot-local/build.sbt @@ -1,5 +1,5 @@ ThisBuild / organization := "com.example" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache" def customIvyPaths: Seq[Def.Setting[_]] = Seq( diff --git a/sbt-app/src/sbt-test/dependency-management/snapshot-resolution/build.sbt b/sbt-app/src/sbt-test/dependency-management/snapshot-resolution/build.sbt index a129fcdf3..fb81f12a4 100644 --- a/sbt-app/src/sbt-test/dependency-management/snapshot-resolution/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/snapshot-resolution/build.sbt @@ -1,5 +1,5 @@ ThisBuild / organization := "com.example" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" // TTL is 24h so we can't detect the change ThisBuild / useCoursier := false diff --git a/sbt-app/src/sbt-test/java/cross/build.sbt b/sbt-app/src/sbt-test/java/cross/build.sbt index cbb55bd7d..74963b5dd 100644 --- a/sbt-app/src/sbt-test/java/cross/build.sbt +++ b/sbt-app/src/sbt-test/java/cross/build.sbt @@ -4,7 +4,7 @@ val check = inputKey[Unit]("Runs the check") lazy val root = (project in file(".")) .settings( - ThisBuild / scalaVersion := "2.12.20", + ThisBuild / scalaVersion := "2.12.21", crossJavaVersions := List("1.8"), // read out.txt and see if it starts with the passed in number diff --git a/sbt-app/src/sbt-test/java/cross/changes/build.sbt b/sbt-app/src/sbt-test/java/cross/changes/build.sbt index 2d09de654..003e68594 100644 --- a/sbt-app/src/sbt-test/java/cross/changes/build.sbt +++ b/sbt-app/src/sbt-test/java/cross/changes/build.sbt @@ -4,7 +4,7 @@ val check = inputKey[Unit]("Runs the check") lazy val root = (project in file(".")) .settings( - ThisBuild / scalaVersion := "2.12.20", + ThisBuild / scalaVersion := "2.12.21", crossJavaVersions := List("1.8", "10"), // read out.txt and see if it starts with the passed in number diff --git a/sbt-app/src/sbt-test/plugins/hydra/build.sbt b/sbt-app/src/sbt-test/plugins/hydra/build.sbt index 9ee405caa..1e702ff87 100644 --- a/sbt-app/src/sbt-test/plugins/hydra/build.sbt +++ b/sbt-app/src/sbt-test/plugins/hydra/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" lazy val check = taskKey[Unit]("") 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 7783ed396..725eabda6 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 := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" name := "hello" enablePlugins(JavaAppPackaging) diff --git a/sbt-app/src/sbt-test/plugins/unidoc/build.sbt b/sbt-app/src/sbt-test/plugins/unidoc/build.sbt index afa976179..b490f1736 100644 --- a/sbt-app/src/sbt-test/plugins/unidoc/build.sbt +++ b/sbt-app/src/sbt-test/plugins/unidoc/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.12.20" +scalaVersion := "2.12.21" scalacOptions += "-Xfatal-warnings" // required for the test enablePlugins(ScalaUnidocPlugin) diff --git a/sbt-app/src/sbt-test/project/aggregate/projA/build.sbt b/sbt-app/src/sbt-test/project/aggregate/projA/build.sbt index af30eb1d0..fc82f2140 100644 --- a/sbt-app/src/sbt-test/project/aggregate/projA/build.sbt +++ b/sbt-app/src/sbt-test/project/aggregate/projA/build.sbt @@ -1,3 +1,3 @@ name := "projA" -scalaVersion := "2.12.20" +scalaVersion := "2.12.21" diff --git a/sbt-app/src/sbt-test/project/cross-plugins-defaults/build.sbt b/sbt-app/src/sbt-test/project/cross-plugins-defaults/build.sbt index d0b8f1912..260439d00 100644 --- a/sbt-app/src/sbt-test/project/cross-plugins-defaults/build.sbt +++ b/sbt-app/src/sbt-test/project/cross-plugins-defaults/build.sbt @@ -1,7 +1,7 @@ val baseSbt = "1." -val buildCrossList = List("2.10.7", "2.11.12", "2.12.20") -scalaVersion in ThisBuild := "2.12.20" +val buildCrossList = List("2.10.7", "2.11.12", "2.12.21") +scalaVersion in ThisBuild := "2.12.21" crossScalaVersions in ThisBuild := buildCrossList addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0") diff --git a/sbt-app/src/sbt-test/project/flatten/build.sbt b/sbt-app/src/sbt-test/project/flatten/build.sbt index 518c06e19..430552e7e 100644 --- a/sbt-app/src/sbt-test/project/flatten/build.sbt +++ b/sbt-app/src/sbt-test/project/flatten/build.sbt @@ -1,6 +1,6 @@ val unpackage = TaskKey[Unit]("unpackage") -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" lazy val root = (project in file(".")) .settings( diff --git a/sbt-app/src/sbt-test/project/internal-tracking/build.sbt b/sbt-app/src/sbt-test/project/internal-tracking/build.sbt index c34f007b5..f91b1abd9 100644 --- a/sbt-app/src/sbt-test/project/internal-tracking/build.sbt +++ b/sbt-app/src/sbt-test/project/internal-tracking/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" ThisBuild / trackInternalDependencies := TrackLevel.NoTracking lazy val root = (project in file(".")) diff --git a/sbt-app/src/sbt-test/project/sbt-plugin/build.sbt b/sbt-app/src/sbt-test/project/sbt-plugin/build.sbt index 3b1ec5328..c12d2b24a 100644 --- a/sbt-app/src/sbt-test/project/sbt-plugin/build.sbt +++ b/sbt-app/src/sbt-test/project/sbt-plugin/build.sbt @@ -1,6 +1,6 @@ lazy val root = project.in(file(".")) .enablePlugins(SbtPlugin) .settings( - scalaVersion := "2.12.20", + scalaVersion := "2.12.21", scalacOptions ++= Seq("-Xfatal-warnings", "-Xlint") ) diff --git a/sbt-app/src/sbt-test/project/sbt-plugin/changes/oldSbtPlugin.sbt b/sbt-app/src/sbt-test/project/sbt-plugin/changes/oldSbtPlugin.sbt index 1738ee9a5..47edb2fd8 100644 --- a/sbt-app/src/sbt-test/project/sbt-plugin/changes/oldSbtPlugin.sbt +++ b/sbt-app/src/sbt-test/project/sbt-plugin/changes/oldSbtPlugin.sbt @@ -1,6 +1,6 @@ lazy val root = project.in(file(".")) .settings( - scalaVersion := "2.12.20", + scalaVersion := "2.12.21", sbtPlugin := true, scalacOptions ++= Seq("-Xfatal-warnings", "-Xlint") ) diff --git a/sbt-app/src/sbt-test/project/semanticdb/build.sbt b/sbt-app/src/sbt-test/project/semanticdb/build.sbt index 03ad56d26..1c1379867 100644 --- a/sbt-app/src/sbt-test/project/semanticdb/build.sbt +++ b/sbt-app/src/sbt-test/project/semanticdb/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" ThisBuild / semanticdbEnabled := true ThisBuild / semanticdbIncludeInJar := true diff --git a/sbt-app/src/sbt-test/project/unified/build.sbt b/sbt-app/src/sbt-test/project/unified/build.sbt index cbb558572..dae9c4338 100644 --- a/sbt-app/src/sbt-test/project/unified/build.sbt +++ b/sbt-app/src/sbt-test/project/unified/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" import sbt.internal.CommandStrings.{ inspectBrief, inspectDetailed } import sbt.internal.Inspect diff --git a/sbt-app/src/sbt-test/run/fork-loader/build.sbt b/sbt-app/src/sbt-test/run/fork-loader/build.sbt index b440e9f31..cb1c47042 100644 --- a/sbt-app/src/sbt-test/run/fork-loader/build.sbt +++ b/sbt-app/src/sbt-test/run/fork-loader/build.sbt @@ -1,6 +1,6 @@ val scalcheck = "org.scalacheck" %% "scalacheck" % "1.14.0" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" lazy val root = (project in file(".")) .settings( diff --git a/sbt-app/src/sbt-test/run/jep-512/build.sbt b/sbt-app/src/sbt-test/run/jep-512/build.sbt index 3adcc19ef..7565d6386 100644 --- a/sbt-app/src/sbt-test/run/jep-512/build.sbt +++ b/sbt-app/src/sbt-test/run/jep-512/build.sbt @@ -3,7 +3,7 @@ lazy val check = taskKey[Unit]("") lazy val common = Def.settings( // 2.12.x uses Zinc's compiler bridge - scalaVersion := "2.12.20", + scalaVersion := "2.12.21", ) // use `runMain` instead of `run` because discoveredMainClasses return empty diff --git a/sbt-app/src/sbt-test/source-dependencies/binary/build.sbt b/sbt-app/src/sbt-test/source-dependencies/binary/build.sbt index dbf8e8610..26b5d74ff 100644 --- a/sbt-app/src/sbt-test/source-dependencies/binary/build.sbt +++ b/sbt-app/src/sbt-test/source-dependencies/binary/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" lazy val dep = project diff --git a/sbt-app/src/sbt-test/source-dependencies/constants/test b/sbt-app/src/sbt-test/source-dependencies/constants/test index 8f027dbf2..31e7c3fdd 100644 --- a/sbt-app/src/sbt-test/source-dependencies/constants/test +++ b/sbt-app/src/sbt-test/source-dependencies/constants/test @@ -1,4 +1,4 @@ -> ++2.12.20! +> ++2.12.21! $ copy-file changes/B.scala B.scala diff --git a/sbt-app/src/sbt-test/source-dependencies/cross-source/test b/sbt-app/src/sbt-test/source-dependencies/cross-source/test index 21b560de7..a58eaf9f1 100644 --- a/sbt-app/src/sbt-test/source-dependencies/cross-source/test +++ b/sbt-app/src/sbt-test/source-dependencies/cross-source/test @@ -1,3 +1,3 @@ # A.scala needs B.scala, it would be in source list -> ++2.12.20! +> ++2.12.21! > compile diff --git a/sbt-app/src/sbt-test/source-dependencies/macro-annotation/build.sbt b/sbt-app/src/sbt-test/source-dependencies/macro-annotation/build.sbt index 45d6045fe..546d0a4d8 100644 --- a/sbt-app/src/sbt-test/source-dependencies/macro-annotation/build.sbt +++ b/sbt-app/src/sbt-test/source-dependencies/macro-annotation/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" val paradiseVersion = "2.1.1" val commonSettings = Seq( diff --git a/sbt-app/src/sbt-test/source-dependencies/macro-arg-dep-nested/build.sbt b/sbt-app/src/sbt-test/source-dependencies/macro-arg-dep-nested/build.sbt index cd1f0fda4..401333659 100644 --- a/sbt-app/src/sbt-test/source-dependencies/macro-arg-dep-nested/build.sbt +++ b/sbt-app/src/sbt-test/source-dependencies/macro-arg-dep-nested/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" val defaultSettings = Seq( libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value diff --git a/sbt-app/src/sbt-test/source-dependencies/macro-arg-dep-stackoverflow/build.sbt b/sbt-app/src/sbt-test/source-dependencies/macro-arg-dep-stackoverflow/build.sbt index cd1f0fda4..401333659 100644 --- a/sbt-app/src/sbt-test/source-dependencies/macro-arg-dep-stackoverflow/build.sbt +++ b/sbt-app/src/sbt-test/source-dependencies/macro-arg-dep-stackoverflow/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" val defaultSettings = Seq( libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value diff --git a/sbt-app/src/sbt-test/source-dependencies/macro-arg-dep/build.sbt b/sbt-app/src/sbt-test/source-dependencies/macro-arg-dep/build.sbt index cd1f0fda4..401333659 100644 --- a/sbt-app/src/sbt-test/source-dependencies/macro-arg-dep/build.sbt +++ b/sbt-app/src/sbt-test/source-dependencies/macro-arg-dep/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" val defaultSettings = Seq( libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value diff --git a/sbt-app/src/sbt-test/source-dependencies/macro/build.sbt b/sbt-app/src/sbt-test/source-dependencies/macro/build.sbt index cd1f0fda4..401333659 100644 --- a/sbt-app/src/sbt-test/source-dependencies/macro/build.sbt +++ b/sbt-app/src/sbt-test/source-dependencies/macro/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" val defaultSettings = Seq( libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value diff --git a/sbt-app/src/sbt-test/tests/arguments/build.sbt b/sbt-app/src/sbt-test/tests/arguments/build.sbt index 93cde9171..cb1effa58 100644 --- a/sbt-app/src/sbt-test/tests/arguments/build.sbt +++ b/sbt-app/src/sbt-test/tests/arguments/build.sbt @@ -1,6 +1,6 @@ val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" val foo = settingKey[Seq[String]]("foo") val checkFoo = inputKey[Unit]("check contents of foo") diff --git a/sbt-app/src/sbt-test/tests/do-not-discover/build.sbt b/sbt-app/src/sbt-test/tests/do-not-discover/build.sbt index d05f23430..8cd9690fa 100644 --- a/sbt-app/src/sbt-test/tests/do-not-discover/build.sbt +++ b/sbt-app/src/sbt-test/tests/do-not-discover/build.sbt @@ -1,6 +1,6 @@ val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" lazy val root = (project in file(".")) .settings( diff --git a/sbt-app/src/sbt-test/tests/done/build.sbt b/sbt-app/src/sbt-test/tests/done/build.sbt index d05f23430..8cd9690fa 100644 --- a/sbt-app/src/sbt-test/tests/done/build.sbt +++ b/sbt-app/src/sbt-test/tests/done/build.sbt @@ -1,6 +1,6 @@ val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" lazy val root = (project in file(".")) .settings( diff --git a/sbt-app/src/sbt-test/tests/filter-runners/build.sbt b/sbt-app/src/sbt-test/tests/filter-runners/build.sbt index e1aba618a..6dc9405f6 100644 --- a/sbt-app/src/sbt-test/tests/filter-runners/build.sbt +++ b/sbt-app/src/sbt-test/tests/filter-runners/build.sbt @@ -1,7 +1,7 @@ val scalatest = "org.scalatest" %% "scalatest" % "3.2.2" val munit = "org.scalameta" %% "munit" % "0.7.22" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" libraryDependencies += scalatest % Test libraryDependencies += munit % Test diff --git a/sbt-app/src/sbt-test/tests/fork-async/build.sbt b/sbt-app/src/sbt-test/tests/fork-async/build.sbt index 93256098a..da0538636 100644 --- a/sbt-app/src/sbt-test/tests/fork-async/build.sbt +++ b/sbt-app/src/sbt-test/tests/fork-async/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" lazy val root = (project in file(".")) .settings( diff --git a/sbt-app/src/sbt-test/tests/fork-parallel/build.sbt b/sbt-app/src/sbt-test/tests/fork-parallel/build.sbt index 68c177d33..17e06b5a3 100644 --- a/sbt-app/src/sbt-test/tests/fork-parallel/build.sbt +++ b/sbt-app/src/sbt-test/tests/fork-parallel/build.sbt @@ -1,7 +1,7 @@ import Tests._ import Defaults._ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" val check = taskKey[Unit]("Check that tests are executed in parallel") lazy val root = (project in file(".")) diff --git a/sbt-app/src/sbt-test/tests/fork-test-group-parallel-custom-tags/build.sbt b/sbt-app/src/sbt-test/tests/fork-test-group-parallel-custom-tags/build.sbt index d1e4492cf..c73d47165 100644 --- a/sbt-app/src/sbt-test/tests/fork-test-group-parallel-custom-tags/build.sbt +++ b/sbt-app/src/sbt-test/tests/fork-test-group-parallel-custom-tags/build.sbt @@ -1,5 +1,5 @@ val specs = "org.specs2" %% "specs2-core" % "4.3.4" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" val TestATypeTag = Tags.Tag("TestA") val TestBTypeTag = Tags.Tag("TestB") diff --git a/sbt-app/src/sbt-test/tests/fork-test-group-parallel/build.sbt b/sbt-app/src/sbt-test/tests/fork-test-group-parallel/build.sbt index 50f793d22..6c76e3aec 100644 --- a/sbt-app/src/sbt-test/tests/fork-test-group-parallel/build.sbt +++ b/sbt-app/src/sbt-test/tests/fork-test-group-parallel/build.sbt @@ -1,5 +1,5 @@ val specs = "org.specs2" %% "specs2-core" % "4.3.4" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" Global / concurrentRestrictions := Seq(Tags.limitAll(4)) libraryDependencies += specs % Test diff --git a/sbt-app/src/sbt-test/tests/fork-uncaught2/build.sbt b/sbt-app/src/sbt-test/tests/fork-uncaught2/build.sbt index f13c4fbe6..a51f5e6ce 100644 --- a/sbt-app/src/sbt-test/tests/fork-uncaught2/build.sbt +++ b/sbt-app/src/sbt-test/tests/fork-uncaught2/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" libraryDependencies += "org.scala-sbt" % "test-interface" % "1.0" diff --git a/sbt-app/src/sbt-test/tests/fork/build.sbt b/sbt-app/src/sbt-test/tests/fork/build.sbt index 65f33a577..2930bc99c 100644 --- a/sbt-app/src/sbt-test/tests/fork/build.sbt +++ b/sbt-app/src/sbt-test/tests/fork/build.sbt @@ -11,7 +11,7 @@ val scalaxml = "org.scala-lang.modules" %% "scala-xml" % "1.1.1" def groupId(idx: Int) = "group_" + (idx + 1) def groupPrefix(idx: Int) = groupId(idx) + "_file_" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" ThisBuild / organization := "org.example" lazy val root = (project in file(".")) diff --git a/sbt-app/src/sbt-test/tests/fork2/build.sbt b/sbt-app/src/sbt-test/tests/fork2/build.sbt index e70d963e1..d2a2766c4 100644 --- a/sbt-app/src/sbt-test/tests/fork2/build.sbt +++ b/sbt-app/src/sbt-test/tests/fork2/build.sbt @@ -1,6 +1,6 @@ val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" fork := true libraryDependencies += scalatest % Test diff --git a/sbt-app/src/sbt-test/tests/incremental-object-sources/build.sbt b/sbt-app/src/sbt-test/tests/incremental-object-sources/build.sbt index 5d582f237..76970d3a6 100644 --- a/sbt-app/src/sbt-test/tests/incremental-object-sources/build.sbt +++ b/sbt-app/src/sbt-test/tests/incremental-object-sources/build.sbt @@ -1,7 +1,7 @@ // Global / cacheStores := Seq.empty val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" -scalaVersion := "2.12.20" +scalaVersion := "2.12.21" lazy val root = (project in file(".")) .settings( diff --git a/sbt-app/src/sbt-test/tests/incremental/build.sbt b/sbt-app/src/sbt-test/tests/incremental/build.sbt index 391cac0ae..b55e9d0c5 100644 --- a/sbt-app/src/sbt-test/tests/incremental/build.sbt +++ b/sbt-app/src/sbt-test/tests/incremental/build.sbt @@ -1,5 +1,5 @@ val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" lazy val root = (project in file(".")) .settings( diff --git a/sbt-app/src/sbt-test/tests/it/build.sbt b/sbt-app/src/sbt-test/tests/it/build.sbt index c3c234773..6707b72e9 100644 --- a/sbt-app/src/sbt-test/tests/it/build.sbt +++ b/sbt-app/src/sbt-test/tests/it/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" val specs = "org.specs2" %% "specs2-core" % "4.3.4" diff --git a/sbt-app/src/sbt-test/tests/junit-xml-report/build.sbt b/sbt-app/src/sbt-test/tests/junit-xml-report/build.sbt index 4d87f2ca2..044b52a51 100644 --- a/sbt-app/src/sbt-test/tests/junit-xml-report/build.sbt +++ b/sbt-app/src/sbt-test/tests/junit-xml-report/build.sbt @@ -14,7 +14,7 @@ val nestedSuitesReportFile = "target/test-reports/TEST-my.scalatest.MyNestedSuit val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" val junitinterface = "com.novocode" % "junit-interface" % "0.11" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" lazy val root = (project in file(".")). settings( diff --git a/sbt-app/src/sbt-test/tests/munit/build.sbt b/sbt-app/src/sbt-test/tests/munit/build.sbt index e04350cbd..949e62eaa 100644 --- a/sbt-app/src/sbt-test/tests/munit/build.sbt +++ b/sbt-app/src/sbt-test/tests/munit/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" lazy val munit = "org.scalameta" %% "munit" % "0.7.22" diff --git a/sbt-app/src/sbt-test/tests/nested-inproc-par/build.sbt b/sbt-app/src/sbt-test/tests/nested-inproc-par/build.sbt index 68ae9ccf7..77c1ef715 100644 --- a/sbt-app/src/sbt-test/tests/nested-inproc-par/build.sbt +++ b/sbt-app/src/sbt-test/tests/nested-inproc-par/build.sbt @@ -1,6 +1,6 @@ val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" lazy val root = (project in file(".")) .settings( diff --git a/sbt-app/src/sbt-test/tests/nested-inproc-seq/build.sbt b/sbt-app/src/sbt-test/tests/nested-inproc-seq/build.sbt index 20bdacb98..97de770ae 100644 --- a/sbt-app/src/sbt-test/tests/nested-inproc-seq/build.sbt +++ b/sbt-app/src/sbt-test/tests/nested-inproc-seq/build.sbt @@ -1,6 +1,6 @@ val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" lazy val root = (project in file(".")) .settings( diff --git a/sbt-app/src/sbt-test/tests/nested-subproc/build.sbt b/sbt-app/src/sbt-test/tests/nested-subproc/build.sbt index bb06cb73f..d400f8bfa 100644 --- a/sbt-app/src/sbt-test/tests/nested-subproc/build.sbt +++ b/sbt-app/src/sbt-test/tests/nested-subproc/build.sbt @@ -1,7 +1,7 @@ val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" val scalaxml = "org.scala-lang.modules" %% "scala-xml" % "1.1.1" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" lazy val root = (project in file(".")) .settings( diff --git a/sbt-app/src/sbt-test/tests/nested-tests/build.sbt b/sbt-app/src/sbt-test/tests/nested-tests/build.sbt index 52030f3c9..415dd612d 100644 --- a/sbt-app/src/sbt-test/tests/nested-tests/build.sbt +++ b/sbt-app/src/sbt-test/tests/nested-tests/build.sbt @@ -1,6 +1,6 @@ val scalcheck = "org.scalacheck" %% "scalacheck" % "1.14.0" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" ThisBuild / version := "0.0.1" ThisBuild / organization := "org.catastrophe" diff --git a/sbt-app/src/sbt-test/tests/one-class-multi-framework/build.sbt b/sbt-app/src/sbt-test/tests/one-class-multi-framework/build.sbt index 127d21076..f6330f6bf 100644 --- a/sbt-app/src/sbt-test/tests/one-class-multi-framework/build.sbt +++ b/sbt-app/src/sbt-test/tests/one-class-multi-framework/build.sbt @@ -1,5 +1,5 @@ val specsJunit = "org.specs2" %% "specs2-junit" % "4.3.4" val junitinterface = "com.novocode" % "junit-interface" % "0.11" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" libraryDependencies += junitinterface % Test libraryDependencies += specsJunit % Test diff --git a/sbt-app/src/sbt-test/tests/order/build.sbt b/sbt-app/src/sbt-test/tests/order/build.sbt index 10db9515d..1d2fe9245 100644 --- a/sbt-app/src/sbt-test/tests/order/build.sbt +++ b/sbt-app/src/sbt-test/tests/order/build.sbt @@ -1,5 +1,5 @@ val scalcheck = "org.scalacheck" %% "scalacheck" % "1.14.0" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" Test / parallelExecution := false libraryDependencies += scalcheck % Test diff --git a/sbt-app/src/sbt-test/tests/resources/build.sbt b/sbt-app/src/sbt-test/tests/resources/build.sbt index 5d64d55f4..ca419fd8d 100644 --- a/sbt-app/src/sbt-test/tests/resources/build.sbt +++ b/sbt-app/src/sbt-test/tests/resources/build.sbt @@ -1,3 +1,3 @@ val specs = "org.specs2" %% "specs2-core" % "4.3.4" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" libraryDependencies += specs % Test diff --git a/sbt-app/src/sbt-test/tests/scala-instance-classloader/build.sbt b/sbt-app/src/sbt-test/tests/scala-instance-classloader/build.sbt index dcdf547a9..0b7f9af8a 100644 --- a/sbt-app/src/sbt-test/tests/scala-instance-classloader/build.sbt +++ b/sbt-app/src/sbt-test/tests/scala-instance-classloader/build.sbt @@ -3,7 +3,7 @@ import sbt.internal.inc.ScalaInstance lazy val OtherScala = config("other-scala").hide lazy val junitinterface = "com.novocode" % "junit-interface" % "0.11" lazy val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.5.17" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" lazy val root = (project in file(".")) .configs(OtherScala) diff --git a/sbt-app/src/sbt-test/tests/serial/build.sbt b/sbt-app/src/sbt-test/tests/serial/build.sbt index 2d7abec58..6726371bc 100644 --- a/sbt-app/src/sbt-test/tests/serial/build.sbt +++ b/sbt-app/src/sbt-test/tests/serial/build.sbt @@ -1,6 +1,6 @@ val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" ThisBuild / organization := "com.example" ThisBuild / version := "0.0.1-SNAPSHOT" diff --git a/sbt-app/src/sbt-test/tests/setup-cleanup/base.sbt b/sbt-app/src/sbt-test/tests/setup-cleanup/base.sbt index d5d9b2552..e5faf760a 100644 --- a/sbt-app/src/sbt-test/tests/setup-cleanup/base.sbt +++ b/sbt-app/src/sbt-test/tests/setup-cleanup/base.sbt @@ -1,3 +1,3 @@ val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" libraryDependencies += scalatest diff --git a/sbt-app/src/sbt-test/tests/single-runner/build.sbt b/sbt-app/src/sbt-test/tests/single-runner/build.sbt index 0547b7465..ce8a796bf 100644 --- a/sbt-app/src/sbt-test/tests/single-runner/build.sbt +++ b/sbt-app/src/sbt-test/tests/single-runner/build.sbt @@ -1,4 +1,4 @@ val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" libraryDependencies += scalatest Test / testOptions += Tests.Argument("-C", "custom.CustomReporter") diff --git a/sbt-app/src/sbt-test/tests/specs-run/build.sbt b/sbt-app/src/sbt-test/tests/specs-run/build.sbt index 47774f80b..cffb5ffa1 100644 --- a/sbt-app/src/sbt-test/tests/specs-run/build.sbt +++ b/sbt-app/src/sbt-test/tests/specs-run/build.sbt @@ -1,4 +1,4 @@ val specs = "org.specs2" %% "specs2-core" % "4.3.4" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" libraryDependencies += specs % Test diff --git a/sbt-app/src/sbt-test/tests/t543/build.sbt b/sbt-app/src/sbt-test/tests/t543/build.sbt index 944e65e4e..6b60b5bcc 100644 --- a/sbt-app/src/sbt-test/tests/t543/build.sbt +++ b/sbt-app/src/sbt-test/tests/t543/build.sbt @@ -7,7 +7,7 @@ val check = TaskKey[Unit]("check", "Check correct error has been returned.") val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" val scalaxml = "org.scala-lang.modules" %% "scala-xml" % "1.1.1" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" lazy val root = (project in file(".")). settings( diff --git a/sbt-app/src/sbt-test/tests/task/build.sbt b/sbt-app/src/sbt-test/tests/task/build.sbt index 0547b7465..ce8a796bf 100644 --- a/sbt-app/src/sbt-test/tests/task/build.sbt +++ b/sbt-app/src/sbt-test/tests/task/build.sbt @@ -1,4 +1,4 @@ val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" libraryDependencies += scalatest Test / testOptions += Tests.Argument("-C", "custom.CustomReporter") diff --git a/sbt-app/src/sbt-test/tests/test-exclude/build.sbt b/sbt-app/src/sbt-test/tests/test-exclude/build.sbt index 391cac0ae..b55e9d0c5 100644 --- a/sbt-app/src/sbt-test/tests/test-exclude/build.sbt +++ b/sbt-app/src/sbt-test/tests/test-exclude/build.sbt @@ -1,5 +1,5 @@ val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" lazy val root = (project in file(".")) .settings( diff --git a/sbt-app/src/sbt-test/watch/commands/build.sbt b/sbt-app/src/sbt-test/watch/commands/build.sbt index 1250a8567..09a6747ad 100644 --- a/sbt-app/src/sbt-test/watch/commands/build.sbt +++ b/sbt-app/src/sbt-test/watch/commands/build.sbt @@ -53,4 +53,4 @@ expectFailure / watchOnFileInputEvent := { (_, e) => } -crossScalaVersions := Seq("2.11.12", "2.12.20") +crossScalaVersions := Seq("2.11.12", "2.12.21") diff --git a/server-test/src/server-test/response/build.sbt b/server-test/src/server-test/response/build.sbt index 588466333..6841a06c7 100644 --- a/server-test/src/server-test/response/build.sbt +++ b/server-test/src/server-test/response/build.sbt @@ -1,6 +1,6 @@ import sbt.internal.server.{ ServerHandler, ServerIntent } -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" Global / serverLog / logLevel := Level.Debug // custom handler From d48895df85f4f8366461d5c48ea1a02cf8adb5b0 Mon Sep 17 00:00:00 2001 From: Ondra Pelech Date: Fri, 12 Dec 2025 15:44:25 +0100 Subject: [PATCH 05/13] Handle JDK_JAVA_OPTIONS --- launcher-package/src/universal/bin/sbt.bat | 12 ++++++++++-- sbt | 17 ++++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/launcher-package/src/universal/bin/sbt.bat b/launcher-package/src/universal/bin/sbt.bat index 3c3468e2f..3a876b758 100755 --- a/launcher-package/src/universal/bin/sbt.bat +++ b/launcher-package/src/universal/bin/sbt.bat @@ -718,6 +718,7 @@ if defined sbt_args_verbose ( if defined _JAVA_OPTS ( call :echolist !_JAVA_OPTS! ) if defined _SBT_OPTS ( call :echolist !_SBT_OPTS! ) if defined JAVA_TOOL_OPTIONS ( call :echolist %JAVA_TOOL_OPTIONS% ) + if defined JDK_JAVA_OPTIONS ( call :echolist %JDK_JAVA_OPTIONS% ) echo -cp echo "!sbt_jar!" echo xsbt.boot.Boot @@ -725,7 +726,7 @@ if defined sbt_args_verbose ( echo. ) -"!_JAVACMD!" !_JAVA_OPTS! !_SBT_OPTS! %JAVA_TOOL_OPTIONS% -cp "!sbt_jar!" xsbt.boot.Boot %* +"!_JAVACMD!" !_JAVA_OPTS! !_SBT_OPTS! %JAVA_TOOL_OPTIONS% %JDK_JAVA_OPTIONS% -cp "!sbt_jar!" xsbt.boot.Boot %* goto :eof @@ -859,7 +860,7 @@ exit /B 0 exit /B 0 :addDefaultMemory - rem if we detect any of these settings in ${JAVA_OPTS} or ${JAVA_TOOL_OPTIONS} we need to NOT output our settings. + rem if we detect any of these settings in ${JAVA_OPTS} or ${JAVA_TOOL_OPTIONS} or ${JDK_JAVA_OPTIONS} we need to NOT output our settings. rem The reason is the Xms/Xmx, if they don't line up, cause errors. set _has_memory_args= @@ -878,6 +879,13 @@ exit /B 0 if "!p:~0,4!" == "-Xss" set _has_memory_args=1 ) + if defined JDK_JAVA_OPTIONS for %%g in (%JDK_JAVA_OPTIONS%) do ( + set "p=%%g" + if "!p:~0,4!" == "-Xmx" set _has_memory_args=1 + if "!p:~0,4!" == "-Xms" set _has_memory_args=1 + if "!p:~0,4!" == "-Xss" set _has_memory_args=1 + ) + if defined _SBT_OPTS for %%g in (%_SBT_OPTS%) do ( set "p=%%g" if "!p:~0,4!" == "-Xmx" set _has_memory_args=1 diff --git a/sbt b/sbt index aa12e7446..7851a2eeb 100755 --- a/sbt +++ b/sbt @@ -303,7 +303,7 @@ addMemory () { } addDefaultMemory() { - # if we detect any of these settings in ${JAVA_OPTS} or ${JAVA_TOOL_OPTIONS} we need to NOT output our settings. + # if we detect any of these settings in ${JAVA_OPTS} or ${JAVA_TOOL_OPTIONS} or ${JDK_JAVA_OPTIONS} we need to NOT output our settings. # The reason is the Xms/Xmx, if they don't line up, cause errors. if [[ "${java_args[@]}" == *-Xmx* ]] || \ [[ "${java_args[@]}" == *-Xms* ]] || \ @@ -323,6 +323,15 @@ addDefaultMemory() { [[ "${JAVA_TOOL_OPTIONS}" == *-XX:MaxRAMPercentage* ]] || \ [[ "${JAVA_TOOL_OPTIONS}" == *-XX:MinRAMPercentage* ]] ; then : + elif [[ "${JDK_JAVA_OPTIONS}" == *-Xmx* ]] || \ + [[ "${JDK_JAVA_OPTIONS}" == *-Xms* ]] || \ + [[ "${JDK_JAVA_OPTIONS}" == *-Xss* ]] || \ + [[ "${JDK_JAVA_OPTIONS}" == *-XX:+UseCGroupMemoryLimitForHeap* ]] || \ + [[ "${JDK_JAVA_OPTIONS}" == *-XX:MaxRAM* ]] || \ + [[ "${JDK_JAVA_OPTIONS}" == *-XX:InitialRAMPercentage* ]] || \ + [[ "${JDK_JAVA_OPTIONS}" == *-XX:MaxRAMPercentage* ]] || \ + [[ "${JDK_JAVA_OPTIONS}" == *-XX:MinRAMPercentage* ]] ; then + : elif [[ "${sbt_options[@]}" == *-Xmx* ]] || \ [[ "${sbt_options[@]}" == *-Xms* ]] || \ [[ "${sbt_options[@]}" == *-Xss* ]] || \ @@ -406,16 +415,19 @@ jdk_version() { # - SBT_OPTS environment variable, # - _JAVA_OPTIONS environment variable and # - JAVA_TOOL_OPTIONS environment variable +# - JDK_JAVA_OPTIONS environment variable # in that order. findProperty() { local -a java_opts_array local -a sbt_opts_array local -a _java_options_array local -a java_tool_options_array + local -a jdk_java_options_array read -a java_opts_array <<< "$JAVA_OPTS" read -a sbt_opts_array <<< "$SBT_OPTS" read -a _java_options_array <<< "$_JAVA_OPTIONS" read -a java_tool_options_array <<< "$JAVA_TOOL_OPTIONS" + read -a jdk_java_options_array <<< "$JDK_JAVA_OPTIONS" local args_to_check=( "${java_args[@]}" @@ -423,6 +435,7 @@ findProperty() { "${sbt_opts_array[@]}" "${_java_options_array[@]}" "${java_tool_options_array[@]}") + "${jdk_java_options_array[@]}") for opt in "${args_to_check[@]}"; do if [[ "$opt" == -D$1=* ]]; then @@ -577,6 +590,7 @@ run() { "${java_args[@]}" \ "${sbt_options[@]}" \ "${java_tool_options[@]}" \ + "${jdk_java_options[@]}" \ -jar "$sbt_jar" \ "${sbt_commands[@]}" \ "${residual_args[@]}" @@ -856,6 +870,7 @@ fi java_args=($JAVA_OPTS) sbt_options0=(${SBT_OPTS:-$default_sbt_opts}) java_tool_options=($JAVA_TOOL_OPTIONS) +jdk_java_options=($JDK_JAVA_OPTIONS) if [[ "$SBT_NATIVE_CLIENT" == "true" ]]; then use_sbtn=1 fi From 527989ee1001419736016126db9d2a353dae0811 Mon Sep 17 00:00:00 2001 From: Ondra Pelech Date: Fri, 12 Dec 2025 16:35:00 +0100 Subject: [PATCH 06/13] fix --- sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbt b/sbt index 7851a2eeb..f549b68a9 100755 --- a/sbt +++ b/sbt @@ -434,7 +434,7 @@ findProperty() { "${java_opts_array[@]}" "${sbt_opts_array[@]}" "${_java_options_array[@]}" - "${java_tool_options_array[@]}") + "${java_tool_options_array[@]}" "${jdk_java_options_array[@]}") for opt in "${args_to_check[@]}"; do From 14f183964753f1ff27bb1c95f79cac9a25280beb Mon Sep 17 00:00:00 2001 From: Aleksandra Zdrojowa Date: Sun, 14 Dec 2025 13:35:25 +0100 Subject: [PATCH 07/13] return build targets sources from `buildTarget/dependencySources` request #8403 --- .../internal/server/BuildServerProtocol.scala | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala b/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala index 9bb371a78..c965145a9 100644 --- a/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala +++ b/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala @@ -26,7 +26,7 @@ import sbt.internal.protocol.JsonRpcRequestMessage import sbt.internal.util.{ Attributed, ErrorHandling } import sbt.internal.util.complete.{ Parser, Parsers } import sbt.librarymanagement.CrossVersion.binaryScalaVersion -import sbt.librarymanagement.{ Configuration, ScalaArtifacts } +import sbt.librarymanagement.{ Configuration, ScalaArtifacts, UpdateReport } import sbt.std.TaskExtra import sbt.util.Logger import sjsonnew.shaded.scalajson.ast.unsafe.{ JNull, JValue } @@ -158,7 +158,18 @@ object BuildServerProtocol { import sbt.internal.bsp.codec.JsonProtocol._ val items = bspBuildTargetDependencySourcesItem.result.all(filter).value val successfulItems = anyOrThrow(items) - val result = DependencySourcesResult(successfulItems.toVector) + + val buildItems = workspace.builds + .map { + case (targetId, loadedBuildUnit) => + val projRef = ProjectRef(loadedBuildUnit.unit.uri, loadedBuildUnit.root) + (projRef / updateSbtClassifiers).map(getDependencySourceItem(targetId, _)) + } + .toSeq + .join + .value + + val result = DependencySourcesResult((successfulItems ++ buildItems).toVector) state.respondEvent(result) } }.evaluated, @@ -770,8 +781,16 @@ object BuildServerProtocol { } private def dependencySourcesItemTask: Def.Initialize[Task[DependencySourcesItem]] = Def.task { - val targetId = Keys.bspTargetIdentifier.value - val updateReport = Keys.updateClassifiers.value + getDependencySourceItem( + Keys.bspTargetIdentifier.value, + Keys.updateClassifiers.value + ) + } + + private def getDependencySourceItem( + targetId: BuildTargetIdentifier, + updateReport: UpdateReport + ): DependencySourcesItem = { val sources = for { configuration <- updateReport.configurations.view module <- configuration.modules.view From 7bb5180f9e0beca6d8c55687a2ab573e07adcade Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 19 Dec 2025 00:23:07 -0500 Subject: [PATCH 08/13] [1.x] Update to 1.12.0-M2 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 211051ebc..f09d5d90f 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -15,7 +15,7 @@ object Dependencies { private val ioVersion = nightlyVersion.getOrElse("1.10.5") private val lmVersion = sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.12.0-M1") - val zincVersion = nightlyVersion.getOrElse("1.12.0-M1") + val zincVersion = nightlyVersion.getOrElse("1.12.0-M2") private val sbtIO = "org.scala-sbt" %% "io" % ioVersion From fb37b9c66b1e699b1bfe1fa75d43b291eca80531 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 19 Dec 2025 02:02:16 -0500 Subject: [PATCH 09/13] [1.x] Update to lm 1.12.0-M2 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f09d5d90f..dda8bc760 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -14,7 +14,7 @@ object Dependencies { // sbt modules private val ioVersion = nightlyVersion.getOrElse("1.10.5") private val lmVersion = - sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.12.0-M1") + sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.12.0-M2") val zincVersion = nightlyVersion.getOrElse("1.12.0-M2") private val sbtIO = "org.scala-sbt" %% "io" % ioVersion From 67e52c30062f77c2e4def68c716886a48351f4a8 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 19 Dec 2025 23:46:35 -0500 Subject: [PATCH 10/13] sbt 1.12.0-RC1 --- sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbt b/sbt index f549b68a9..b80bc4a88 100755 --- a/sbt +++ b/sbt @@ -1,7 +1,7 @@ #!/usr/bin/env bash set +e -declare builtin_sbt_version="1.11.7" +declare builtin_sbt_version="1.12.0-RC1" declare -a residual_args declare -a java_args declare -a scalac_args From 0a15069e83f9284b1373ccc92135a104e2b49c5e Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 27 Dec 2025 00:39:20 -0500 Subject: [PATCH 11/13] Show warnings when scalaVersion is missing **Problem** There's a disconnect between what is perceived to be the current Scala version, and what sbt uses internally, and thus what it chooses to be the default scalaVersion. **Solution** This displays a warning if scalaVersion setting is missing. --- build.sbt | 2 +- .../internal/util/SourcePositionSpec.scala | 30 +++++++---- main/src/main/scala/sbt/Main.scala | 6 ++- .../main/scala/sbt/internal/LintUnused.scala | 50 +++++++++++++++++-- .../sbt-test/actions/task-cancel/build.sbt | 7 ++- .../sbt-test/project/scala-version/build.sbt | 39 +++++++++++++++ .../src/sbt-test/project/scala-version/test | 1 + 7 files changed, 116 insertions(+), 19 deletions(-) create mode 100644 sbt-app/src/sbt-test/project/scala-version/build.sbt create mode 100644 sbt-app/src/sbt-test/project/scala-version/test diff --git a/build.sbt b/build.sbt index d6118bab8..37f9e5e55 100644 --- a/build.sbt +++ b/build.sbt @@ -364,7 +364,7 @@ lazy val utilPosition = (project in file("internal") / "util-position") utilCommonSettings, name := "Util Position", scalacOptions += "-language:experimental.macros", - libraryDependencies ++= Seq(scalaReflect.value, scalatest % "test"), + libraryDependencies ++= Seq(scalaReflect.value, hedgehog % Test), utilMimaSettings, ) diff --git a/internal/util-position/src/test/scala/sbt/internal/util/SourcePositionSpec.scala b/internal/util-position/src/test/scala/sbt/internal/util/SourcePositionSpec.scala index f41cef10b..6afcbc265 100644 --- a/internal/util-position/src/test/scala/sbt/internal/util/SourcePositionSpec.scala +++ b/internal/util-position/src/test/scala/sbt/internal/util/SourcePositionSpec.scala @@ -8,18 +8,26 @@ package sbt.internal.util -import org.scalatest.flatspec.AnyFlatSpec +import hedgehog._ +import hedgehog.runner._ -class SourcePositionSpec extends AnyFlatSpec { - "SourcePosition()" should "return a sane SourcePosition" in { - val filename = "SourcePositionSpec.scala" - val lineNumber = 17 - SourcePosition.fromEnclosing() match { - case LinePosition(path, startLine) => assert(path === filename && startLine === lineNumber) - case RangePosition(path, range) => assert(path === filename && inRange(range, lineNumber)) - case NoPosition => fail("No source position found") - } - } +object SourcePositionSpec extends Properties { + override def tests: List[Test] = List( + example( + "SourcePosition() should return a SourcePosition", { + val filename = "SourcePositionSpec.scala" + // val lineNumber = 19 + val lineNumber = 21 + SourcePosition.fromEnclosing() match { + case pos @ LinePosition(path, startLine) => + Result.assert( /* path == filename && */ startLine == lineNumber).log(pos.toString()) + case pos @ RangePosition(path, range) => + Result.assert(path == filename && inRange(range, lineNumber)).log(pos.toString()) + case NoPosition => Result.assert(false).log("No source position found") + } + } + ) + ) private def inRange(range: LineRange, lineNo: Int) = range.start until range.end contains lineNo diff --git a/main/src/main/scala/sbt/Main.scala b/main/src/main/scala/sbt/Main.scala index cae982680..e6cc13c69 100644 --- a/main/src/main/scala/sbt/Main.scala +++ b/main/src/main/scala/sbt/Main.scala @@ -979,7 +979,11 @@ object BuiltinCommands { st => setupGlobalFileTreeRepository(addCacheStoreFactoryFactory(st)) ) val s4 = s3.put(Keys.useLog4J.key, Project.extract(s3).get(Keys.useLog4J)) - addSuperShellParams(CheckBuildSources.init(LintUnused.lintUnusedFunc(s4))) + addSuperShellParams( + CheckBuildSources.init( + LintUnused.lintScalaVersion(LintUnused.lintUnusedFunc(s4)) + ) + ) } private val setupGlobalFileTreeRepository: State => State = { state => diff --git a/main/src/main/scala/sbt/internal/LintUnused.scala b/main/src/main/scala/sbt/internal/LintUnused.scala index d41169be7..7846d41f0 100644 --- a/main/src/main/scala/sbt/internal/LintUnused.scala +++ b/main/src/main/scala/sbt/internal/LintUnused.scala @@ -11,11 +11,12 @@ package internal import Keys._ import Def.{ Setting, ScopedKey } -import sbt.internal.util.{ FilePosition, NoPosition, SourcePosition } +import sbt.internal.util.{ FilePosition, LinePosition, NoPosition, SourcePosition } import java.io.File import Scope.Global import sbt.SlashSyntax0._ import sbt.Def._ +import scala.annotation.nowarn object LintUnused { lazy val lintSettings: Seq[Setting[_]] = Seq( @@ -164,14 +165,53 @@ object LintUnused { u } (unusedKeys map { u => - (u.scoped, display.show(u.scoped), u.positions) + (u.scoped, display.show(u.scoped), u.positions.toVector) }).sortBy(_._2) } + def lintScalaVersion(state: State): State = { + val log = state.log + val extracted = Project.extract(state) + val structure = extracted.structure + val comp = structure.compiledMap + for { + p <- structure.allProjectRefs + scope = (Scope.Global.in(p): @nowarn) + key = scalaVersion.in(scope) + definingScope = structure.data.definingScope(key.scope, key.key) + definingScoped = definingScope match { + case Some(sc) => Some(ScopedKey(sc, key.key)) + case _ => None + } + sv <- extracted.getOpt(key) + isPlugin = extracted.get(sbtPlugin.in(scope)) + mb = extracted.get(isMetaBuild.in(scope)) + auto = extracted.get(autoScalaLibrary.in(scope)) + msi = extracted.get(managedScalaInstance.in(scope)) + (_, sk) = extracted.runTask(skip.in(scope.in(publish.key): @nowarn), state) + display = p match { + case ProjectRef(_, id) => id + case _ | null => Reference.display(p) + } + c <- comp.get(definingScoped.getOrElse(key.scopedKey)) + setting <- c.settings.headOption + } if (auto && msi && !isPlugin && !mb && !sk) + setting.pos match { + case LinePosition(path, _) if path.endsWith("Defaults.scala") => + log.warn( + s"""scalaVersion for subproject $display fell back to a default value $sv; declare it explicitly in build.sbt: + scalaVersion := "$sv"""" + ) + case _ => () + } + else () + state + } + private[this] case class UnusedKey( - scoped: ScopedKey[_], - positions: Vector[SourcePosition], - data: Option[ScopedKeyData[_]] + scoped: ScopedKey[?], + positions: Seq[SourcePosition], + data: Option[ScopedKeyData[?]] ) private def definedAtString(settings: Vector[Setting[_]]): Vector[SourcePosition] = { diff --git a/sbt-app/src/sbt-test/actions/task-cancel/build.sbt b/sbt-app/src/sbt-test/actions/task-cancel/build.sbt index 334fa825d..176c29986 100644 --- a/sbt-app/src/sbt-test/actions/task-cancel/build.sbt +++ b/sbt-app/src/sbt-test/actions/task-cancel/build.sbt @@ -3,7 +3,12 @@ import sbt.ExposeYourself._ taskCancelStrategy := { (state: State) => new TaskCancellationStrategy { type State = Unit - override def onTaskEngineStart(canceller: RunningTaskEngine): Unit = canceller.cancelAndShutdown() + override def onTaskEngineStart(canceller: RunningTaskEngine): Unit = { + state.currentCommand match { + case Some(e) if e.commandLine == "loadp" => () + case _ => canceller.cancelAndShutdown() + } + } override def onTaskEngineFinish(state: State): Unit = () } } diff --git a/sbt-app/src/sbt-test/project/scala-version/build.sbt b/sbt-app/src/sbt-test/project/scala-version/build.sbt new file mode 100644 index 000000000..8e0298392 --- /dev/null +++ b/sbt-app/src/sbt-test/project/scala-version/build.sbt @@ -0,0 +1,39 @@ +@transient +lazy val checkScalaVersionWarning = taskKey[Unit]("") + +// exempt publish skipped projects +lazy val `scala-version-root` = (project in file(".")) + .settings( + name := "scala-version-root", + checkScalaVersionWarning := { + val state = Keys.state.value + val logging = state.globalLogging + val sv = scalaVersion.value + val contents = IO.read(logging.backing.file) + assert(contents.contains(s"""scalaVersion for subproject nievab1 fell back to a default value $sv""")) + assert(!contents.contains(s"""scalaVersion for subproject scala-version-root fell back to a default value $sv""")) + assert(!contents.contains(s"""scalaVersion for subproject nievab2 fell back to a default value $sv""")) + assert(!contents.contains(s"""scalaVersion for subproject nievab3 fell back to a default value $sv""")) + assert(!contents.contains(s"""scalaVersion for subproject nievab4 fell back to a default value $sv""")) + () + }, + publish / skip := true, + ) + +lazy val nievab1 = project + +// exempt plugin projects +lazy val nievab2 = project + .enablePlugins(SbtPlugin) + +// exempt Java projects +lazy val nievab3 = project + .settings( + autoScalaLibrary := false, + ) + +// exempt SCALA_HOME projects +lazy val nievab4 = project + .settings( + managedScalaInstance := false, + ) diff --git a/sbt-app/src/sbt-test/project/scala-version/test b/sbt-app/src/sbt-test/project/scala-version/test new file mode 100644 index 000000000..bc33e68f0 --- /dev/null +++ b/sbt-app/src/sbt-test/project/scala-version/test @@ -0,0 +1 @@ +> checkScalaVersionWarning From 0e546f0b35381f075bdc577c23feafde0cde3915 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 4 Jan 2026 20:50:16 -0500 Subject: [PATCH 12/13] [1.x] Zinc 1.12.0 --- project/Dependencies.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index dda8bc760..389f0bbb0 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -14,8 +14,8 @@ object Dependencies { // sbt modules private val ioVersion = nightlyVersion.getOrElse("1.10.5") private val lmVersion = - sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.12.0-M2") - val zincVersion = nightlyVersion.getOrElse("1.12.0-M2") + sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.12.0") + val zincVersion = nightlyVersion.getOrElse("1.12.0") private val sbtIO = "org.scala-sbt" %% "io" % ioVersion From fcb4e0e43c62c6690d8c936cb4a62a2c09418681 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 4 Jan 2026 21:18:03 -0500 Subject: [PATCH 13/13] sbt 1.12.0 --- sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbt b/sbt index b80bc4a88..5d76d5074 100755 --- a/sbt +++ b/sbt @@ -1,7 +1,7 @@ #!/usr/bin/env bash set +e -declare builtin_sbt_version="1.12.0-RC1" +declare builtin_sbt_version="1.12.0" declare -a residual_args declare -a java_args declare -a scalac_args