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

Merge pull request #7797 from Friendseeker/bump-scala-2 

[2.x] Bump Scala 2.12 to 2.12.20
This commit is contained in:
eugene yokota 2024-10-21 21:41:28 -04:00 committed by GitHub
parent c39d74d062 0b77171f31
commit 32464d382c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
109 changed files with 142 additions and 142 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 / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml"
Global / semanticdbEnabled := !(Global / insideCI).value
// Change main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala too, if you change this.
Global / semanticdbVersion := "4.7.8"
Global / semanticdbVersion := "4.9.9"
Global / excludeLintKeys += Utils.componentID
Global / excludeLintKeys += scriptedBufferLog
Global / excludeLintKeys += checkPluginCross

4
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.19"
lazy val scala212 = "2.12.20"
lazy val scala210Jline = "org.scala-lang" % "jline" % scala210
lazy val jansi = {
if (sbtVersionToRelease startsWith "1.") "org.fusesource.jansi" % "jansi" % "1.12"
@ -34,7 +34,7 @@ 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.19/versions.properties
// 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"
lazy val sbtActual = "org.scala-sbt" % "sbt" % sbtVersionToRelease

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

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

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

@ -27,7 +27,7 @@ object SemanticdbPlugin extends AutoPlugin {
semanticdbEnabled := SysProp.semanticdb,
semanticdbIncludeInJar := false,
semanticdbOptions := List(),
semanticdbVersion := "4.7.8"
semanticdbVersion := "4.9.9"
)
override lazy val projectSettings: Seq[Def.Setting[_]] = Seq(

2
project/Dependencies.scala
View File

@ -4,7 +4,7 @@ import sbt.contraband.ContrabandPlugin.autoImport._
object Dependencies {
// WARNING: Please Scala update versions in PluginCross.scala too
val scala212 = "2.12.19"
val scala212 = "2.12.20"
val scala213 = "2.13.12"
val scala3 = "3.3.1"
val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up")

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.19"
lazy val scala212 = "2.12.20"
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 crossScalaVerions on root
> set root/crossScalaVersions := Seq("2.12.19", "2.13.12")
> set root/crossScalaVersions := Seq("2.12.20", "2.13.12")
> + build
$ exists target/out/jvm/scala-2.12.19/foo
$ exists target/out/jvm/scala-2.12.20/foo
$ exists target/out/jvm/scala-2.13.12/foo
$ exists target/out/jvm/scala-2.12.19/bar
$ exists target/out/jvm/scala-2.12.20/bar
$ exists target/out/jvm/scala-2.13.12/bar
$ exists target/out/jvm/scala-2.12.19/client
$ exists target/out/jvm/scala-2.12.20/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.19"
crossScalaVersions := List("2.12.19", "2.13.12")
scalaVersion := "2.12.20"
crossScalaVersions := List("2.12.20", "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.19")
crossScalaVersions := Seq[String]("2.11.12", "2.12.20")

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

@ -1,5 +1,5 @@
> ++2.11.12; compile
> ++ 2.12.19 ; compile;
> ++ 2.12.20 ; compile;
> ++ 2.12.19 ; compile
> ++ 2.12.20 ; 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.19"
scalaVersion := "2.12.20"
)

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

@ -1,4 +1,4 @@
lazy val scala212 = "2.12.19"
lazy val scala212 = "2.12.20"
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.19", "2.13.12"),
scalaVersion := "2.12.19",
crossScalaVersions := Seq("2.12.20", "2.13.12"),
scalaVersion := "2.12.20",
Compile / doc / scalacOptions += "-Xfatal-warnings",
commands += Command.command("excludeB") { s =>
val impl = """val src = (Compile / sources).value; src.filterNot(_.getName.contains("B"))"""

28
sbt-app/src/sbt-test/actions/doc/test
View File

@ -5,10 +5,10 @@
# hybrid project, only scaladoc run
> doc
> packageBin
$ exists target/out/jvm/scala-2.12.19/root/api/index.js
$ exists target/out/jvm/scala-2.12.19/root/api/A$.html
$ absent target/out/jvm/scala-2.12.19/root/api/scala
$ absent target/out/jvm/scala-2.12.19/root/api/java
$ exists target/out/jvm/scala-2.12.20/root/api/index.js
$ exists target/out/jvm/scala-2.12.20/root/api/A$.html
$ absent target/out/jvm/scala-2.12.20/root/api/scala
$ absent target/out/jvm/scala-2.12.20/root/api/java
> setDocExtension scala
@ -19,12 +19,12 @@ $ copy-file changes/B.scala B.scala
> clean ; compile ; doc
# pure scala project, only scaladoc at top level
$ exists target/out/jvm/scala-2.12.19/root/api/index.js
$ exists target/out/jvm/scala-2.12.19/root/api/A$.html
$ exists target/out/jvm/scala-2.12.19/root/api/B$.html
$ absent target/out/jvm/scala-2.12.19/root/api/package-list
$ absent target/out/jvm/scala-2.12.19/root/api/scala
$ absent target/out/jvm/scala-2.12.19/root/api/java
$ exists target/out/jvm/scala-2.12.20/root/api/index.js
$ exists target/out/jvm/scala-2.12.20/root/api/A$.html
$ exists target/out/jvm/scala-2.12.20/root/api/B$.html
$ absent target/out/jvm/scala-2.12.20/root/api/package-list
$ absent target/out/jvm/scala-2.12.20/root/api/scala
$ absent target/out/jvm/scala-2.12.20/root/api/java
> setDocExtension java
@ -34,14 +34,14 @@ $ absent target/out/jvm/scala-2.12.19/root/api/java
> doc
# pure java project, only javadoc at top level
$ exists target/out/jvm/scala-2.12.19/root/api/index.html
$ exists target/out/jvm/scala-2.12.19/root/api/pkg/J.html
$ absent target/out/jvm/scala-2.12.19/root/api/index.js
$ exists target/out/jvm/scala-2.12.20/root/api/index.html
$ exists target/out/jvm/scala-2.12.20/root/api/pkg/J.html
$ absent target/out/jvm/scala-2.12.20/root/api/index.js
> setDocExtension scala
> ++2.13.x
> clean
$ absent target/out/jvm/scala-2.12.19/root/api/A$.html
$ absent target/out/jvm/scala-2.12.20/root/api/A$.html
> doc
$ exists target/out/jvm/scala-2.13.12/root/api/A$.html
$ exists target/out/jvm/scala-2.13.12/root/api/B$.html

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.19"
ThisBuild / scalaVersion := "2.12.20"
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.19/root/src_managed/BuildInfo.scala
$ exists target/out/jvm/scala-2.12.20/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.19" :: Nil
crossScalaVersions := "2.11.12" :: "2.12.20" :: 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.19 compile; setStringValue foo; checkStringValue foo
> ++2.12.20 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.19"
scalaVersion := "2.12.20"
)

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

@ -1,4 +1,4 @@
$ mkdir target/out/jvm/scala-2.12.19/delete-target/delete-target_2.12-0.1.0-SNAPSHOT.jar
$ touch target/out/jvm/scala-2.12.19/delete-target/delete-target_2.12-0.1.0-SNAPSHOT.jar/hello
$ 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
-> package
$ exists target/out/jvm/scala-2.12.19/delete-target/delete-target_2.12-0.1.0-SNAPSHOT.jar/hello
$ exists target/out/jvm/scala-2.12.20/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.19",
scalaVersion := "2.12.20",
)
someTask := {

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.19/baz/baz.txt
$ exists target/out/jvm/scala-2.12.20/baz/baz.txt
> clean
@ -12,7 +12,7 @@ $ exists target/out/jvm/scala-2.12.19/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.19/baz/baz.txt
$ exists target/out/jvm/scala-2.12.20/baz/baz.txt
> clean
@ -21,4 +21,4 @@ $ exists target/out/jvm/scala-2.12.19/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.19/baz/baz.txt
$ absent target/out/jvm/scala-2.12.20/baz/baz.txt

2
sbt-app/src/sbt-test/actions/remote-cache-semanticdb/build.sbt
View File

@ -1,6 +1,6 @@
name := "my-project"
scalaVersion := "2.12.19"
scalaVersion := "2.12.20"
semanticdbIncludeInJar := true

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

@ -8,7 +8,7 @@ lazy val CustomArtifact = config("custom-artifact")
val recordPreviousIterations = taskKey[Unit]("Record previous iterations.")
val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.")
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / pushRemoteCacheTo := Some(
MavenCache("local-cache", (ThisBuild / baseDirectory).value / "r")
)

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.19",
scalaVersion := "2.12.20",
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/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.19",
scalaVersion := "2.12.20",
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.19",
scalaVersion := "2.12.20",
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/runtime-layers/build.sbt
View File

@ -1,6 +1,6 @@
val layeringStrategyTest = (project in file(".")).settings(
name := "layering-strategy-test",
scalaVersion := "2.12.19",
scalaVersion := "2.12.20",
organization := "sbt",
libraryDependencies += "com.typesafe.akka" %% "akka-actor" % "2.5.16",
)

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.19"
scalaVersion := "2.12.20"
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.19",
scalaVersion := "2.12.20",
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.19"
ThisBuild / scalaVersion := "2.12.20"
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.19",
scalaVersion := "2.12.20",
// Adds a "macro" configuration for macro dependencies.
ivyConfigurations.value += Macro,

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

@ -1,4 +1,4 @@
scalaVersion := "2.12.19"
scalaVersion := "2.12.20"
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.19"
lazy val scala212 = "2.12.20"
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.19/foo
$ exists target/out/jvm/scala-2.12.20/foo
$ exists target/out/jvm/scala-2.13.12/foo

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

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

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

@ -1,4 +1,4 @@
scalaVersion := "2.12.19"
scalaVersion := "2.12.20"
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.19"
ThisBuild / scalaVersion := "2.12.20"
libraryDependencies ++= Seq(
"org.slf4j" % "slf4j-api" % "1.7.2",

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

@ -1,4 +1,4 @@
scalaVersion := "2.12.19"
scalaVersion := "2.12.20"
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.19"
ThisBuild / scalaVersion := "2.12.20"
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.19"
ThisBuild / scalaVersion := "2.12.20"
// 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.19"
ThisBuild / scalaVersion := "2.12.20"
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.19"
ThisBuild / scalaVersion := "2.12.20"
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/global-plugins/build.sbt
View File

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

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.19"
ThisBuild / scalaVersion := "2.12.20"
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.19"
ThisBuild / scalaVersion := "2.12.20"
// TTL is 24h so we can't detect the change
ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache"

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.19",
ThisBuild / scalaVersion := "2.12.20",
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.19",
ThisBuild / scalaVersion := "2.12.20",
crossJavaVersions := List("1.8", "10"),
// read out.txt and see if it starts with the passed in number

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

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

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

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
name := "hello"
enablePlugins(JavaAppPackaging)

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

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

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.19", "2.13.13"))
.jvmPlatform(scalaVersions = Seq("2.12.20", "2.13.13"))
lazy val root = (projectMatrix in file("."))
.dependsOn(util)
.jvmPlatform(scalaVersions = Seq("2.12.19"))
.jvmPlatform(scalaVersions = Seq("2.12.20"))
// 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.19")
.settings(scalaVersion := "2.12.20")

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.19/strayjar/strayjar_2.12-0.1.0-SNAPSHOT.jar lib/strayJar.jar
$ copy-file target/out/jvm/scala-2.12.20/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.19/strayjar/strayjar_2.12-0.1.0-SNAPSHOT.jar ss/lib/strayJar.jar
$ copy-file target/out/jvm/scala-2.12.20/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.19"
val scala212 = "2.12.20"
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.19"
def scala212 = "2.12.20"
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.19"
def scala212 = "2.12.20"
scalaVersion := scala212
val o = "com.example"
organization := o

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

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

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.19")
(ThisBuild / scalaVersion) := "2.12.19"
val buildCrossList = List("2.10.7", "2.11.12", "2.12.20")
(ThisBuild / scalaVersion) := "2.12.20"
(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.19"
ThisBuild / scalaVersion := "2.12.20"
lazy val root = (project in file("."))
.settings(

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

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
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.19",
scalaVersion := "2.12.20",
scalacOptions ++= Seq("-Xfatal-warnings", "-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.19",
scalaVersion := "2.12.20",
sbtPlugin := true,
scalacOptions ++= Seq("-Xfatal-warnings", "-Xlint")
)

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

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / semanticdbEnabled := true
ThisBuild / semanticdbIncludeInJar := true

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

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
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.19"
scalaVersion := "2.12.20"
lazy val sub1 = project

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

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

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

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

2
sbt-app/src/sbt-test/source-dependencies/constants/test
View File

@ -1,4 +1,4 @@
> ++2.12.19!
> ++2.12.20!
$ copy-file changes/B.scala B.scala

2
sbt-app/src/sbt-test/source-dependencies/cross-source/test
View File

@ -1,3 +1,3 @@
# A.scala needs B.scala, it would be in source list
> ++2.12.19!
> ++2.12.20!
> compile

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

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

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

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
val paradiseVersion = "2.1.1"
val commonSettings = Seq(

2
sbt-app/src/sbt-test/source-dependencies/macro-arg-dep-nested/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
val defaultSettings = Seq(
libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value

2
sbt-app/src/sbt-test/source-dependencies/macro-arg-dep-stackoverflow/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
val defaultSettings = Seq(
libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value

2
sbt-app/src/sbt-test/source-dependencies/macro-arg-dep/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
val defaultSettings = Seq(
libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value

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

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
val defaultSettings = Seq(
libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value

2
sbt-app/src/sbt-test/tests/arguments/build.sbt
View File

@ -1,6 +1,6 @@
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
scalaVersion := "2.12.19"
scalaVersion := "2.12.20"
val foo = settingKey[Seq[String]]("foo")
val checkFoo = inputKey[Unit]("check contents of foo")

2
sbt-app/src/sbt-test/tests/do-not-discover/build.sbt
View File

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

2
sbt-app/src/sbt-test/tests/done/build.sbt
View File

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

2
sbt-app/src/sbt-test/tests/filter-runners/build.sbt
View File

@ -1,7 +1,7 @@
val scalatest = "org.scalatest" %% "scalatest" % "3.2.2"
val munit = "org.scalameta" %% "munit" % "0.7.22"
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
libraryDependencies += scalatest % Test
libraryDependencies += munit % Test

2
sbt-app/src/sbt-test/tests/fork-async/build.sbt
View File

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

2
sbt-app/src/sbt-test/tests/fork-parallel/build.sbt
View File

@ -1,7 +1,7 @@
import Tests._
import Defaults._
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
val check = taskKey[Unit]("Check that tests are executed in parallel")
lazy val root = (project in file("."))

2
sbt-app/src/sbt-test/tests/fork-test-group-parallel-custom-tags/build.sbt
View File

@ -1,5 +1,5 @@
val specs = "org.specs2" %% "specs2-core" % "4.3.4"
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
val TestATypeTag = Tags.Tag("TestA")
val TestBTypeTag = Tags.Tag("TestB")

2
sbt-app/src/sbt-test/tests/fork-test-group-parallel/build.sbt
View File

@ -1,5 +1,5 @@
val specs = "org.specs2" %% "specs2-core" % "4.3.4"
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
Global / concurrentRestrictions := Seq(Tags.limitAll(4))
libraryDependencies += specs % Test

2
sbt-app/src/sbt-test/tests/fork-uncaught2/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
libraryDependencies += "org.scala-sbt" % "test-interface" % "1.0"

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

@ -11,7 +11,7 @@ val scalaxml = "org.scala-lang.modules" %% "scala-xml" % "1.1.1"
def groupId(idx: Int) = "group_" + (idx + 1)
def groupPrefix(idx: Int) = groupId(idx) + "_file_"
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / organization := "org.example"
lazy val root = (project in file("."))

2
sbt-app/src/sbt-test/tests/fork2/build.sbt
View File

@ -1,5 +1,5 @@
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
scalaVersion := "2.12.19"
scalaVersion := "2.12.20"
fork := true
libraryDependencies += scalatest % Test

2
sbt-app/src/sbt-test/tests/it/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
val specs = "org.specs2" %% "specs2-core" % "4.3.4"

10
sbt-app/src/sbt-test/tests/junit-xml-report/build.sbt
View File

@ -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.19/root/test-reports/TEST-a.pkg.OneSecondTest.xml"
"target/out/jvm/scala-2.12.20/root/test-reports/TEST-a.pkg.OneSecondTest.xml"
val failingReportFile =
"target/out/jvm/scala-2.12.19/root/test-reports/TEST-another.pkg.FailingTest.xml"
"target/out/jvm/scala-2.12.20/root/test-reports/TEST-another.pkg.FailingTest.xml"
val flatSuiteReportFile =
"target/out/jvm/scala-2.12.19/root/test-reports/TEST-my.scalatest.MyFlatSuite.xml"
"target/out/jvm/scala-2.12.20/root/test-reports/TEST-my.scalatest.MyFlatSuite.xml"
val nestedSuitesReportFile =
"target/out/jvm/scala-2.12.19/root/test-reports/TEST-my.scalatest.MyNestedSuites.xml"
"target/out/jvm/scala-2.12.20/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.19"
ThisBuild / scalaVersion := "2.12.20"
lazy val root = (project in file(".")).settings(
libraryDependencies += junitinterface % Test,

2
sbt-app/src/sbt-test/tests/munit/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
lazy val munit = "org.scalameta" %% "munit" % "0.7.22"

2
sbt-app/src/sbt-test/tests/nested-inproc-par/build.sbt
View File

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

2
sbt-app/src/sbt-test/tests/nested-inproc-seq/build.sbt
View File

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

2
sbt-app/src/sbt-test/tests/nested-subproc/build.sbt
View File

@ -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.19"
ThisBuild / scalaVersion := "2.12.20"
lazy val root = (project in file("."))
.settings(

2
sbt-app/src/sbt-test/tests/nested-tests/build.sbt
View File

@ -1,6 +1,6 @@
val scalcheck = "org.scalacheck" %% "scalacheck" % "1.14.0"
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / version := "0.0.1"
ThisBuild / organization := "org.catastrophe"

2
sbt-app/src/sbt-test/tests/one-class-multi-framework/build.sbt
View File

@ -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.19"
ThisBuild / scalaVersion := "2.12.20"
libraryDependencies += junitinterface % Test
libraryDependencies += specsJunit % Test

2
sbt-app/src/sbt-test/tests/order/build.sbt
View File

@ -1,5 +1,5 @@
val scalcheck = "org.scalacheck" %% "scalacheck" % "1.14.0"
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
Test / parallelExecution := false
libraryDependencies += scalcheck % Test

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

@ -1,3 +1,3 @@
scalaVersion := "2.12.19"
scalaVersion := "2.12.20"
val specs = "org.specs2" %% "specs2-core" % "4.3.4"
libraryDependencies += specs % Test

2
sbt-app/src/sbt-test/tests/scala-instance-classloader/build.sbt
View File

@ -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.19"
ThisBuild / scalaVersion := "2.12.20"
lazy val root = (project in file("."))
.configs(OtherScala)

2
sbt-app/src/sbt-test/tests/serial/build.sbt
View File

@ -1,6 +1,6 @@
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / organization := "com.example"
ThisBuild / version := "0.0.1-SNAPSHOT"

2
sbt-app/src/sbt-test/tests/setup-cleanup/base.sbt
View File

@ -1,3 +1,3 @@
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
libraryDependencies += scalatest

2
sbt-app/src/sbt-test/tests/single-runner/build.sbt
View File

@ -1,4 +1,4 @@
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
scalaVersion := "2.12.19"
scalaVersion := "2.12.20"
libraryDependencies += scalatest
Test / testOptions += Tests.Argument("-C", "custom.CustomReporter")

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