Skip to content

Commit 4054c8d

Browse files
committed
Fix native image - configure proxy for debug server
1 parent cce4f49 commit 4054c8d

File tree

6 files changed

+25
-4
lines changed

6 files changed

+25
-4
lines changed

modules/bloop-rifle/src/main/scala/scala/build/bloop/BuildServer.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,5 @@ package scala.build.bloop
22

33
import ch.epfl.scala.bsp4j
44

5-
import scala.build.bsp.ScalaDebugServer
6-
75
trait BuildServer extends bsp4j.BuildServer with bsp4j.ScalaBuildServer with bsp4j.JavaBuildServer
86
with ScalaDebugServer

modules/bloop-rifle/src/main/scala/scala/build/bloop/ScalaDebugServer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package scala.build.bsp;
1+
package scala.build.bloop;
22

33
import ch.epfl.scala.bsp4j.{DebugSessionAddress, DebugSessionParams}
44
import org.eclipse.lsp4j.jsonrpc.services.JsonRequest

modules/bloop-rifle/src/main/scala/scala/build/bloop/ScalaDebugServerForwardStubs.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package scala.build.bsp
1+
package scala.build.bloop
22

33
import ch.epfl.scala.{bsp4j => b}
44

modules/build/src/main/scala/scala/build/bsp/BspServer.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import ch.epfl.scala.{bsp4j => b}
55
import java.util.concurrent.CompletableFuture
66

77
import scala.build.Logger
8+
import scala.build.bloop.{ScalaDebugServer, ScalaDebugServerForwardStubs}
89
import scala.build.internal.Constants
910
import scala.build.options.Scope
1011
import scala.concurrent.{Future, Promise}

modules/cli/src/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/proxy-config.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,13 @@
66
[
77
"scala.build.bloop.BuildServer",
88
"org.eclipse.lsp4j.jsonrpc.Endpoint"
9+
],
10+
[
11+
"scala.build.bloop.ScalaDebugServer",
12+
"org.eclipse.lsp4j.jsonrpc.Endpoint"
13+
],
14+
[
15+
"scala.build.bloop.ScalaDebugServerForwardStubs",
16+
"org.eclipse.lsp4j.jsonrpc.Endpoint"
917
]
1018
]

modules/cli/src/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/reflect-config.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -703,6 +703,20 @@
703703
"allDeclaredMethods": true,
704704
"allDeclaredFields": true
705705
},
706+
{
707+
"name": "scala.build.bloop.ScalaDebugServer",
708+
"allDeclaredConstructors": true,
709+
"allPublicConstructors": true,
710+
"allDeclaredMethods": true,
711+
"allDeclaredFields": true
712+
},
713+
{
714+
"name": "scala.build.bloop.ScalaDebugServerForwardStubs",
715+
"allDeclaredConstructors": true,
716+
"allPublicConstructors": true,
717+
"allDeclaredMethods": true,
718+
"allDeclaredFields": true
719+
},
706720
{
707721
"name": "scala.build.bloop.bloop4j.BloopExtraBuildParams",
708722
"allDeclaredConstructors": true,

0 commit comments

Comments
 (0)