Use -Dsbt.script to start sbt server
#6593
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In order to start the sbt server we must use the sbt script because it is the only way to load the .sbtopts and the .jvmopts file properly. To do so the sbt script can pass a -Dsbt.script prop to the java server. It is used in the NetworkClient to start the server, and it is replicated in the BuildServerConnection file (.bsp/sbt.json).
eed3si9n
previously approved these changes
Jul 12, 2021
bjaglin
reviewed
Jul 13, 2021
protocol/src/main/scala/sbt/internal/bsp/BuildServerConnection.scala
Outdated
Show resolved
Hide resolved
protocol/src/main/scala/sbt/internal/bsp/BuildServerConnection.scala
Outdated
Show resolved
Hide resolved
protocol/src/main/scala/sbt/internal/bsp/BuildServerConnection.scala
Outdated
Show resolved
Hide resolved
bjaglin
previously approved these changes
Jul 14, 2021
main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
Outdated
Show resolved
Hide resolved
main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
Outdated
Show resolved
Hide resolved
eed3si9n
approved these changes
Jul 22, 2021
This was referenced Jul 23, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In order to start the sbt server we must use the sbt script because it is the only way to load the .sbtopts and the .jvmopts files properly.
To do so the sbt script can pass a
-Dsbt.scriptoption to the Java process:-Dsbt.scriptis used to start the server-Dsbt.scriptis written into the.bsp/sbt.jsonfileExample of
bsp/sbt.jsonfile:{ "name":"sbt", "version":"1.5.5-SNAPSHOT", "bspVersion":"2.0.0-M5", "languages":["scala"], "argv":[ "/home/.sdkman/candidates/sbt/current/bin/sbt", "-bsp", "-Dsbt.script=/home/.sdkman/candidates/sbt/current/bin/sbt" ] }This PR fixes #6575 and #6476, and part of #6468.
This PR makes #6580 not necessary (except if IntelliJ starts sbt using the sbt-launch.jar directly).