Replace -jar with -classpath in BuildServerConnectionDetails

This commit is contained in:
adpi2 2020-06-08 15:26:21 +02:00
parent 37d1cd98eb
commit eac9328db7
2 changed files with 13 additions and 4 deletions

View File

@ -202,8 +202,8 @@ private[sbt] object Server {
private[this] def writeBspConnectionDetails(): Unit = {
import bsp.codec.JsonProtocol._
val sbtVersion = appConfiguration.provider.id.version
val launcherJar = ManagementFactory.getRuntimeMXBean.getClassPath
val details = BuildServerConnection.details(sbtVersion, launcherJar)
val launcherClassPath = ManagementFactory.getRuntimeMXBean.getClassPath
val details = BuildServerConnection.details(sbtVersion, launcherClassPath)
val json = Converter.toJson(details).get
IO.write(bspConnectionFile, CompactPrinter(json), append = false)
}

View File

@ -12,8 +12,17 @@ object BuildServerConnection {
final val bspVersion = "2.0.0-M5"
final val languages = Vector("scala")
def details(sbtVersion: String, launcherJar: String): BspConnectionDetails = {
val argv = Vector("java", "-Xms100m", "-Xmx100m", "-jar", launcherJar, "-bsp")
def details(sbtVersion: String, launcherClassPath: String): BspConnectionDetails = {
val argv =
Vector(
"java",
"-Xms100m",
"-Xmx100m",
"-classpath",
launcherClassPath,
"xsbt.boot.Boot",
"-bsp"
)
BspConnectionDetails(name, sbtVersion, bspVersion, languages, argv)
}
}