luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.12.x' into wip/merge-1.12.x

This commit is contained in:
Eugene Yokota 2026-01-04 23:41:35 -05:00
parent 457127a090 fcb4e0e43c
commit e3f99d39cb
144 changed files with 202 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -47,7 +47,7 @@ ThisBuild / mimaFailOnNoPrevious := false
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 += Utils.componentID

6
launcher-package/build.sbt
View File

@ -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 = {

12
launcher-package/src/universal/bin/sbt.bat
View File

@ -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

2
main/src/main/scala/sbt/PluginCross.scala
View File

@ -101,7 +101,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 VersionNumber(Seq(2, _*), _, _) => "3.7.4"
case _ => sys.error(s"Unsupported sbt binary version: $sv")
}

2
main/src/main/scala/sbt/internal/LintUnused.scala
View File

@ -175,7 +175,7 @@ object LintUnused {
scope = Scope.Global.rescope(p)
key = scalaVersion.rescope(scope)
data = Project.scopedKeyData(structure, key.scopedKey)
sv = extracted.get(key)
sv <- extracted.getOpt(key)
isPlugin = extracted.get(sbtPlugin.rescope(scope))
mb = extracted.get(isMetaBuild.rescope(scope))
auto = extracted.get(autoScalaLibrary.rescope(scope))

3
main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala
View File

@ -143,8 +143,9 @@ OPTIONS
),
dependencyTreeModuleGraph0 := Def.uncached {
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)
)

2
main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala
View File

@ -29,7 +29,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(

2
project/Dependencies.scala
View File

@ -16,7 +16,7 @@ object Dependencies {
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
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"

21
sbt
View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash
set +e
declare builtin_sbt_version="1.11.7"
declare builtin_sbt_version="1.12.0"
declare -a residual_args
declare -a java_args
declare -a scalac_args
@ -306,7 +306,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* ]] || \
@ -326,6 +326,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* ]] || \
@ -409,23 +418,27 @@ 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[@]}"
"${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
if [[ "$opt" == -D$1=* ]]; then
@ -580,6 +593,7 @@ run() {
"${java_args[@]}" \
"${sbt_options[@]}" \
"${java_tool_options[@]}" \
"${jdk_java_options[@]}" \
-jar "$sbt_jar" \
"${sbt_commands[@]}" \
"${residual_args[@]}"
@ -859,6 +873,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

2
sbt-app/src/sbt-test/actions/compile-clean/build.sbt
View File

@ -2,6 +2,6 @@ import sbt.nio.file.Glob
Global / cacheStores := Seq.empty
name := "compile-clean"
scalaVersion := "2.12.20"
scalaVersion := "2.12.21"
Compile / cleanKeepGlobs +=
Glob(target.value) / RecursiveGlob / "X.class"

2
sbt-app/src/sbt-test/actions/compile-clean/test
View File

@ -1,4 +1,4 @@
$ touch target/out/jvm/scala-2.12.20/compile-clean/classes/cant-touch-this
$ touch target/out/jvm/scala-2.12.21/compile-clean/classes/cant-touch-this
> Test/compile
$ exists target/**/compile-clean/classes/A.class

2
sbt-app/src/sbt-test/actions/cross-advanced/build.sbt
View File

@ -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"
ThisBuild / scalaVersion := scala212

8
sbt-app/src/sbt-test/actions/cross-advanced/test
View File

@ -18,11 +18,11 @@
## test + with command or alias
> clean
## for command cross building you do need crossScalaVersions on root
> set root/crossScalaVersions := Seq("2.12.20", "2.13.12")
> set root/crossScalaVersions := Seq("2.12.21", "2.13.12")
> + build
$ exists target/out/jvm/scala-2.12.20/foo
$ exists target/out/jvm/scala-2.12.21/foo
$ exists target/out/jvm/scala-2.13.12/foo
$ exists target/out/jvm/scala-2.12.20/bar
$ exists target/out/jvm/scala-2.12.21/bar
$ exists target/out/jvm/scala-2.13.12/bar
$ exists target/out/jvm/scala-2.12.20/client
$ exists target/out/jvm/scala-2.12.21/client
$ exists target/out/jvm/scala-2.13.12/client

4
sbt-app/src/sbt-test/actions/cross-incremental/build.sbt
View File

@ -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 := {

2
sbt-app/src/sbt-test/actions/cross-multi-parser/build.sbt
View File

@ -1 +1 @@
crossScalaVersions := Seq[String]("2.11.12", "2.12.20")
crossScalaVersions := Seq[String]("2.11.12", "2.12.21")

4
sbt-app/src/sbt-test/actions/cross-multi-parser/test
View File

@ -1,5 +1,5 @@
> ++2.11.12; compile
> ++ 2.12.20 ; compile;
> ++ 2.12.21 ; compile;
> ++ 2.12.20 ; compile
> ++ 2.12.21 ; compile

2
sbt-app/src/sbt-test/actions/cross-multiproject/ref/build.sbt
View File

@ -1,4 +1,4 @@
lazy val external = (project in file("."))
.settings(
scalaVersion := "2.12.20"
scalaVersion := "2.12.21"
)

6
sbt-app/src/sbt-test/actions/cross-strict-aggregation-scala-3/build.sbt
View File

@ -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"
)

2
sbt-app/src/sbt-test/actions/cross-strict-aggregation/build.sbt
View File

@ -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

4
sbt-app/src/sbt-test/actions/doc/build.sbt
View File

@ -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 += "-Werror",
commands += Command.command("excludeB") { s =>
val impl = """val src = (Compile / sources).value; src.filterNot(_.getName.contains("B"))"""

2
sbt-app/src/sbt-test/actions/generator/build.sbt
View File

@ -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(

2
sbt-app/src/sbt-test/actions/generator/test
View File

@ -1,2 +1,2 @@
> compile
$ exists target/out/jvm/scala-2.12.20/root/src_managed/BuildInfo.scala
$ exists target/out/jvm/scala-2.12.21/root/src_managed/BuildInfo.scala

2
sbt-app/src/sbt-test/actions/multi-command/build.sbt
View File

@ -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

2
sbt-app/src/sbt-test/actions/multi-command/test
View File

@ -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

2
sbt-app/src/sbt-test/actions/package-delete-target/build.sbt
View File

@ -1,5 +1,5 @@
lazy val root = (project in file("."))
.settings(
name := "delete-target",
scalaVersion := "2.12.20"
scalaVersion := "2.12.21"
)

6
sbt-app/src/sbt-test/actions/package-delete-target/test
View File

@ -1,4 +1,4 @@
$ mkdir target/out/jvm/scala-2.12.20/delete-target/delete-target_2.12-0.1.0-SNAPSHOT.jar
$ touch target/out/jvm/scala-2.12.20/delete-target/delete-target_2.12-0.1.0-SNAPSHOT.jar/hello
$ mkdir target/out/jvm/scala-2.12.21/delete-target/delete-target_2.12-0.1.0-SNAPSHOT.jar
$ touch target/out/jvm/scala-2.12.21/delete-target/delete-target_2.12-0.1.0-SNAPSHOT.jar/hello
-> package
$ exists target/out/jvm/scala-2.12.20/delete-target/delete-target_2.12-0.1.0-SNAPSHOT.jar/hello
$ exists target/out/jvm/scala-2.12.21/delete-target/delete-target_2.12-0.1.0-SNAPSHOT.jar/hello

2
sbt-app/src/sbt-test/actions/query/build.sbt
View File

@ -12,7 +12,7 @@ lazy val foo = project
lazy val bar = project
lazy val baz = project
.settings(
scalaVersion := "2.12.20",
scalaVersion := "2.12.21",
)
someTask := Def.uncached {

6
sbt-app/src/sbt-test/actions/query/test
View File

@ -3,7 +3,7 @@
$ exists target/out/jvm/scala-3.3.3/root/root.txt
$ exists target/out/jvm/scala-3.3.3/foo/foo.txt
$ exists target/out/jvm/scala-3.3.3/bar/bar.txt
$ exists target/out/jvm/scala-2.12.20/baz/baz.txt
$ exists target/out/jvm/scala-2.12.21/baz/baz.txt
> clean
@ -12,7 +12,7 @@ $ exists target/out/jvm/scala-2.12.20/baz/baz.txt
$ absent target/out/jvm/scala-3.3.3/root/root.txt
$ absent target/out/jvm/scala-3.3.3/foo/foo.txt
$ exists target/out/jvm/scala-3.3.3/bar/bar.txt
$ exists target/out/jvm/scala-2.12.20/baz/baz.txt
$ exists target/out/jvm/scala-2.12.21/baz/baz.txt
> clean
@ -21,4 +21,4 @@ $ exists target/out/jvm/scala-2.12.20/baz/baz.txt
$ exists target/out/jvm/scala-3.3.3/root/root.txt
$ exists target/out/jvm/scala-3.3.3/foo/foo.txt
$ exists target/out/jvm/scala-3.3.3/bar/bar.txt
$ absent target/out/jvm/scala-2.12.20/baz/baz.txt
$ absent target/out/jvm/scala-2.12.21/baz/baz.txt

7
sbt-app/src/sbt-test/actions/task-cancel/build.sbt
View File

@ -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 = ()
}
}

2
sbt-app/src/sbt-test/classloader-cache/akka-actor-system/build.sbt
View File

@ -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"

2
sbt-app/src/sbt-test/classloader-cache/java-serialization/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / scalaVersion := "2.12.21"
val dependency = project.settings(exportJars := true)
val descendant = project

2
sbt-app/src/sbt-test/classloader-cache/jni/build.sbt
View File

@ -13,7 +13,7 @@ def wrap[A1](task: InputKey[A1]): 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",

2
sbt-app/src/sbt-test/classloader-cache/library-mismatch/build.sbt
View File

@ -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,

2
sbt-app/src/sbt-test/classloader-cache/resources/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / scalaVersion := "2.12.21"
ThisBuild / turbo := true
resolvers += "Local Maven" at (baseDirectory.value / "libraries" / "foo" / "ivy").toURI.toURL.toString

2
sbt-app/src/sbt-test/classloader-cache/runtime-layers/build.sbt
View File

@ -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",
)

2
sbt-app/src/sbt-test/classloader-cache/scalatest/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / scalaVersion := "2.12.21"
val test = (project in file(".")).settings(
libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.7" % Test

2
sbt-app/src/sbt-test/classloader-cache/service-loader/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / scalaVersion := "2.12.21"
val dependency = project.settings(exportJars := true)
val descendant = project

2
sbt-app/src/sbt-test/classloader-cache/spark/build.sbt
View File

@ -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"

2
sbt-app/src/sbt-test/classloader-cache/utest/build.sbt
View File

@ -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"
),

2
sbt-app/src/sbt-test/compiler-project/error-in-invalidated/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / scalaVersion := "2.12.21"
lazy val root = (project in file(".")).
settings(

2
sbt-app/src/sbt-test/compiler-project/macro-config/build.sbt
View File

@ -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,

2
sbt-app/src/sbt-test/compiler-project/no-bootclasspath/test
View File

@ -1,4 +1,4 @@
> set scalaVersion := "2.13.12"
> check213
> set scalaVersion := "2.12.20"
> set scalaVersion := "2.12.21"
> check212

3
sbt-app/src/sbt-test/compiler-project/run-test/build.sbt
View File

@ -1,4 +1,5 @@
scalaVersion := "2.12.20"
scalaVersion := "2.12.21"
libraryDependencies ++= Seq(
"com.novocode" % "junit-interface" % "0.5" % Test,
"junit" % "junit" % "4.13.1" % Test,

2
sbt-app/src/sbt-test/compiler-project/separate-analysis-per-scala/build.sbt
View File

@ -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

2
sbt-app/src/sbt-test/compiler-project/separate-analysis-per-scala/test
View File

@ -1,3 +1,3 @@
> + compile
$ exists target/out/jvm/scala-2.12.20/foo
$ exists target/out/jvm/scala-2.12.21/foo
$ exists target/out/jvm/scala-2.13.12/foo

2
sbt-app/src/sbt-test/compiler-project/src-dep-plugin/build.sbt
View File

@ -1,6 +1,6 @@
lazy val use = project
.dependsOn(RootProject(file("def")) % Configurations.CompilerPlugin)
.settings(
scalaVersion := "2.12.20",
scalaVersion := "2.12.21",
autoCompilerPlugins := true
)

2
sbt-app/src/sbt-test/compiler-project/src-dep-plugin/def/build.sbt
View File

@ -4,7 +4,7 @@ name := "demo-compiler-plugin"
version := "0.1"
scalaVersion := "2.12.20"
scalaVersion := "2.12.21"
libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided"
exportJars := true

2
sbt-app/src/sbt-test/console/project-compiler-bridge/project/build.sbt
View File

@ -1 +1 @@
scalaVersion := "2.12.20"
scalaVersion := "2.12.21"

2
sbt-app/src/sbt-test/dependency-graph/cachedResolution/build.sbt
View File

@ -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)

2
sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / scalaVersion := "2.12.21"
name := "foo"
libraryDependencies ++= Seq(

2
sbt-app/src/sbt-test/dependency-graph/output/build.sbt
View File

@ -1,4 +1,4 @@
scalaVersion := "2.12.20"
scalaVersion := "2.12.21"
organization := "org.example"
version := "0.1"

2
sbt-app/src/sbt-test/dependency-management/artifact/build.sbt
View File

@ -5,7 +5,7 @@ lazy val checkFull = taskKey[Unit]("")
lazy val check = taskKey[Unit]("")
lazy val checkArtifact = taskKey[Unit]("")
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / scalaVersion := "2.12.21"
ThisBuild / version := "0.1.0-SNAPSHOT"
ThisBuild / organization := "com.example"
ThisBuild / organizationName := "example"

2
sbt-app/src/sbt-test/dependency-management/cache-classifiers/multi.sbt
View File

@ -1,6 +1,6 @@
import xsbti.AppConfiguration
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / scalaVersion := "2.12.21"
// TTL of Coursier is 24h
ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache"

2
sbt-app/src/sbt-test/dependency-management/compiler-bridge-binary/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / scalaVersion := "2.12.21"
lazy val check = taskKey[Unit]("")

2
sbt-app/src/sbt-test/dependency-management/conflict-coursier/build.sbt
View File

@ -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",

2
sbt-app/src/sbt-test/dependency-management/exclude-scala/build.sbt
View File

@ -5,7 +5,7 @@ lazy val scalaOverride = taskKey[Unit]("Check that the proper version of Scala i
lazy val root = (project in file(".")).
settings(
libraryDependencies ++= baseDirectory(dependencies).value,
scalaVersion := "2.12.20",
scalaVersion := "2.12.21",
scalaModuleInfo := scalaModuleInfo.value map (_.withOverrideScalaVersion(sbtPlugin.value)),
autoScalaLibrary := baseDirectory(base => !(base / "noscala").exists ).value,
scalaOverride := check("scala.App").value

2
sbt-app/src/sbt-test/dependency-management/exclude-transitive/build.sbt
View File

@ -1,5 +1,5 @@
ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache"
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / scalaVersion := "2.12.21"
def localCache =
ivyPaths := IvyPaths(baseDirectory.value.toString, Some(((ThisBuild / baseDirectory).value / "ivy" / "cache").toString))

2
sbt-app/src/sbt-test/dependency-management/global-plugins/build.sbt
View File

@ -1 +1 @@
scalaVersion := "2.12.20"
scalaVersion := "2.12.21"

2
sbt-app/src/sbt-test/dependency-management/provided-multi/changes/p.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / scalaVersion := "2.12.21"
def configIvyScala =
scalaModuleInfo ~= (_ map (_ withCheckExplicit false))

2
sbt-app/src/sbt-test/dependency-management/scala-tests-only/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / scalaVersion := "2.12.21"
autoScalaLibrary := false
libraryDependencies += "org.scala-lang" % "scala-library" % scalaVersion.value % "test"

2
sbt-app/src/sbt-test/dependency-management/snapshot-local/build.sbt
View File

@ -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 localCache =

2
sbt-app/src/sbt-test/dependency-management/snapshot-resolution/build.sbt
View File

@ -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 / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache"

2
sbt-app/src/sbt-test/dependency-management/version-interval/build.sbt
View File

@ -1,6 +1,6 @@
libraryDependencies += "org.json4s" %% "json4s-native" % "[3.3.0,3.5.0)"
scalaVersion := "2.12.20"
scalaVersion := "2.12.21"
lazy val actualVersionCheck = taskKey[Unit]("")
actualVersionCheck := {

2
sbt-app/src/sbt-test/java/cross/build.sbt
View File

@ -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

2
sbt-app/src/sbt-test/java/cross/changes/build.sbt
View File

@ -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

2
sbt-app/src/sbt-test/lm-coursier/from-no-head/build.sbt
View File

@ -1,3 +1,3 @@
scalaVersion := "2.12.20"
scalaVersion := "2.12.21"
libraryDependencies += "ccl.northwestern.edu" % "netlogo" % "5.3.1" % "provided" from s"https://github.com/NetLogo/NetLogo/releases/download/5.3.1/NetLogo.jar"

2
sbt-app/src/sbt-test/lm-coursier/from-wrong-url/build.sbt
View File

@ -1,4 +1,4 @@
scalaVersion := "2.12.20"
scalaVersion := "2.12.21"
// keeping the default cache policies here

2
sbt-app/src/sbt-test/lm-coursier/from/build.sbt
View File

@ -1,4 +1,4 @@
scalaVersion := "2.12.20"
scalaVersion := "2.12.21"
libraryDependencies += "com.chuusai" %% "shapeless" % "2.3.41" from {

2
sbt-app/src/sbt-test/nio/external-hooks/build.sbt
View File

@ -1,4 +1,4 @@
scalaVersion := "2.12.20"
scalaVersion := "2.12.21"
val generateSourceFile = taskKey[Unit]("generate source file")
generateSourceFile := {
val testDir = ((Test / scalaSource).value.toPath / "Foo.scala").toString

2
sbt-app/src/sbt-test/plugins/hydra/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / scalaVersion := "2.12.21"
lazy val check = taskKey[Unit]("")

2
sbt-app/src/sbt-test/plugins/plugin-cross/build.sbt
View File

@ -19,4 +19,4 @@ lazy val plugin = (projectMatrix in file("plugin"))
case _ => "2.0.0-RC3"
},
)
.jvmPlatform(scalaVersions = Seq("3.7.3", "2.12.20"))
.jvmPlatform(scalaVersions = Seq("3.7.3", "2.12.21"))

2
sbt-app/src/sbt-test/plugins/unidoc/build.sbt
View File

@ -1,4 +1,4 @@
scalaVersion := "2.12.20"
scalaVersion := "2.12.21"
scalacOptions += "-Werror" // required for the test
enablePlugins(ScalaUnidocPlugin)

2
sbt-app/src/sbt-test/project-matrix/custom/build.sbt
View File

@ -10,7 +10,7 @@ ivyPaths := {
lazy val config12 = ConfigAxis("Config1_2", "config1.2")
lazy val config13 = ConfigAxis("Config1_3", "config1.3")
lazy val scala212 = "2.12.20"
lazy val scala212 = "2.12.21"
lazy val scala211 = "2.11.12"
lazy val core = (projectMatrix in file("core"))

2
sbt-app/src/sbt-test/project-matrix/java/build.sbt
View File

@ -10,7 +10,7 @@ ivyPaths := {
lazy val config12 = ConfigAxis("Config1_2", "-config1.2")
lazy val config13 = ConfigAxis("Config1_3", "-config1.3")
lazy val scala212 = "2.12.20"
lazy val scala212 = "2.12.21"
lazy val app = (projectMatrix in file("app"))
.settings(

2
sbt-app/src/sbt-test/project-matrix/jvm-with-project-axes/build.sbt
View File

@ -8,7 +8,7 @@ ThisBuild / ivyPaths := {
}
publish / skip := true
lazy val scala212 = "2.12.20"
lazy val scala212 = "2.12.21"
lazy val check = taskKey[Unit]("")

2
sbt-app/src/sbt-test/project-matrix/jvm-with-project-axes/test
View File

@ -1,5 +1,5 @@
> compile
$ exists target/out/jvm/scala-2.12.20/domain/classes/a/DataType.class
$ exists target/out/jvm/scala-2.12.21/domain/classes/a/DataType.class
> check

2
sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/build.sbt
View File

@ -1,5 +1,5 @@
lazy val scala213 = "2.13.15"
lazy val scala212 = "2.12.20"
lazy val scala212 = "2.12.21"
lazy val check = taskKey[Unit]("")
lazy val root = (project in file("."))

2
sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/test
View File

@ -1,6 +1,6 @@
> compile
$ exists target/out/jvm/scala-2.13.15/core/classes/a/Core.class
$ exists target/out/jvm/scala-2.12.20/core/classes/a/Core.class
$ exists target/out/jvm/scala-2.12.21/core/classes/a/Core.class
> core2_13/check

6
sbt-app/src/sbt-test/project-matrix/lib/build.sbt
View File

@ -1,11 +1,11 @@
version := "0.1.0-SNAPSHOT"
lazy val util = projectMatrix
.jvmPlatform(scalaVersions = Seq("2.12.20", "2.13.13"))
.jvmPlatform(scalaVersions = Seq("2.12.21", "2.13.13"))
lazy val root = (projectMatrix in file("."))
.dependsOn(util)
.jvmPlatform(scalaVersions = Seq("2.12.20"))
.jvmPlatform(scalaVersions = Seq("2.12.21"))
// ss is second system
lazy val ss = projectMatrix
@ -13,4 +13,4 @@ lazy val ss = projectMatrix
.jvmPlatform(scalaVersions = Seq("2.13.13"))
lazy val strayJar = project
.settings(scalaVersion := "2.12.20")
.settings(scalaVersion := "2.12.21")

4
sbt-app/src/sbt-test/project-matrix/lib/test
View File

@ -6,10 +6,10 @@
# check root
$ mkdir lib
$ copy-file target/out/jvm/scala-2.12.20/strayjar/strayjar_2.12-0.1.0-SNAPSHOT.jar lib/strayJar.jar
$ copy-file target/out/jvm/scala-2.12.21/strayjar/strayjar_2.12-0.1.0-SNAPSHOT.jar lib/strayJar.jar
> root2_12/compile
# check ss
$ mkdir ss/lib
$ copy-file target/out/jvm/scala-2.12.20/strayjar/strayjar_2.12-0.1.0-SNAPSHOT.jar ss/lib/strayJar.jar
$ copy-file target/out/jvm/scala-2.12.21/strayjar/strayjar_2.12-0.1.0-SNAPSHOT.jar ss/lib/strayJar.jar
> ss2_13/compile

2
sbt-app/src/sbt-test/project-matrix/plugin/build.sbt
View File

@ -1,5 +1,5 @@
val scala3 = "3.3.3"
val scala212 = "2.12.20"
val scala212 = "2.12.21"
organization := "com.example"
version := "0.1.0-SNAPSHOT"

2
sbt-app/src/sbt-test/project/common-settings-synthetic-root/build.sbt
View File

@ -1,6 +1,6 @@
lazy val check = taskKey[Unit]("")
def scala212 = "2.12.20"
def scala212 = "2.12.21"
scalaVersion := scala212
val o = "com.example"
organization := o

2
sbt-app/src/sbt-test/project/common-settings/build.sbt
View File

@ -1,6 +1,6 @@
lazy val check = taskKey[Unit]("")
def scala212 = "2.12.20"
def scala212 = "2.12.21"
scalaVersion := scala212
val o = "com.example"
organization := o

2
sbt-app/src/sbt-test/project/semanticdbEnabled/build.sbt
View File

@ -4,7 +4,7 @@ val matrix = projectMatrix
.defaultAxes(VirtualAxis.jvm)
.jvmPlatform(scalaVersions =
Seq(
"2.12.20", // semanticdb support via semanticdb-scalac
"2.12.21", // semanticdb support via semanticdb-scalac
"3.6.4" // built-in semanticdb support
)
)

2
sbt-app/src/sbt-test/project1/aggregate/projA/build.sbt
View File

@ -1,3 +1,3 @@
name := "projA"
scalaVersion := "2.12.20"
scalaVersion := "2.12.21"

2
sbt-app/src/sbt-test/project1/console/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / scalaVersion := "2.12.21"
lazy val root = (project in file("."))
lazy val sub1 = (project in file("sub1"))
lazy val sub2 = (project in file("sub2"))

4
sbt-app/src/sbt-test/project1/cross-plugins-defaults/build.sbt
View File

@ -1,7 +1,7 @@
val baseSbt = "1."
val buildCrossList = List("2.10.7", "2.11.12", "2.12.20")
(ThisBuild / scalaVersion) := "2.12.20"
val buildCrossList = List("2.10.7", "2.11.12", "2.12.21")
(ThisBuild / scalaVersion) := "2.12.21"
(ThisBuild / crossScalaVersions) := buildCrossList
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")

2
sbt-app/src/sbt-test/project1/flatten/build.sbt
View File

@ -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(

2
sbt-app/src/sbt-test/project1/generated-root-no-publish/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / scalaVersion := "2.12.21"
ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache"
val commonSettings = Seq(

2
sbt-app/src/sbt-test/project1/generated-root-no-publish/changes/bare.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / scalaVersion := "2.12.21"
ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache"
organization := "com.example"

2
sbt-app/src/sbt-test/project1/internal-tracking/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / scalaVersion := "2.12.21"
ThisBuild / trackInternalDependencies := TrackLevel.NoTracking
lazy val root = (project in file("."))

2
sbt-app/src/sbt-test/project1/sbt-plugin/build.sbt
View File

@ -1,6 +1,6 @@
lazy val root = project.in(file("."))
.enablePlugins(SbtPlugin)
.settings(
scalaVersion := "2.12.20",
scalaVersion := "2.12.21",
scalacOptions ++= Seq("-Werror", "-Xlint")
)

2
sbt-app/src/sbt-test/project1/sbt-plugin/changes/oldSbtPlugin.sbt
View File

@ -1,6 +1,6 @@
lazy val root = project.in(file("."))
.settings(
scalaVersion := "2.12.20",
scalaVersion := "2.12.21",
sbtPlugin := true,
scalacOptions ++= Seq("-Werror", "-Xlint")
)

2
sbt-app/src/sbt-test/project1/unified/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / scalaVersion := "2.12.21"
import sbt.internal.CommandStrings.{ inspectBrief, inspectDetailed }
import sbt.internal.Inspect

2
sbt-app/src/sbt-test/reporter/nowarn/build.sbt
View File

@ -1,4 +1,4 @@
scalaVersion := "2.12.20"
scalaVersion := "2.12.21"
lazy val sub1 = project

2
sbt-app/src/sbt-test/reporter/source-mapper/build.sbt
View File

@ -7,7 +7,7 @@ lazy val assertAbsolutePathConversion = taskKey[Unit]("checks source mappers con
lazy val assertVirtualFile = taskKey[Unit]("checks source mappers handle virtual files")
lazy val resetMessages = taskKey[Unit]("empties the messages list")
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / scalaVersion := "2.12.21"
lazy val root = (project in file("."))
.settings(

2
sbt-app/src/sbt-test/run/fork-loader/build.sbt
View File

@ -1,6 +1,6 @@
val scalacheck = "org.scalacheck" %% "scalacheck" % "1.14.0"
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / scalaVersion := "2.12.21"
lazy val root = (project in file("."))
.settings(

2
sbt-app/src/sbt-test/run/jep-512/build.sbt
View File

@ -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

2
sbt-app/src/sbt-test/run/non-local-main/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / scalaVersion := "2.12.21"
lazy val main = project.settings(
organization := "org.scala-sbt.testsuite.example",

2
sbt-app/src/sbt-test/source-dependencies/binary/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / scalaVersion := "2.12.21"
lazy val dep = project

Some files were not shown because too many files have changed in this diff Show More