From 3a13f5a7c13e53eca23f249d5db5f66939d6de6c Mon Sep 17 00:00:00 2001 From: Julian Krings Date: Thu, 4 Sep 2025 23:07:37 +0200 Subject: [PATCH] fix dependency resolve failing on new intelij versions --- core/build.gradle.kts | 2 ++ .../kotlin/runner/resolver/CompoundDependenciesResolver.kt | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index e192e784a..8a3a6b97e 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -139,6 +139,8 @@ slimJar { relocate("org.eclipse.sisu", "$lib.sisu") relocate("org.eclipse.aether", "$lib.aether") relocate("com.google.inject", "$lib.guice") + relocate("org.dom4j", "$lib.dom4j") + relocate("org.jaxen", "$lib.jaxen") } tasks { diff --git a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/CompoundDependenciesResolver.kt b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/CompoundDependenciesResolver.kt index 37098e9bb..9ed722594 100644 --- a/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/CompoundDependenciesResolver.kt +++ b/core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/CompoundDependenciesResolver.kt @@ -17,7 +17,7 @@ import kotlin.script.experimental.dependencies.RepositoryCoordinates import kotlin.script.experimental.dependencies.impl.makeResolveFailureResult class CompoundDependenciesResolver( - private val baseDir: File + baseDir: File ) : DependenciesResolver { private val resolvers = listOf(FileDependenciesResolver(baseDir), LocalMavenDependenciesResolver()) @@ -113,8 +113,6 @@ class CompoundDependenciesResolver( } override fun addPack(directory: File) { - if (!directory.normalize().absolutePath.startsWith(baseDir.normalize().absolutePath)) - return resolvers.forEach { it.addPack(directory) } } }