Skip to content

Commit

Permalink
Upgrade to Bloop 1.4.7 + remove -J prefix
Browse files Browse the repository at this point in the history
As of scalacenter/bloop#1455 Bloop do not need
the -J prefix on the jvmOptions. Also there is a plan to remove support
for the -J prefix coming from debugSession/start request
(scalacenter/bloop#1456).
  • Loading branch information
adpi2 authored and tgodzik committed Feb 17, 2021
1 parent e1921d4 commit 1d3f4f1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ lazy val V = new {
val scalameta = "4.4.8"
val semanticdb = scalameta
val bsp = "2.0.0-M13"
val bloop = "1.4.6-40-6418e91f"
val bloop = "1.4.7"
val scala3 = "3.0.0-M3"
val bloopNightly = bloop
val sbtBloop = bloop
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -293,13 +293,6 @@ class DebugProvider(
case json: JsonElement
if parameters.getDataKind == b.DebugSessionParamsDataKind.SCALA_MAIN_CLASS =>
json.as[b.ScalaMainClass].foreach { main =>
val translated = main.getJvmOptions().asScala.map { param =>
if (!param.startsWith("-J"))
s"-J$param"
else
param
}
main.setJvmOptions(translated.asJava)
if (main.getEnvironmentVariables() == null) {
main.setEnvironmentVariables(Nil.asJava)
}
Expand Down

0 comments on commit 1d3f4f1

Please sign in to comment.