Skip to content

Commit 99b69ae

Browse files
mshishkinaSpace
authored and
Space
committed
Merge KT-MR-4942: Mark packages for relocation to fix classpath interferring in main-kts
2 parents 0d1f362 + 583488e commit 99b69ae

File tree

2 files changed

+7
-2
lines changed
  • libraries/scripting

2 files changed

+7
-2
lines changed

Diff for: libraries/scripting/dependencies-maven-all/build.gradle.kts

+6-1
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
}

Diff for: libraries/scripting/dependencies-maven/src/kotlin/script/experimental/dependencies/maven/impl/aether.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ internal class AetherResolveSession(
245245
): Settings {
246246
var main = result.effectiveSettings
247247
val files = File(System.getProperty("user.dir"))
248-
.parentFile.listFiles(
248+
.parentFile?.listFiles(
249249
NameFileFilter("interpolated-settings.xml") as FileFilter
250250
)
251251
val settingsFile = files?.singleOrNull()

0 commit comments

Comments
 (0)