Mark packages for relocation to fix classpath interferring in main-kts

^KT-49476 fixed (cherry picked from commit 56d4724)
JetBrains · Nov 10, 2021 · d5275aa · d5275aa
1 parent 63044b1
commit d5275aa
Showing 1 changed file with 6 additions and 1 deletion.
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")
         }
     }