From 645cebccac46f49dd35e6c8ff583f11c8d398773 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 26 Dec 2021 00:28:09 -0500 Subject: [PATCH 1/4] IO 1.6.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 23972722c..85dfa1ee2 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -12,7 +12,7 @@ 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") From 0f8ac0f543d812d7bea53b12011153130353fd73 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 26 Dec 2021 01:44:00 -0500 Subject: [PATCH 2/4] Zinc 1.6.0 --- project/Dependencies.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 85dfa1ee2..d2a166720 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -14,8 +14,8 @@ object Dependencies { // sbt modules 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 From 990fa9530f2f4cfe499f4fc54cc2cb4f179a78e3 Mon Sep 17 00:00:00 2001 From: gontard Date: Fri, 24 Dec 2021 16:12:37 +0100 Subject: [PATCH 3/4] Ensure sbtConfig argv does not need sbt in PATH Before, the BSP config .bsp/sbt.json generated by `sbt bspConfig` contained a command line which required the sbt binary in the PATH. This fix changes the nature of the -Dsbt.script option. It was an argument of the main class xsbt.boot.Boot, it's now a system property and thus it's used to launch the sbt server. Fixes https://github.com/sbt/sbt/issues/6760 --- .../scala/sbt/internal/bsp/BuildServerConnection.scala | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/protocol/src/main/scala/sbt/internal/bsp/BuildServerConnection.scala b/protocol/src/main/scala/sbt/internal/bsp/BuildServerConnection.scala index 66ac7bdf0..fa7fce354 100644 --- a/protocol/src/main/scala/sbt/internal/bsp/BuildServerConnection.scala +++ b/protocol/src/main/scala/sbt/internal/bsp/BuildServerConnection.scala @@ -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) From 544a935534975603cf698381ea5196364d234e98 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 26 Dec 2021 01:48:14 -0500 Subject: [PATCH 4/4] Update banner --- main/src/main/scala/sbt/internal/Banner.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/src/main/scala/sbt/internal/Banner.scala b/main/src/main/scala/sbt/internal/Banner.scala index b43f811ad..0b5a25e71 100644 --- a/main/src/main/scala/sbt/internal/Banner.scala +++ b/main/src/main/scala/sbt/internal/Banner.scala @@ -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") =>