Merge KT-MR-4942: Mark packages for relocation to fix classpath inter…

…ferring in main-kts
JetBrains · Nov 11, 2021 · 99b69ae · 99b69ae
2 parents 0d1f362 + 583488e
commit 99b69ae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/libraries/scripting/dependencies-maven-all/build.gradle.kts b/libraries/scripting/dependencies-maven-all/build.gradle.kts
@@ -42,6 +42,11 @@ noDefaultJar()
 sourcesJar()
 javadocJar()
 
+val mavenPackagesToRelocate = listOf(
+    "org.eclipse",
+    "org.codehaus"
+)
+
 val relocatedJar by task<ShadowJar> {
     configurations = listOf(embedded)
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
@@ -51,7 +56,7 @@ val relocatedJar by task<ShadowJar> {
     transform(ComponentsXmlResourceTransformerPatched())
 
     if (kotlinBuildProperties.relocation) {
-        packagesToRelocate.forEach {
+        (packagesToRelocate + mavenPackagesToRelocate).forEach {
             relocate(it, "$kotlinEmbeddableRootPackage.$it")
         }
     }

diff --git a/...pting/dependencies-maven/src/kotlin/script/experimental/dependencies/maven/impl/aether.kt b/...pting/dependencies-maven/src/kotlin/script/experimental/dependencies/maven/impl/aether.kt
@@ -245,7 +245,7 @@ internal class AetherResolveSession(
     ): Settings {
         var main = result.effectiveSettings
         val files = File(System.getProperty("user.dir"))
-            .parentFile.listFiles(
+            .parentFile?.listFiles(
                 NameFileFilter("interpolated-settings.xml") as FileFilter
             )
         val settingsFile = files?.singleOrNull()