Skip to content

Commit d5275aa

Browse files
committed
Mark packages for relocation to fix classpath interferring in main-kts
^KT-49476 fixed (cherry picked from commit 56d4724)
1 parent 63044b1 commit d5275aa

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

libraries/scripting/dependencies-maven-all/build.gradle.kts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ noDefaultJar()
4242
sourcesJar()
4343
javadocJar()
4444

45+
val mavenPackagesToRelocate = listOf(
46+
"org.eclipse",
47+
"org.codehaus"
48+
)
49+
4550
val relocatedJar by task<ShadowJar> {
4651
configurations = listOf(embedded)
4752
duplicatesStrategy = DuplicatesStrategy.INCLUDE
@@ -51,7 +56,7 @@ val relocatedJar by task<ShadowJar> {
5156
transform(ComponentsXmlResourceTransformerPatched())
5257

5358
if (kotlinBuildProperties.relocation) {
54-
packagesToRelocate.forEach {
59+
(packagesToRelocate + mavenPackagesToRelocate).forEach {
5560
relocate(it, "$kotlinEmbeddableRootPackage.$it")
5661
}
5762
}

0 commit comments

Comments
 (0)