mirror of https://github.com/sbt/sbt.git
[2.x] Scala 3.8.3 (#8997)
This commit is contained in:
parent
606bb3b59c
commit
8ad6ada60f
|
|
@ -1022,7 +1022,7 @@ lazy val sbtwProj = (project in file("sbtw"))
|
|||
commonSettings,
|
||||
name := "sbtw",
|
||||
description := "Windows drop-in launcher for sbt (replaces sbt.bat)",
|
||||
scalaVersion := "3.8.2",
|
||||
scalaVersion := "3.8.3",
|
||||
crossPaths := false,
|
||||
Compile / scalafix / unmanagedSources := {
|
||||
// https://github.com/scalameta/scalameta/issues/4531
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ Create an initial build in `something`. Like a real build using sbt. I'm sure yo
|
|||
|
||||
```scala
|
||||
name := "foo"
|
||||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
```
|
||||
|
||||
I also have `Hello.scala`:
|
||||
|
|
@ -107,7 +107,7 @@ import scala.sys.process.Process
|
|||
lazy val check = taskKey[Unit]("check")
|
||||
|
||||
name := "foo"
|
||||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
check := {
|
||||
val pkg = (Compile / packageBin).value
|
||||
val conv = fileConverter.value
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ lazy val check2 = taskKey[Unit]("")
|
|||
|
||||
lazy val root = (project in file("."))
|
||||
.settings(
|
||||
scalaVersion := "3.8.2",
|
||||
scalaVersion := "3.8.3",
|
||||
name := "Hello",
|
||||
libraryDependencies += "com.eed3si9n.verify" %% "verify" % "1.0.0" % Test,
|
||||
testFrameworks += new TestFramework("verify.runner.Framework"),
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
lazy val root = (project in file("."))
|
||||
.settings(
|
||||
scalaVersion := "3.8.2",
|
||||
scalaVersion := "3.8.3",
|
||||
name := "Hello",
|
||||
)
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ class LockFileSpec extends AnyFunSuite {
|
|||
),
|
||||
metadata = LockFileMetadata(
|
||||
sbtVersion = "2.0.0",
|
||||
scalaVersion = Some("3.8.2")
|
||||
scalaVersion = Some("3.8.3")
|
||||
)
|
||||
)
|
||||
|
||||
|
|
@ -59,7 +59,7 @@ class LockFileSpec extends AnyFunSuite {
|
|||
assert(readData.configurations.head.dependencies.head.organization == "org.scala-lang")
|
||||
assert(readData.configurations.head.dependencies.head.version == "2.13.16")
|
||||
assert(readData.metadata.sbtVersion == "2.0.0")
|
||||
assert(readData.metadata.scalaVersion == Some("3.8.2"))
|
||||
assert(readData.metadata.scalaVersion == Some("3.8.3"))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -111,7 +111,7 @@ class LockFileSpec extends AnyFunSuite {
|
|||
configurations = Vector.empty,
|
||||
metadata = LockFileMetadata(
|
||||
sbtVersion = "2.0.0",
|
||||
scalaVersion = Some("3.8.2")
|
||||
scalaVersion = Some("3.8.3")
|
||||
)
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import Keys.*
|
|||
object Dependencies {
|
||||
// WARNING: Please Scala update versions in PluginCross.scala too
|
||||
val scala213 = "2.13.16"
|
||||
val scala3 = "3.8.2"
|
||||
val scala3 = "3.8.3"
|
||||
val scala212 = "2.12.21"
|
||||
val baseScalaVersion = scala3
|
||||
def nightlyVersion: Option[String] =
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ lazy val checkMiss = inputKey[Unit]("")
|
|||
|
||||
Global / localCacheDirectory := baseDirectory.value / "diskcache"
|
||||
|
||||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
checkMiss := {
|
||||
val expected: Int = (Space ~> NatBasic).parsed
|
||||
val s = streams.value
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ lazy val verify = "com.eed3si9n.verify" %% "verify" % "1.0.0"
|
|||
|
||||
Global / localCacheDirectory := baseDirectory.value / "diskcache"
|
||||
|
||||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
libraryDependencies += verify % Test
|
||||
testFrameworks += new TestFramework("verify.runner.Framework")
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c
|
|||
name := "lib1"
|
||||
organization := "com.example"
|
||||
version := "0.1.0-SNAPSHOT"
|
||||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
|
||||
val publishRepoBase = settingKey[File]("Base directory for publish repo (HTTP server writes here)")
|
||||
publishRepoBase := baseDirectory.value / "repo"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c
|
|||
name := "lib1"
|
||||
organization := "com.example"
|
||||
version := "0.1.0-SNAPSHOT"
|
||||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
|
||||
// Use a fixed path for local ivy repo to avoid sbt 2.x output sharding
|
||||
val ivyLocalBase = settingKey[File]("Local Ivy repository base")
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-cache"
|
||||
ThisBuild / organization := "com.example"
|
||||
ThisBuild / version := "0.1.0-SNAPSHOT"
|
||||
ThisBuild / scalaVersion := "3.8.2"
|
||||
ThisBuild / scalaVersion := "3.8.3"
|
||||
|
||||
val publishRepoBase = settingKey[File]("Base directory for Maven publish repo (HTTP server writes here)")
|
||||
ThisBuild / publishRepoBase := (ThisBuild / baseDirectory).value / "repo"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c
|
|||
name := "lib1"
|
||||
organization := "com.example"
|
||||
version := "0.1.0-SNAPSHOT"
|
||||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
|
||||
publishMavenStyle := true
|
||||
val publishRepoBase = settingKey[File]("Base directory for Maven publish repo")
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ ThisBuild / csrCacheDirectory := (ThisBuild / baseDirectory).value / "coursier-c
|
|||
name := "lib1"
|
||||
organization := "com.example"
|
||||
version := "0.1.0-SNAPSHOT"
|
||||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
|
||||
// Publish to a file repo (tests ivyless publish without HTTP server)
|
||||
val publishRepoBase = settingKey[File]("Base directory for publish repo")
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
lazy val a = project
|
||||
.settings(
|
||||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
)
|
||||
|
||||
// (b / update) sbt.librarymanagement.ResolveException: Error downloading org.scala-lang:scala-reflect:3.8.2
|
||||
// (b / update) sbt.librarymanagement.ResolveException: Error downloading org.scala-lang:scala-reflect:3.8.3
|
||||
lazy val b = project
|
||||
.dependsOn(a)
|
||||
.settings(
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import java.nio.file.Files
|
|||
|
||||
name := "clean-symlinks-test"
|
||||
|
||||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
|
||||
TaskKey[Unit]("createSymlinkedDirectory") := {
|
||||
IO.createDirectory(target.value)
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
> createSymlinkedDirectory
|
||||
|
||||
$ exists target/out/jvm/scala-3.8.2/clean-symlinks-test/foo/bar
|
||||
$ exists target/out/jvm/scala-3.8.3/clean-symlinks-test/foo/bar
|
||||
$ exists foo/bar
|
||||
|
||||
> clean
|
||||
|
||||
$ absent target/out/jvm/scala-3.8.2/clean-symlinks-test/foo
|
||||
$ absent target/out/jvm/scala-3.8.3/clean-symlinks-test/foo
|
||||
$ exists foo/bar
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
|
||||
organization := "com.example"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
publishLocal := {}
|
||||
|
|
|
|||
|
|
@ -19,4 +19,4 @@ lazy val plugin = (projectMatrix in file("plugin"))
|
|||
case _ => "2.0.0-RC3"
|
||||
},
|
||||
)
|
||||
.jvmPlatform(scalaVersions = Seq("3.8.2", "2.12.21"))
|
||||
.jvmPlatform(scalaVersions = Seq("3.8.3", "2.12.21"))
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
ThisBuild / scalaVersion := "3.8.2"
|
||||
ThisBuild / scalaVersion := "3.8.3"
|
||||
|
||||
name := "hello"
|
||||
enablePlugins(JavaAppPackaging)
|
||||
|
|
@ -6,7 +6,7 @@ enablePlugins(JavaAppPackaging)
|
|||
lazy val check = taskKey[Unit]("")
|
||||
|
||||
check := {
|
||||
val cmd = "target/out/jvm/scala-3.8.2/hello/universal/stage/bin/hello"
|
||||
val cmd = "target/out/jvm/scala-3.8.3/hello/universal/stage/bin/hello"
|
||||
val cmd0 =
|
||||
if (sys.props("os.name").toLowerCase(java.util.Locale.ROOT).contains("windows"))
|
||||
cmd + ".bat"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
|
||||
|
||||
// addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.20")
|
||||
libraryDependencies += Defaults.sbtPluginExtra("com.github.sbt" % "sbt-native-packager" % "1.11.4", "2", "3.8.2")
|
||||
libraryDependencies += Defaults.sbtPluginExtra("com.github.sbt" % "sbt-native-packager" % "1.11.4", "2", "3.8.3")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
lazy val `a + b` = "2.13.18"
|
||||
|
||||
// https://github.com/scala/scala3/blob/3.8.2/library/src/scala/reflect/NameTransformer.scala#L47-L64
|
||||
// https://github.com/scala/scala3/blob/3.8.3/library/src/scala/reflect/NameTransformer.scala#L47-L64
|
||||
lazy val ~=<>!#%^&|*/+-:\\?@ = "my-name"
|
||||
|
||||
scalaVersion := `a + b`
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
|
||||
@deprecated
|
||||
def foo = true
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
|
||||
@deprecated
|
||||
def foo = true
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
lazy val scala3_LTS = "3.3.5"
|
||||
lazy val scala3_current = "3.8.2"
|
||||
lazy val scala3_current = "3.8.3"
|
||||
lazy val check = taskKey[Unit]("")
|
||||
|
||||
organization := "com.example"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
> packageBin
|
||||
$ exists target/**/app_3.3.5-0.1.0-SNAPSHOT.jar
|
||||
$ exists target/**/app_3.8.2-0.1.0-SNAPSHOT.jar
|
||||
> core3_8_2/check
|
||||
$ exists target/**/app_3.8.3-0.1.0-SNAPSHOT.jar
|
||||
> core3_8_3/check
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
// https://github.com/sbt/sbt/issues/8971
|
||||
ThisBuild / scalaVersion := "3.8.2"
|
||||
ThisBuild / scalaVersion := "3.8.3"
|
||||
|
||||
lazy val extLib = ProjectRef(file("ext/lib"), "lib")
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
ThisBuild / scalaVersion := "3.8.2"
|
||||
ThisBuild / scalaVersion := "3.8.3"
|
||||
|
||||
lazy val lib = (projectMatrix in file("."))
|
||||
.settings(
|
||||
name := "lib",
|
||||
)
|
||||
.jvmPlatform(scalaVersions = Seq("3.8.2"))
|
||||
.jvmPlatform(scalaVersions = Seq("3.8.3"))
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
crossPaths := false
|
||||
name := "definition-lib-forname-test"
|
||||
version := "1.0"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
lazy val a1 = settingKey[Boolean]("")
|
||||
|
||||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
a1 := true
|
||||
|
||||
Compile / sourceGenerators += {
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ lazy val intsSetting2 = Def.setting {
|
|||
Seq(1, 2, 3)
|
||||
}
|
||||
|
||||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
|
||||
intsTask := Seq(1, 2, 3, 4, 5, 6, 7)
|
||||
intsTask -= 3
|
||||
|
|
@ -30,10 +30,10 @@ intsSetting -= intSetting2.value
|
|||
intsSetting --= intsSetting2.value
|
||||
|
||||
intsFromScalaV := Seq(1, 2, 3, 4, 5, 6, 7)
|
||||
intsFromScalaV -= { if scalaVersion.value == "3.8.2" then 3 else 5 }
|
||||
intsFromScalaV --= { if scalaVersion.value == "3.8.2" then Seq(1, 2) else Seq(4) }
|
||||
intsFromScalaV -= { if scalaVersion.value == "3.8.2" then Option(6) else None }
|
||||
intsFromScalaV --= { if scalaVersion.value == "3.8.2" then Option(7) else None }
|
||||
intsFromScalaV -= { if scalaVersion.value == "3.8.3" then 3 else 5 }
|
||||
intsFromScalaV --= { if scalaVersion.value == "3.8.3" then Seq(1, 2) else Seq(4) }
|
||||
intsFromScalaV -= { if scalaVersion.value == "3.8.3" then Option(6) else None }
|
||||
intsFromScalaV --= { if scalaVersion.value == "3.8.3" then Option(7) else None }
|
||||
|
||||
intsSetSetting := Set(1, 2, 3, 4, 5, 6, 7)
|
||||
intsSetSetting -= 3
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
val scalatest = "org.scalatest" %% "scalatest" % "3.2.19"
|
||||
|
||||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
Test / fork := true
|
||||
libraryDependencies += scalatest % Test
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
val scalatest = "org.scalatest" %% "scalatest" % "3.2.19"
|
||||
|
||||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
fork := true
|
||||
libraryDependencies += scalatest % Test
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
libraryDependencies += "com.eed3si9n.verify" %% "verify" % "1.0.0" % Test
|
||||
testFrameworks += new TestFramework("verify.runner.Framework")
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ val marker = new File("marker")
|
|||
val check = TaskKey[Unit]("check", "Check correct error has been returned.")
|
||||
val scalatest = "org.scalatest" %% "scalatest" % "3.2.19"
|
||||
|
||||
ThisBuild / scalaVersion := "3.8.2"
|
||||
ThisBuild / scalaVersion := "3.8.3"
|
||||
|
||||
lazy val root = (project in file(".")).
|
||||
settings(
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
|
||||
val printCurrentProject = inputKey[Unit]("Prints current project name")
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
scalaVersion := "3.8.2"
|
||||
scalaVersion := "3.8.3"
|
||||
|
||||
TaskKey[Unit]("willSucceed") := println("success")
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue