use runtimeClasspath during classpath resolution

fwcd#92
maksimr · Oct 30, 2024 · 15aebbc · 15aebbc
1 parent 7f05669
commit 15aebbc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/adapter/build.gradle.kts b/adapter/build.gradle.kts
@@ -23,7 +23,11 @@ dependencies {
 	implementation("org.eclipse.lsp4j:org.eclipse.lsp4j.debug:0.15.0")
 	implementation("org.jetbrains.kotlin:kotlin-stdlib")
 	implementation("org.jetbrains.kotlin:kotlin-reflect")
-	implementation("kotlin-language-server:shared")
+    implementation("kotlin-language-server:shared") {
+        version {
+            branch = "main"
+        }
+    }
 
     // modules temporarily needed because of shared module import above
     implementation("org.jetbrains.exposed:exposed-core:0.37.3")

diff --git a/adapter/src/main/kotlin/org/javacs/ktda/classpath/DebugClassPathResolver.kt b/adapter/src/main/kotlin/org/javacs/ktda/classpath/DebugClassPathResolver.kt
@@ -2,9 +2,12 @@ package org.javacs.ktda.classpath
 
 import org.javacs.kt.classpath.ClassPathResolver
 import org.javacs.kt.classpath.defaultClassPathResolver
+import org.javacs.kt.classpath.ResolverOptions
 import org.javacs.kt.classpath.plus
 import org.javacs.kt.classpath.joined
 import java.nio.file.Path
 
+val options = ResolverOptions(useCompileClasspath = false)
+
 fun debugClassPathResolver(workspaceRoots: Collection<Path>): ClassPathResolver =
-	defaultClassPathResolver(workspaceRoots) + workspaceRoots.map { ProjectClassesResolver(it) }.joined
+	defaultClassPathResolver(workspaceRoots, resolverOptions = options) + workspaceRoots.map { ProjectClassesResolver(it) }.joined
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -15,7 +15,7 @@ pluginManagement {
 }
 
 sourceControl {
-    gitRepository(java.net.URI.create("https://github.com/fwcd/kotlin-language-server.git")) {
+    gitRepository(java.net.URI.create("https://github.com/maksimr/kotlin-language-server.git")) {
         producesModule("kotlin-language-server:shared")
     }
 }