Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-19 15:09:18 +00:00
Code Issues Releases Activity

fix dependency resolve failing on new intelij versions

Browse Source
This commit is contained in:
Julian Krings
2025-09-04 23:07:37 +02:00
parent e5654b74d4
commit 3a13f5a7c1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/build.gradle.kts
View File

@@ -139,6 +139,8 @@ slimJar {
relocate("org.eclipse.sisu", "$lib.sisu") relocate("org.eclipse.sisu", "$lib.sisu")
relocate("org.eclipse.aether", "$lib.aether") relocate("org.eclipse.aether", "$lib.aether")
relocate("com.google.inject", "$lib.guice") relocate("com.google.inject", "$lib.guice")
relocate("org.dom4j", "$lib.dom4j")
relocate("org.jaxen", "$lib.jaxen")
} }
tasks { tasks {

4
core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/resolver/CompoundDependenciesResolver.kt
View File

@@ -17,7 +17,7 @@ import kotlin.script.experimental.dependencies.RepositoryCoordinates
import kotlin.script.experimental.dependencies.impl.makeResolveFailureResult import kotlin.script.experimental.dependencies.impl.makeResolveFailureResult
class CompoundDependenciesResolver( class CompoundDependenciesResolver(
private val baseDir: File baseDir: File
) : DependenciesResolver { ) : DependenciesResolver {
private val resolvers = listOf(FileDependenciesResolver(baseDir), LocalMavenDependenciesResolver()) private val resolvers = listOf(FileDependenciesResolver(baseDir), LocalMavenDependenciesResolver())
@@ -113,8 +113,6 @@ class CompoundDependenciesResolver(
} }
override fun addPack(directory: File) { override fun addPack(directory: File) {
if (!directory.normalize().absolutePath.startsWith(baseDir.normalize().absolutePath))
return
resolvers.forEach { it.addPack(directory) } resolvers.forEach { it.addPack(directory) }
} }
} }