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

Merge branch '1.10.x' into bump-jline3

This commit is contained in:
Seth Tisue 2024-10-10 17:21:05 -07:00 committed by GitHub
parent 82bc9b4605 bbbac6cc2f
commit 00e54404ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
111 changed files with 127 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@ -52,7 +52,7 @@ jobs:
env:
JAVA_OPTS: -Xms800M -Xmx2G -Xss6M -XX:ReservedCodeCacheSize=128M -server -Dsbt.io.virtual=false -Dfile.encoding=UTF-8
JVM_OPTS: -Xms800M -Xmx2G -Xss6M -XX:ReservedCodeCacheSize=128M -server -Dsbt.io.virtual=false -Dfile.encoding=UTF-8
SCALA_212: 2.12.19
SCALA_212: 2.12.20
SCALA_3: 3.1.0
UTIL_TESTS: "utilCache/test utilControl/test utilInterface/test utilLogging/test utilPosition/test utilRelation/test utilScripted/test utilTracking/test"
SBT_LOCAL: false
@ -86,6 +86,8 @@ jobs:
with:
distribution: "${{ matrix.distribution }}"
java-version: "${{ matrix.java }}"
- name: Setup SBT
uses: sbt/setup-sbt@v1
- name: Set up Python 3.12
uses: actions/setup-python@v5
with:

3
.github/workflows/dependency-graph.yml vendored
View File

@ -2,7 +2,7 @@
name: Submit Dependency Graph
on:
push:
branches: [1.9.x] # default branch of the project
branches: [1.10.x, develop]
permissions: {}
jobs:
submit-graph:
@ -13,4 +13,5 @@ jobs:
runs-on: ubuntu-latest # or windows-latest, or macOS-latest
steps:
- uses: actions/checkout@v4
- uses: sbt/setup-sbt@v1
- uses: scalacenter/sbt-dependency-submission@v3

50
build.sbt
View File

@ -48,7 +48,7 @@ ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml"
Global / semanticdbEnabled := !(Global / insideCI).value
// Change main/src/main/scala/sbt/plugins/SemanticdbPlugin.scala too, if you change this.
Global / semanticdbVersion := "4.7.8"
Global / semanticdbVersion := "4.9.9"
val excludeLint = SettingKey[Set[Def.KeyedInitialize[_]]]("excludeLintKeys")
Global / excludeLint := (Global / excludeLint).?.value.getOrElse(Set.empty)
Global / excludeLint += componentID
@ -1311,52 +1311,6 @@ lazy val sbtIgnoredProblems = {
)
}
def runNpm(command: String, base: File, log: sbt.internal.util.ManagedLogger) = {
import scala.sys.process._
try {
val exitCode = Process(s"npm $command", Option(base)) ! log
if (exitCode != 0) throw new Exception("Process returned exit code: " + exitCode)
} catch {
case e: java.io.IOException => log.warn("failed to run npm " + e.getMessage)
}
}
lazy val vscodePlugin = (project in file("vscode-sbt-scala"))
.settings(
bspEnabled := false,
crossPaths := false,
crossScalaVersions := Seq(baseScalaVersion),
publish / skip := true,
Compile / compile := {
val _ = update.value
runNpm("run compile", baseDirectory.value, streams.value.log)
sbt.internal.inc.Analysis.empty
},
update := {
val old = update.value
val t = target.value / "updated"
val base = baseDirectory.value
val log = streams.value.log
if (t.exists) ()
else {
runNpm("install", base, log)
IO.touch(t)
}
old
},
cleanFiles ++= {
val base = baseDirectory.value
Vector(
target.value / "updated",
base / "node_modules",
base / "client" / "node_modules",
base / "client" / "server",
base / "client" / "out",
base / "server" / "node_modules"
) filter { _.exists }
}
)
def scriptedTask(launch: Boolean): Def.Initialize[InputTask[Unit]] = Def.inputTask {
val _ = publishLocalBinAll.value
val launchJar = s"-Dsbt.launch.jar=${(bundledLauncherProj / Compile / packageBin).value}"
@ -1470,7 +1424,7 @@ lazy val docProjects: ScopeFilter = ScopeFilter(
inConfigurations(Compile)
)
lazy val javafmtOnCompile = taskKey[Unit]("Formats java sources before compile")
lazy val scriptedProjects = ScopeFilter(inAnyProject -- inProjects(vscodePlugin))
lazy val scriptedProjects = ScopeFilter(inAnyProject)
def customCommands: Seq[Setting[_]] = Seq(
commands += Command.command("setupBuildScala212") { state =>

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

@ -100,7 +100,7 @@ private[sbt] object PluginCross {
VersionNumber(sv) match {
case VersionNumber(Seq(0, 12, _*), _, _) => "2.9.2"
case VersionNumber(Seq(0, 13, _*), _, _) => "2.10.7"
case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.19"
case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.20"
case _ => sys.error(s"Unsupported sbt binary version: $sv")
}
}

12
main/src/main/scala/sbt/TemplateCommandUtil.scala
View File

@ -279,9 +279,9 @@ private[sbt] object TemplateCommandUtil {
System.err.println("Local template not found for: " + arguments.mkString(" "))
}
private final val defaultScalaV = "3.3.0"
private final val defaultScalaV = "3.3.4"
private def scalaToolkitTemplate(): Unit = {
val defaultScalaToolkitV = "0.2.0"
val defaultScalaToolkitV = "0.5.0"
val scalaV = ask("Scala version", defaultScalaV)
val toolkitV = ask("Scala Toolkit version", defaultScalaToolkitV)
val content = s"""
@ -299,7 +299,7 @@ libraryDependencies += (toolkitTest % Test)
}
private def typelevelToolkitTemplate(): Unit = {
val defaultTypelevelToolkitV = "0.1.3"
val defaultTypelevelToolkitV = "0.1.28"
val scalaV = ask("Scala version", defaultScalaV)
val toolkitV = ask("Typelevel Toolkit version", defaultTypelevelToolkitV)
val content = s"""
@ -335,9 +335,9 @@ lazy val core = (projectMatrix in file("core"))
IO.write(new File("build.sbt"), content)
val pluginsContent = """
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.9.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.10")
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.5")
"""
IO.write(new File("project/plugins.sbt"), pluginsContent)
copyResource("ScalaMain.scala.txt", new File("core/src/main/scala/example/Main.scala"))

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

@ -122,7 +122,7 @@ private[sbt] abstract class AbstractTaskExecuteProgress extends ExecuteProgress[
object AbstractTaskExecuteProgress {
private[sbt] class Timer() {
val startNanos: Long = System.nanoTime()
val threadId: Long = Thread.currentThread().getId
val threadName: String = Thread.currentThread().getName
var endNanos: Long = 0L
def stop(): Unit = {
endNanos = System.nanoTime()

8
main/src/main/scala/sbt/internal/GCUtil.scala
View File

@ -36,14 +36,6 @@ private[sbt] object GCUtil {
log.debug(s"Forcing garbage collection...")
// Force the detection of finalizers for scala.reflect weakhashsets
System.gc()
// Force finalizers to run.
try {
System.runFinalization()
} catch {
case _: NoSuchMethodError =>
}
// Force actually cleaning the weak hash maps.
System.gc()
} catch {
case NonFatal(_) => // gotta catch em all
}

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

@ -61,7 +61,7 @@ private[sbt] final class TaskTraceEvent
def durationEvent(name: String, cat: String, t: Timer): String = {
val sb = new java.lang.StringBuilder(name.length + 2)
CompactPrinter.print(new JString(name), sb)
s"""{"name": ${sb.toString}, "cat": "$cat", "ph": "X", "ts": ${(t.startMicros)}, "dur": ${(t.durationMicros)}, "pid": 0, "tid": ${t.threadId}}"""
s"""{"name": ${sb.toString}, "cat": "$cat", "ph": "X", "ts": ${(t.startMicros)}, "dur": ${(t.durationMicros)}, "pid": 0, "tname": ${t.threadName}}"""
}
val entryIterator = currentTimings
while (entryIterator.hasNext) {

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.14"
val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up")
val baseScalaVersion = scala212

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"
lazy val root = (project in file("."))

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

@ -17,7 +17,7 @@
## test + with command or alias
> clean
## for command cross building you do need crossScalaVerions on root
> set root/crossScalaVersions := Seq("2.12.19", "2.13.12")
> set root/crossScalaVersions := Seq("2.12.20", "2.13.12")
> + build
$ exists foo/target/scala-2.12
$ exists foo/target/scala-2.13

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/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 / crossScalaVersions := Seq(scala212, scala213)

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

4
sbt-app/src/sbt-test/actions/cross-multiproject/test
View File

@ -13,7 +13,7 @@ $ exists lib/target/scala-2.13
# test safe switching
> clean
> ++ 2.12.19 -v compile
> ++ 2.12.20 -v compile
$ exists lib/target/scala-2.12
-$ exists lib/target/scala-2.13
$ exists sbt-foo/target/scala-2.12
@ -31,7 +31,7 @@ $ exists ref/target/scala-2.12
# Test ++ leaves crossScalaVersions unchanged
> clean
> ++2.12.19
> ++2.12.20
> +extrasProj/compile
$ exists extras/target/scala-2.13
$ exists extras/target/scala-2.12

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

@ -1,14 +1,14 @@
scalaVersion := "2.12.19"
scalaVersion := "2.12.20"
lazy val core = project
.settings(
crossScalaVersions := Seq("2.12.19", "3.0.2", "3.1.2")
crossScalaVersions := Seq("2.12.20", "3.0.2", "3.1.2")
)
lazy val subproj = project
.dependsOn(core)
.settings(
crossScalaVersions := Seq("2.12.19", "3.1.2"),
crossScalaVersions := Seq("2.12.20", "3.1.2"),
// a random library compiled against Scala 3.1
libraryDependencies += "org.http4s" %% "http4s-core" % "0.23.12"
)

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

2
sbt-app/src/sbt-test/actions/doc-file-options/build.sbt
View File

@ -2,7 +2,7 @@ val newContents = "bbbbbbbbb"
val rootContentFile = "root.txt"
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
lazy val root = (project in file("."))
.settings(

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 = (sources in Compile).value; src.filterNot(_.getName.contains("B"))"""

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

@ -1,6 +1,6 @@
val buildInfo = taskKey[Seq[File]]("generates the build info")
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
lazy val root = (project in file("."))
.settings(

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

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(task: InputKey[Unit]): 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/snapshot/build.sbt
View File

@ -9,7 +9,7 @@ ThisBuild / useCoursier := false
val snapshot = (project in file(".")).settings(
name := "akka-test",
scalaVersion := "2.12.19",
scalaVersion := "2.12.20",
libraryDependencies ++= Seq(
"com.lihaoyi" %% "utest" % "0.6.6" % "test"
),

2
sbt-app/src/sbt-test/classloader-cache/snapshot/libraries/library-1/ivy/sbt/foo-lib_2.12/0.1.0-SNAPSHOT/foo-lib_2.12-0.1.0-SNAPSHOT.pom
View File

@ -14,7 +14,7 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>2.12.19</version>
<version>2.12.20</version>
</dependency>
</dependencies>
</project>

2
sbt-app/src/sbt-test/classloader-cache/snapshot/libraries/library-2/ivy/sbt/foo-lib_2.12/0.1.0-SNAPSHOT/foo-lib_2.12-0.1.0-SNAPSHOT.pom
View File

@ -14,7 +14,7 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>2.12.19</version>
<version>2.12.20</version>
</dependency>
</dependencies>
</project>

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

@ -2,7 +2,7 @@ name := "Simple Project"
version := "1.0"
scalaVersion := "2.12.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/no-bootclasspath/test
View File

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

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

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
libraryDependencies ++= Seq(
"com.novocode" % "junit-interface" % "0.5" % 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/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,5 +1,5 @@
// ThisBuild / useCoursier := false
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / organization := "org.example"
ThisBuild / version := "0.1"

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

@ -6,7 +6,7 @@ lazy val check = taskKey[Unit]("")
lazy val checkArtifact = taskKey[Unit]("")
ThisBuild / useCoursier := false
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 / useCoursier := false

2
sbt-app/src/sbt-test/dependency-management/cached-resolution-interproj/multi.sbt
View File

@ -3,7 +3,7 @@ lazy val check = taskKey[Unit]("Runs the check")
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
val junit = "junit" % "junit" % "4.13.1"
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache"
def commonSettings: Seq[Def.Setting[_]] =

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/ext-pom-classifier/build.sbt
View File

@ -2,6 +2,6 @@ ThisBuild / useCoursier := false
lazy val root = (project in file("."))
.settings(
scalaVersion := "2.12.19",
scalaVersion := "2.12.20",
externalPom()
)

2
sbt-app/src/sbt-test/dependency-management/force-update-period/build.sbt
View File

@ -1,7 +1,7 @@
ThisBuild / useCoursier := false
name := "force-update-period"
scalaVersion := "2.12.18"
scalaVersion := "2.12.20"
libraryDependencies += "log4j" % "log4j" % "1.2.16" % "compile"
autoScalaLibrary := false

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 customIvyPaths: Seq[Def.Setting[_]] = Seq(

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 / useCoursier := false

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)

2
sbt-app/src/sbt-test/project/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/project/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")
scalaVersion in ThisBuild := "2.12.19"
val buildCrossList = List("2.10.7", "2.11.12", "2.12.20")
scalaVersion in ThisBuild := "2.12.20"
crossScalaVersions in ThisBuild := buildCrossList
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")

2
sbt-app/src/sbt-test/project/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/project/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/project/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/project/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/project/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/project/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/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/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"
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / 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,6 +1,6 @@
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / 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"

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

@ -14,7 +14,7 @@ val nestedSuitesReportFile = "target/test-reports/TEST-my.scalatest.MyNestedSuit
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
val junitinterface = "com.novocode" % "junit-interface" % "0.11"
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
lazy val root = (project in file(".")).
settings(

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 @@
val specs = "org.specs2" %% "specs2-core" % "4.3.4"
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / scalaVersion := "2.12.20"
libraryDependencies += specs % Test

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