diff --git a/build.sbt b/build.sbt index 3908e4928..3f1cb212e 100644 --- a/build.sbt +++ b/build.sbt @@ -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 diff --git a/launcher-package/build.sbt b/launcher-package/build.sbt index daf9ff5d6..1d7385bde 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/launcher-package/src/universal/bin/sbt.bat b/launcher-package/src/universal/bin/sbt.bat index d18ce0b8a..cbc925aed 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/main/src/main/scala/sbt/PluginCross.scala b/main/src/main/scala/sbt/PluginCross.scala index 2c7f896d6..c017e685c 100644 --- a/main/src/main/scala/sbt/PluginCross.scala +++ b/main/src/main/scala/sbt/PluginCross.scala @@ -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") } diff --git a/main/src/main/scala/sbt/internal/LintUnused.scala b/main/src/main/scala/sbt/internal/LintUnused.scala index 844bbf04e..6f78f3fc4 100644 --- a/main/src/main/scala/sbt/internal/LintUnused.scala +++ b/main/src/main/scala/sbt/internal/LintUnused.scala @@ -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)) diff --git a/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala b/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala index 1ccd8fa42..8f7fdb2ef 100644 --- a/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala +++ b/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala @@ -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) ) diff --git a/main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala b/main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala index b77be0492..2035e0a4b 100644 --- a/main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala +++ b/main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala @@ -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( diff --git a/project/Dependencies.scala b/project/Dependencies.scala index fea6aa3b9..131994bea 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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" diff --git a/sbt b/sbt index 12dee0e5d..729a5b34b 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" 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 diff --git a/sbt-app/src/sbt-test/actions/compile-clean/build.sbt b/sbt-app/src/sbt-test/actions/compile-clean/build.sbt index 8051e6283..8edb1b6ff 100644 --- a/sbt-app/src/sbt-test/actions/compile-clean/build.sbt +++ b/sbt-app/src/sbt-test/actions/compile-clean/build.sbt @@ -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" diff --git a/sbt-app/src/sbt-test/actions/compile-clean/test b/sbt-app/src/sbt-test/actions/compile-clean/test index 4ff41faa5..3c60722cb 100644 --- a/sbt-app/src/sbt-test/actions/compile-clean/test +++ b/sbt-app/src/sbt-test/actions/compile-clean/test @@ -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 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 36919cf4a..a91a4d054 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" ThisBuild / scalaVersion := scala212 diff --git a/sbt-app/src/sbt-test/actions/cross-advanced/test b/sbt-app/src/sbt-test/actions/cross-advanced/test index 28121522b..dd049ff09 100644 --- a/sbt-app/src/sbt-test/actions/cross-advanced/test +++ b/sbt-app/src/sbt-test/actions/cross-advanced/test @@ -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 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/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-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 cbc207fc1..65e8ec8f2 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/build.sbt b/sbt-app/src/sbt-test/actions/doc/build.sbt index 7ad17ee03..56c1fd2bf 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 += "-Werror", commands += Command.command("excludeB") { s => val impl = """val src = (Compile / sources).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 6d67c821d..5c5528673 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/generator/test b/sbt-app/src/sbt-test/actions/generator/test index 613d5b7fc..58cefdcdb 100644 --- a/sbt-app/src/sbt-test/actions/generator/test +++ b/sbt-app/src/sbt-test/actions/generator/test @@ -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 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/package-delete-target/test b/sbt-app/src/sbt-test/actions/package-delete-target/test index ff30f1147..437232263 100644 --- a/sbt-app/src/sbt-test/actions/package-delete-target/test +++ b/sbt-app/src/sbt-test/actions/package-delete-target/test @@ -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 diff --git a/sbt-app/src/sbt-test/actions/query/build.sbt b/sbt-app/src/sbt-test/actions/query/build.sbt index aafdeb6af..fbc99da4b 100644 --- a/sbt-app/src/sbt-test/actions/query/build.sbt +++ b/sbt-app/src/sbt-test/actions/query/build.sbt @@ -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 { diff --git a/sbt-app/src/sbt-test/actions/query/test b/sbt-app/src/sbt-test/actions/query/test index 72ca5f123..c8347759c 100644 --- a/sbt-app/src/sbt-test/actions/query/test +++ b/sbt-app/src/sbt-test/actions/query/test @@ -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 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/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/java-serialization/build.sbt b/sbt-app/src/sbt-test/classloader-cache/java-serialization/build.sbt index c0f0845f5..aa3408775 100644 --- a/sbt-app/src/sbt-test/classloader-cache/java-serialization/build.sbt +++ b/sbt-app/src/sbt-test/classloader-cache/java-serialization/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" val dependency = project.settings(exportJars := true) val descendant = project 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 07a882033..342ed3ac2 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[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", 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/resources/build.sbt b/sbt-app/src/sbt-test/classloader-cache/resources/build.sbt index a5573122e..947ab8223 100644 --- a/sbt-app/src/sbt-test/classloader-cache/resources/build.sbt +++ b/sbt-app/src/sbt-test/classloader-cache/resources/build.sbt @@ -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 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/scalatest/build.sbt b/sbt-app/src/sbt-test/classloader-cache/scalatest/build.sbt index 9def85551..8a7494d16 100644 --- a/sbt-app/src/sbt-test/classloader-cache/scalatest/build.sbt +++ b/sbt-app/src/sbt-test/classloader-cache/scalatest/build.sbt @@ -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 diff --git a/sbt-app/src/sbt-test/classloader-cache/service-loader/build.sbt b/sbt-app/src/sbt-test/classloader-cache/service-loader/build.sbt index c0f0845f5..aa3408775 100644 --- a/sbt-app/src/sbt-test/classloader-cache/service-loader/build.sbt +++ b/sbt-app/src/sbt-test/classloader-cache/service-loader/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" val dependency = project.settings(exportJars := true) val descendant = project 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 e90b27327..a31f33b92 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 621087133..9f8622f0f 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 7acee1071..0dbb960ab 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,5 @@ -scalaVersion := "2.12.20" +scalaVersion := "2.12.21" + libraryDependencies ++= Seq( "com.novocode" % "junit-interface" % "0.5" % Test, "junit" % "junit" % "4.13.1" % 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 9aa5d7ce8..b298b4c5d 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/compiler-project/separate-analysis-per-scala/test b/sbt-app/src/sbt-test/compiler-project/separate-analysis-per-scala/test index e507b31bf..0ee977d31 100644 --- a/sbt-app/src/sbt-test/compiler-project/separate-analysis-per-scala/test +++ b/sbt-app/src/sbt-test/compiler-project/separate-analysis-per-scala/test @@ -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 diff --git a/sbt-app/src/sbt-test/compiler-project/src-dep-plugin/build.sbt b/sbt-app/src/sbt-test/compiler-project/src-dep-plugin/build.sbt index b542a92a9..7616e2469 100644 --- a/sbt-app/src/sbt-test/compiler-project/src-dep-plugin/build.sbt +++ b/sbt-app/src/sbt-test/compiler-project/src-dep-plugin/build.sbt @@ -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 ) diff --git a/sbt-app/src/sbt-test/compiler-project/src-dep-plugin/def/build.sbt b/sbt-app/src/sbt-test/compiler-project/src-dep-plugin/def/build.sbt index 8e879b353..43cb4102a 100644 --- a/sbt-app/src/sbt-test/compiler-project/src-dep-plugin/def/build.sbt +++ b/sbt-app/src/sbt-test/compiler-project/src-dep-plugin/def/build.sbt @@ -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 \ No newline at end of file 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 66d255bf6..039f672d1 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 4cbc0cb4a..0f5889a1c 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" name := "foo" libraryDependencies ++= Seq( diff --git a/sbt-app/src/sbt-test/dependency-graph/output/build.sbt b/sbt-app/src/sbt-test/dependency-graph/output/build.sbt index ad998d58c..2b8ccc01d 100644 --- a/sbt-app/src/sbt-test/dependency-graph/output/build.sbt +++ b/sbt-app/src/sbt-test/dependency-graph/output/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.12.20" +scalaVersion := "2.12.21" organization := "org.example" 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 208ef36c2..24c87e9e4 100644 --- a/sbt-app/src/sbt-test/dependency-management/artifact/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/artifact/build.sbt @@ -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" 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 6b3df60e5..9dc58ff79 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 / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache" 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/exclude-scala/build.sbt b/sbt-app/src/sbt-test/dependency-management/exclude-scala/build.sbt index 5353e7415..64b58339c 100644 --- a/sbt-app/src/sbt-test/dependency-management/exclude-scala/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/exclude-scala/build.sbt @@ -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 diff --git a/sbt-app/src/sbt-test/dependency-management/exclude-transitive/build.sbt b/sbt-app/src/sbt-test/dependency-management/exclude-transitive/build.sbt index 29b4f29d8..87991b550 100644 --- a/sbt-app/src/sbt-test/dependency-management/exclude-transitive/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/exclude-transitive/build.sbt @@ -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)) 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/provided-multi/changes/p.sbt b/sbt-app/src/sbt-test/dependency-management/provided-multi/changes/p.sbt index a739411bd..9f5e783d2 100644 --- a/sbt-app/src/sbt-test/dependency-management/provided-multi/changes/p.sbt +++ b/sbt-app/src/sbt-test/dependency-management/provided-multi/changes/p.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" def configIvyScala = scalaModuleInfo ~= (_ map (_ withCheckExplicit false)) diff --git a/sbt-app/src/sbt-test/dependency-management/scala-tests-only/build.sbt b/sbt-app/src/sbt-test/dependency-management/scala-tests-only/build.sbt index 9a73d6b70..f9fe9aca9 100644 --- a/sbt-app/src/sbt-test/dependency-management/scala-tests-only/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/scala-tests-only/build.sbt @@ -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" 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 d4b63e5a9..ddd17b6e8 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 localCache = 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 b6f910ce4..a1f361782 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 / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache" diff --git a/sbt-app/src/sbt-test/dependency-management/version-interval/build.sbt b/sbt-app/src/sbt-test/dependency-management/version-interval/build.sbt index 1b97b9d20..dbde12b6b 100644 --- a/sbt-app/src/sbt-test/dependency-management/version-interval/build.sbt +++ b/sbt-app/src/sbt-test/dependency-management/version-interval/build.sbt @@ -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 := { 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/lm-coursier/from-no-head/build.sbt b/sbt-app/src/sbt-test/lm-coursier/from-no-head/build.sbt index fd8b72726..c3235d86a 100644 --- a/sbt-app/src/sbt-test/lm-coursier/from-no-head/build.sbt +++ b/sbt-app/src/sbt-test/lm-coursier/from-no-head/build.sbt @@ -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" diff --git a/sbt-app/src/sbt-test/lm-coursier/from-wrong-url/build.sbt b/sbt-app/src/sbt-test/lm-coursier/from-wrong-url/build.sbt index c00f02d93..bc982084e 100644 --- a/sbt-app/src/sbt-test/lm-coursier/from-wrong-url/build.sbt +++ b/sbt-app/src/sbt-test/lm-coursier/from-wrong-url/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.12.20" +scalaVersion := "2.12.21" // keeping the default cache policies here diff --git a/sbt-app/src/sbt-test/lm-coursier/from/build.sbt b/sbt-app/src/sbt-test/lm-coursier/from/build.sbt index 8da4d81b0..19f66e0ff 100644 --- a/sbt-app/src/sbt-test/lm-coursier/from/build.sbt +++ b/sbt-app/src/sbt-test/lm-coursier/from/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.12.20" +scalaVersion := "2.12.21" libraryDependencies += "com.chuusai" %% "shapeless" % "2.3.41" from { diff --git a/sbt-app/src/sbt-test/nio/external-hooks/build.sbt b/sbt-app/src/sbt-test/nio/external-hooks/build.sbt index de60232cb..dc03d7d09 100644 --- a/sbt-app/src/sbt-test/nio/external-hooks/build.sbt +++ b/sbt-app/src/sbt-test/nio/external-hooks/build.sbt @@ -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 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/plugin-cross/build.sbt b/sbt-app/src/sbt-test/plugins/plugin-cross/build.sbt index 092a14570..e85042f75 100644 --- a/sbt-app/src/sbt-test/plugins/plugin-cross/build.sbt +++ b/sbt-app/src/sbt-test/plugins/plugin-cross/build.sbt @@ -19,4 +19,4 @@ lazy val plugin = (projectMatrix in file("plugin")) case _ => "2.0.0-RC3" }, ) - .jvmPlatform(scalaVersions = Seq("3.7.3", "2.12.20")) + .jvmPlatform(scalaVersions = Seq("3.7.3", "2.12.21")) diff --git a/sbt-app/src/sbt-test/plugins/unidoc/build.sbt b/sbt-app/src/sbt-test/plugins/unidoc/build.sbt index 20e149753..fbb328385 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 += "-Werror" // required for the test enablePlugins(ScalaUnidocPlugin) diff --git a/sbt-app/src/sbt-test/project-matrix/custom/build.sbt b/sbt-app/src/sbt-test/project-matrix/custom/build.sbt index 50f6c5c64..566684d45 100644 --- a/sbt-app/src/sbt-test/project-matrix/custom/build.sbt +++ b/sbt-app/src/sbt-test/project-matrix/custom/build.sbt @@ -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")) diff --git a/sbt-app/src/sbt-test/project-matrix/java/build.sbt b/sbt-app/src/sbt-test/project-matrix/java/build.sbt index b0a77ef6b..e07befd06 100644 --- a/sbt-app/src/sbt-test/project-matrix/java/build.sbt +++ b/sbt-app/src/sbt-test/project-matrix/java/build.sbt @@ -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( diff --git a/sbt-app/src/sbt-test/project-matrix/jvm-with-project-axes/build.sbt b/sbt-app/src/sbt-test/project-matrix/jvm-with-project-axes/build.sbt index 6035c9beb..4d01e419e 100644 --- a/sbt-app/src/sbt-test/project-matrix/jvm-with-project-axes/build.sbt +++ b/sbt-app/src/sbt-test/project-matrix/jvm-with-project-axes/build.sbt @@ -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]("") diff --git a/sbt-app/src/sbt-test/project-matrix/jvm-with-project-axes/test b/sbt-app/src/sbt-test/project-matrix/jvm-with-project-axes/test index ca78cc120..804de5680 100644 --- a/sbt-app/src/sbt-test/project-matrix/jvm-with-project-axes/test +++ b/sbt-app/src/sbt-test/project-matrix/jvm-with-project-axes/test @@ -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 diff --git a/sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/build.sbt b/sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/build.sbt index 2e9bc919d..7638c6114 100644 --- a/sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/build.sbt +++ b/sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/build.sbt @@ -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(".")) diff --git a/sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/test b/sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/test index 48ec317e8..fa2e985b9 100644 --- a/sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/test +++ b/sbt-app/src/sbt-test/project-matrix/jvm-with-scoping/test @@ -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 diff --git a/sbt-app/src/sbt-test/project-matrix/lib/build.sbt b/sbt-app/src/sbt-test/project-matrix/lib/build.sbt index a8068e674..a71da4fd5 100644 --- a/sbt-app/src/sbt-test/project-matrix/lib/build.sbt +++ b/sbt-app/src/sbt-test/project-matrix/lib/build.sbt @@ -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") diff --git a/sbt-app/src/sbt-test/project-matrix/lib/test b/sbt-app/src/sbt-test/project-matrix/lib/test index 52c5fb5e1..942185897 100644 --- a/sbt-app/src/sbt-test/project-matrix/lib/test +++ b/sbt-app/src/sbt-test/project-matrix/lib/test @@ -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 diff --git a/sbt-app/src/sbt-test/project-matrix/plugin/build.sbt b/sbt-app/src/sbt-test/project-matrix/plugin/build.sbt index d191af20b..73b17dc2e 100644 --- a/sbt-app/src/sbt-test/project-matrix/plugin/build.sbt +++ b/sbt-app/src/sbt-test/project-matrix/plugin/build.sbt @@ -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" diff --git a/sbt-app/src/sbt-test/project/common-settings-synthetic-root/build.sbt b/sbt-app/src/sbt-test/project/common-settings-synthetic-root/build.sbt index d092200d0..8a7a122e4 100644 --- a/sbt-app/src/sbt-test/project/common-settings-synthetic-root/build.sbt +++ b/sbt-app/src/sbt-test/project/common-settings-synthetic-root/build.sbt @@ -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 diff --git a/sbt-app/src/sbt-test/project/common-settings/build.sbt b/sbt-app/src/sbt-test/project/common-settings/build.sbt index 6ae7dac60..651eacbaa 100644 --- a/sbt-app/src/sbt-test/project/common-settings/build.sbt +++ b/sbt-app/src/sbt-test/project/common-settings/build.sbt @@ -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 diff --git a/sbt-app/src/sbt-test/project/semanticdbEnabled/build.sbt b/sbt-app/src/sbt-test/project/semanticdbEnabled/build.sbt index 3bd26a503..a327b5b1c 100644 --- a/sbt-app/src/sbt-test/project/semanticdbEnabled/build.sbt +++ b/sbt-app/src/sbt-test/project/semanticdbEnabled/build.sbt @@ -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 ) ) diff --git a/sbt-app/src/sbt-test/project1/aggregate/projA/build.sbt b/sbt-app/src/sbt-test/project1/aggregate/projA/build.sbt index af30eb1d0..fc82f2140 100644 --- a/sbt-app/src/sbt-test/project1/aggregate/projA/build.sbt +++ b/sbt-app/src/sbt-test/project1/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/project1/console/build.sbt b/sbt-app/src/sbt-test/project1/console/build.sbt index f216419d7..e822b82ce 100644 --- a/sbt-app/src/sbt-test/project1/console/build.sbt +++ b/sbt-app/src/sbt-test/project1/console/build.sbt @@ -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")) diff --git a/sbt-app/src/sbt-test/project1/cross-plugins-defaults/build.sbt b/sbt-app/src/sbt-test/project1/cross-plugins-defaults/build.sbt index 12f20e965..ad6555575 100644 --- a/sbt-app/src/sbt-test/project1/cross-plugins-defaults/build.sbt +++ b/sbt-app/src/sbt-test/project1/cross-plugins-defaults/build.sbt @@ -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") diff --git a/sbt-app/src/sbt-test/project1/flatten/build.sbt b/sbt-app/src/sbt-test/project1/flatten/build.sbt index d5fe2e781..439a50c2a 100644 --- a/sbt-app/src/sbt-test/project1/flatten/build.sbt +++ b/sbt-app/src/sbt-test/project1/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/project1/generated-root-no-publish/build.sbt b/sbt-app/src/sbt-test/project1/generated-root-no-publish/build.sbt index ac7f88c20..c79f0945b 100644 --- a/sbt-app/src/sbt-test/project1/generated-root-no-publish/build.sbt +++ b/sbt-app/src/sbt-test/project1/generated-root-no-publish/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache" val commonSettings = Seq( diff --git a/sbt-app/src/sbt-test/project1/generated-root-no-publish/changes/bare.sbt b/sbt-app/src/sbt-test/project1/generated-root-no-publish/changes/bare.sbt index 7ceed58f4..aab063433 100644 --- a/sbt-app/src/sbt-test/project1/generated-root-no-publish/changes/bare.sbt +++ b/sbt-app/src/sbt-test/project1/generated-root-no-publish/changes/bare.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache" organization := "com.example" diff --git a/sbt-app/src/sbt-test/project1/internal-tracking/build.sbt b/sbt-app/src/sbt-test/project1/internal-tracking/build.sbt index c34f007b5..f91b1abd9 100644 --- a/sbt-app/src/sbt-test/project1/internal-tracking/build.sbt +++ b/sbt-app/src/sbt-test/project1/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/project1/sbt-plugin/build.sbt b/sbt-app/src/sbt-test/project1/sbt-plugin/build.sbt index 47d589ca6..8b89ed041 100644 --- a/sbt-app/src/sbt-test/project1/sbt-plugin/build.sbt +++ b/sbt-app/src/sbt-test/project1/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("-Werror", "-Xlint") ) diff --git a/sbt-app/src/sbt-test/project1/sbt-plugin/changes/oldSbtPlugin.sbt b/sbt-app/src/sbt-test/project1/sbt-plugin/changes/oldSbtPlugin.sbt index 1d718ca2e..26c5a41ac 100644 --- a/sbt-app/src/sbt-test/project1/sbt-plugin/changes/oldSbtPlugin.sbt +++ b/sbt-app/src/sbt-test/project1/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("-Werror", "-Xlint") ) diff --git a/sbt-app/src/sbt-test/project1/unified/build.sbt b/sbt-app/src/sbt-test/project1/unified/build.sbt index cbb558572..dae9c4338 100644 --- a/sbt-app/src/sbt-test/project1/unified/build.sbt +++ b/sbt-app/src/sbt-test/project1/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/reporter/nowarn/build.sbt b/sbt-app/src/sbt-test/reporter/nowarn/build.sbt index a9a917229..110473269 100644 --- a/sbt-app/src/sbt-test/reporter/nowarn/build.sbt +++ b/sbt-app/src/sbt-test/reporter/nowarn/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.12.20" +scalaVersion := "2.12.21" lazy val sub1 = project diff --git a/sbt-app/src/sbt-test/reporter/source-mapper/build.sbt b/sbt-app/src/sbt-test/reporter/source-mapper/build.sbt index 59334cbcb..bd232e821 100644 --- a/sbt-app/src/sbt-test/reporter/source-mapper/build.sbt +++ b/sbt-app/src/sbt-test/reporter/source-mapper/build.sbt @@ -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( 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 6067d3537..f8048860b 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 scalacheck = "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/run/non-local-main/build.sbt b/sbt-app/src/sbt-test/run/non-local-main/build.sbt index c738e3635..a574f07cc 100644 --- a/sbt-app/src/sbt-test/run/non-local-main/build.sbt +++ b/sbt-app/src/sbt-test/run/non-local-main/build.sbt @@ -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", 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 f787f5da0..3350d0a98 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/implicit-params/build.sbt b/sbt-app/src/sbt-test/source-dependencies/implicit-params/build.sbt index 8b00b0ad7..be6b09d06 100644 --- a/sbt-app/src/sbt-test/source-dependencies/implicit-params/build.sbt +++ b/sbt-app/src/sbt-test/source-dependencies/implicit-params/build.sbt @@ -1,2 +1,2 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" diff --git a/sbt-app/src/sbt-test/source-dependencies/implicit-search/build.sbt b/sbt-app/src/sbt-test/source-dependencies/implicit-search/build.sbt index 76f36acc2..9d9f7c53f 100644 --- a/sbt-app/src/sbt-test/source-dependencies/implicit-search/build.sbt +++ b/sbt-app/src/sbt-test/source-dependencies/implicit-search/build.sbt @@ -1 +1 @@ -scalaVersion := "2.12.20" +scalaVersion := "2.12.21" diff --git a/sbt-app/src/sbt-test/source-dependencies/inherited_type_params/build.sbt b/sbt-app/src/sbt-test/source-dependencies/inherited_type_params/build.sbt index 496af9cce..a384397a7 100644 --- a/sbt-app/src/sbt-test/source-dependencies/inherited_type_params/build.sbt +++ b/sbt-app/src/sbt-test/source-dependencies/inherited_type_params/build.sbt @@ -1,6 +1,6 @@ import sbt.internal.inc.Analysis name := "test" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" TaskKey[Unit]("checkSame") := ((Configurations.Compile / compile) map { case analysis: Analysis => 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 418bd8502..f8e0fe410 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/source-dependencies/struct-usage/build.sbt b/sbt-app/src/sbt-test/source-dependencies/struct-usage/build.sbt index 8b00b0ad7..be6b09d06 100644 --- a/sbt-app/src/sbt-test/source-dependencies/struct-usage/build.sbt +++ b/sbt-app/src/sbt-test/source-dependencies/struct-usage/build.sbt @@ -1,2 +1,2 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" diff --git a/sbt-app/src/sbt-test/source-dependencies/struct/build.sbt b/sbt-app/src/sbt-test/source-dependencies/struct/build.sbt index 8b00b0ad7..be6b09d06 100644 --- a/sbt-app/src/sbt-test/source-dependencies/struct/build.sbt +++ b/sbt-app/src/sbt-test/source-dependencies/struct/build.sbt @@ -1,2 +1,2 @@ -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" diff --git a/sbt-app/src/sbt-test/tests/arguments/build.sbt b/sbt-app/src/sbt-test/tests/arguments/build.sbt index 97cf62c81..6ea392693 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" -scalaVersion := "2.12.20" +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 aab8313f7..2e6745b17 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._ -scalaVersion := "2.12.20" +scalaVersion := "2.12.21" val check = taskKey[Unit]("Check that tests are executed in parallel") libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test 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 50f0f5eb7..39ad96136 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 5c84166af..3a77d04bd 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 4ad079bc3..562ee26dd 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 635492a86..9456aeff4 100644 --- a/sbt-app/src/sbt-test/tests/fork/build.sbt +++ b/sbt-app/src/sbt-test/tests/fork/build.sbt @@ -12,7 +12,7 @@ def groupId(idx: Int) = "group_" + (idx + 1) def groupPrefix(idx: Int) = groupId(idx) + "_file_" Global / localCacheDirectory := baseDirectory.value / "diskcache" -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/incremental-object-sources/build.sbt b/sbt-app/src/sbt-test/tests/incremental-object-sources/build.sbt index 2e17a434c..57d041aab 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 2e17a434c..57d041aab 100644 --- a/sbt-app/src/sbt-test/tests/incremental/build.sbt +++ b/sbt-app/src/sbt-test/tests/incremental/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/junit-xml-report/build.sbt b/sbt-app/src/sbt-test/tests/junit-xml-report/build.sbt index 870d48ba4..6f7e9f9df 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 @@ -6,19 +6,19 @@ val checkReport = taskKey[Unit]("Check the test reports") val checkNoReport = taskKey[Unit]("Check that no reports are present") val oneSecondReportFile = - "target/out/jvm/scala-2.12.20/root/test-reports/TEST-a.pkg.OneSecondTest.xml" + "target/out/jvm/scala-2.12.21/root/test-reports/TEST-a.pkg.OneSecondTest.xml" val failingReportFile = - "target/out/jvm/scala-2.12.20/root/test-reports/TEST-another.pkg.FailingTest.xml" + "target/out/jvm/scala-2.12.21/root/test-reports/TEST-another.pkg.FailingTest.xml" val flatSuiteReportFile = - "target/out/jvm/scala-2.12.20/root/test-reports/TEST-my.scalatest.MyFlatSuite.xml" + "target/out/jvm/scala-2.12.21/root/test-reports/TEST-my.scalatest.MyFlatSuite.xml" val nestedSuitesReportFile = - "target/out/jvm/scala-2.12.20/root/test-reports/TEST-my.scalatest.MyNestedSuites.xml" + "target/out/jvm/scala-2.12.21/root/test-reports/TEST-my.scalatest.MyNestedSuites.xml" 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( libraryDependencies += junitinterface % Test, 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 ac0b2cdf9..a2b176613 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 scalacheck = "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 9fb50443f..560d5bc4a 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 scalacheck = "org.scalacheck" %% "scalacheck" % "1.14.0" -ThisBuild / scalaVersion := "2.12.20" +ThisBuild / scalaVersion := "2.12.21" Test / parallelExecution := false libraryDependencies += scalacheck % Test diff --git a/sbt-app/src/sbt-test/tests/resources/build.sbt b/sbt-app/src/sbt-test/tests/resources/build.sbt index 7d88113a4..d60454d56 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 @@ -scalaVersion := "2.12.20" +scalaVersion := "2.12.21" val specs = "org.specs2" %% "specs2-core" % "4.3.4" 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 d8c20ef35..3585c7e3a 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 5c5441ff9..792f06cb2 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 91536a56d..d13a0593c 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" -scalaVersion := "2.12.20" +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/task/build.sbt b/sbt-app/src/sbt-test/tests/task/build.sbt index 91536a56d..d13a0593c 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" -scalaVersion := "2.12.20" +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 401b235df..87231a356 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 c3eb77523..7231dd741 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 diff --git a/server-test/src/test/scala/testpkg/ResponseTest.scala b/server-test/src/test/scala/testpkg/ResponseTest.scala index 5599c069a..ef5179a7b 100644 --- a/server-test/src/test/scala/testpkg/ResponseTest.scala +++ b/server-test/src/test/scala/testpkg/ResponseTest.scala @@ -19,7 +19,7 @@ class ResponseTest extends AbstractServerTest { if (!s.contains("systemOut")) println(s) s.contains(""""id":"10"""") && - s.contains("scala-library-2.12.20.jar") + s.contains("scala-library-2.12.21.jar") }) } @@ -30,7 +30,7 @@ class ResponseTest extends AbstractServerTest { assert(svr.waitForString(10.seconds) { s => if (!s.contains("systemOut")) println(s) s.contains(""""id":"11"""") && - s.contains("scala-library-2.12.20.jar") + s.contains("scala-library-2.12.21.jar") }) } diff --git a/zinc-lm-integration/src/test/scala/sbt/internal/inc/ZincComponentCompilerSpec.scala b/zinc-lm-integration/src/test/scala/sbt/internal/inc/ZincComponentCompilerSpec.scala index dcb3a4e24..861e3d884 100644 --- a/zinc-lm-integration/src/test/scala/sbt/internal/inc/ZincComponentCompilerSpec.scala +++ b/zinc-lm-integration/src/test/scala/sbt/internal/inc/ZincComponentCompilerSpec.scala @@ -16,7 +16,7 @@ class ZincComponentCompilerSpec extends IvyBridgeProviderSpecification { val scala2106 = "2.10.6" val scala2118 = "2.11.8" val scala21111 = "2.11.11" - val scala21220 = "2.12.20" + val scala21221 = "2.12.21" val scala21311 = "2.13.11" def isJava8: Boolean = sys.props("java.specification.version") == "1.8" @@ -37,8 +37,8 @@ class ZincComponentCompilerSpec extends IvyBridgeProviderSpecification { } else () } - it should "compile the bridge for Scala 2.12.20" in { case given FixtureParam => - IO.withTemporaryDirectory(t => getCompilerBridge(t, logger, scala21220) should exist) + it should "compile the bridge for Scala 2.12.21" in { case given FixtureParam => + IO.withTemporaryDirectory(t => getCompilerBridge(t, logger, scala21221) should exist) } it should "compile the bridge for Scala 2.13.11" in { case given FixtureParam =>