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

Merge pull request #6762 from eed3si9n/wip/bump 

[1.6.0] Zinc 1.6.0
This commit is contained in:
eugene yokota 2021-12-26 02:17:39 -05:00 committed by GitHub
parent df46c08051 544a935534
commit d4e8d0e4de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ private[sbt] object Banner {
| - Improved JDK 17 support
| - Improved Build Server Protocol (BSP) support
| - Tab completion of global keys
|See https://eed3si9n.com/sbt-1.6.0-beta for full release notes.
|See https://eed3si9n.com/sbt-1.6.0 for full release notes.
|Hide the banner for this release by running `skipBanner`.
|""".stripMargin.linesIterator.mkString("\n"))
case v if v.startsWith("1.4.0") =>

6
project/Dependencies.scala
View File

@ -12,10 +12,10 @@ object Dependencies {
sys.env.get("BUILD_VERSION") orElse sys.props.get("sbt.build.version")
// sbt modules
private val ioVersion = nightlyVersion.getOrElse("1.6.0-M2")
private val ioVersion = nightlyVersion.getOrElse("1.6.0")
private val lmVersion =
sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.6.0-M2")
val zincVersion = nightlyVersion.getOrElse("1.6.0-M2")
sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.6.0")
val zincVersion = nightlyVersion.getOrElse("1.6.0")
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion

8
protocol/src/main/scala/sbt/internal/bsp/BuildServerConnection.scala
View File

@ -49,9 +49,11 @@ object BuildServerConnection {
"-Xmx100m",
"-classpath",
classPath,
"xsbt.boot.Boot",
"-bsp"
) ++ sbtScript.orElse(sbtLaunchJar)
) ++
sbtScript ++
Vector("xsbt.boot.Boot", "-bsp") ++
(if (sbtScript.isEmpty) sbtLaunchJar else None)
val details = BspConnectionDetails(name, sbtVersion, bspVersion, languages, argv)
val json = Converter.toJson(details).get
IO.write(bspConnectionFile, CompactPrinter(json), append = false)