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

Merge pull request #6983 from steinybot/fix/bsp-jvm-env-working-dir 

fix: change BSP JVM environment working directory to be a path
This commit is contained in:
eugene yokota 2022-07-29 23:19:14 -04:00 committed by GitHub
parent a2060c9ba0 5c933679fa
commit 62421879e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala
View File

@ -661,7 +661,7 @@ object BuildServerProtocol {
val target = Keys.bspTargetIdentifier.value
val classpath = Keys.fullClasspath.value.map(_.data.toURI).toVector
val jvmOptions = Keys.javaOptions.value.toVector
val baseDir = Keys.baseDirectory.value.toURI().toString()
val baseDir = Keys.baseDirectory.value.getAbsolutePath
val env = envVars.value
JvmEnvironmentItem(

5
server-test/src/test/scala/testpkg/BuildServerTest.scala
View File

@ -412,7 +412,7 @@ object BuildServerTest extends AbstractServerTest {
(s contains "jsoniter-scala-core_2.13-2.13.11.jar") && // compile dependency
(s contains "\"jvmOptions\":[\"Xmx256M\"]") &&
(s contains "\"environmentVariables\":{\"KEY\":\"VALUE\"}") &&
(s contains "/buildserver/run-and-test/") // working directory
(s contains s""""workingDirectory":"${svr.baseDirectory.getAbsolutePath}/run-and-test"""")
}
}
}
@ -434,7 +434,8 @@ object BuildServerTest extends AbstractServerTest {
(s contains "jsoniter-scala-core_2.13-2.13.11.jar") && // compile dependency
(s contains "scalatest_2.13-3.0.8.jar") && // test dependency
(s contains "\"jvmOptions\":[\"Xmx512M\"]") &&
(s contains "\"environmentVariables\":{\"KEY_TEST\":\"VALUE_TEST\"}")
(s contains "\"environmentVariables\":{\"KEY_TEST\":\"VALUE_TEST\"}") &&
(s contains s""""workingDirectory":"${svr.baseDirectory.getAbsolutePath}/run-and-test"""")
}
}
}