Skip to content

Commit a2bd2ee

Browse files
committed
fix: more modulepath issues with gvm
Signed-off-by: Sam Gammon <sam@elide.ventures>
1 parent d50011e commit a2bd2ee

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

packages/graalvm/build.gradle.kts

+6-7
Original file line numberDiff line numberDiff line change
@@ -252,13 +252,12 @@ dependencies {
252252
implementation(libs.capnproto.runtime)
253253
implementation(libs.capnproto.runtime.rpc)
254254

255-
api(libs.graalvm.polyglot)
256-
api(libs.graalvm.polyglot.tools.coverage)
257-
api(libs.graalvm.polyglot.tools.dap)
258-
api(libs.graalvm.polyglot.tools.inspect)
259-
api(libs.graalvm.polyglot.tools.insight)
260-
api(libs.graalvm.polyglot.tools.heap)
261-
api(libs.graalvm.polyglot.tools.profiler)
255+
api("org.graalvm.polyglot:polyglot:${libs.versions.graalvm.pin.get()}") {
256+
exclude(group = "org.graalvm.sdk", module = "collections")
257+
exclude(group = "org.graalvm.sdk", module = "nativeimage")
258+
exclude(group = "org.graalvm.sdk", module = "word")
259+
}
260+
262261
api(libs.graalvm.regex)
263262
api(libs.graalvm.polyglot.js)
264263
compileOnly(libs.graalvm.svm)

tools/elide-build/src/main/kotlin/elide/internal/conventions/dependencies/DependencyResolutionConventions.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ package elide.internal.conventions.dependencies
1515

1616
import org.gradle.api.Project
1717
import org.gradle.api.artifacts.dsl.LockMode
18+
import org.gradle.kotlin.dsl.exclude
1819
import elide.internal.conventions.Constants.Versions
1920
import elide.internal.conventions.ElideBuildExtension
2021

@@ -141,11 +142,10 @@ internal fun Project.configureDependencyResolution(conventions: ElideBuildExtens
141142

142143
if (gvmConfigurations.contains(this@all.name) && isGraalVm) {
143144
gvmDistModules.forEach {
144-
this@all.exclude(
145-
mapOf(
146-
"group" to it.substringBefore(":"),
147-
"module" to it.substringAfter(":")
148-
))
145+
exclude(
146+
group = it.substringBefore(':'),
147+
module = it.substringAfter(':'),
148+
)
149149
}
150150
}
151151
}

0 commit comments

Comments
 (0)