@@ -7,11 +7,11 @@ import org.javacs.ktda.core.launch.AttachConfiguration
77import org.javacs.ktda.core.DebugContext
88import org.javacs.ktda.util.KotlinDAException
99import org.javacs.ktda.jdi.JDIDebuggee
10+ import com.sun.jdi.Bootstrap
1011import com.sun.jdi.VirtualMachineManager
1112import com.sun.jdi.connect.Connector
1213import com.sun.jdi.connect.LaunchingConnector
1314import com.sun.jdi.connect.AttachingConnector
14- import com.sun.tools.jdi.KDACommandLineLauncher
1515import java.io.File
1616import java.nio.file.Path
1717import java.nio.file.Files
@@ -23,8 +23,7 @@ class JDILauncher(
2323 private val modulePaths : String? = null
2424) : DebugLauncher {
2525 private val vmManager: VirtualMachineManager
26- // using our own manager to use KDALaunchingConnector
27- get() = KDAVirtualMachineManager .manager()
26+ get() = Bootstrap .virtualMachineManager()
2827
2928 override fun launch (config : LaunchConfiguration , context : DebugContext ): JDIDebuggee {
3029 val connector = createLaunchConnector()
@@ -55,7 +54,7 @@ class JDILauncher(
5554 args[" options" ]!! .setValue(formatOptions(config))
5655 args[" main" ]!! .setValue(formatMainClass(config))
5756 args[" cwd" ]!! .setValue(config.cwd.toAbsolutePath().toString())
58- args[" envs" ]!! .setValue(KDALaunchingConnector .urlEncode(config.envs) ? : " " )
57+ args[" envs" ]!! .setValue(KDACommandLineLauncher .urlEncode(config.envs) ? : " " )
5958 }
6059
6160 private fun createAttachArgs (config : AttachConfiguration , connector : Connector ): Map <String , Connector .Argument > = connector.defaultArguments()
@@ -71,7 +70,7 @@ class JDILauncher(
7170
7271 private fun createLaunchConnector (): LaunchingConnector = vmManager.launchingConnectors()
7372 // Using our own connector to support cwd and envs
74- .let { it.find { it.name().equals(KDALaunchingConnector ::class .java.name) } ? : it.firstOrNull() }
73+ .let { it.find { it.name().equals(KDACommandLineLauncher ::class .java.name) } ? : it.firstOrNull() }
7574 ? : throw KotlinDAException (" Could not find a launching connector (for a new debuggee VM)" )
7675
7776 private fun sourcesRootsOf (projectRoot : Path ): Set <Path > = projectRoot.resolve(" src" )
0 commit comments