Fix embedding and relocation in main-kts
The relocation root different from the one in embeddable compiler lead to "linking" errors for classes included in both jars, e.g. Disposable. Reuse common root to avoid it.
This commit is contained in:
@@ -48,9 +48,6 @@ publish()
|
||||
|
||||
noDefaultJar()
|
||||
|
||||
val mainKtsRootPackage = "org.jetbrains.kotlin.mainKts"
|
||||
val mainKtsRelocatedDepsRootPackage = "$mainKtsRootPackage.relocatedDeps"
|
||||
|
||||
val packJar by task<ShadowJar> {
|
||||
configurations = emptyList()
|
||||
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
@@ -65,7 +62,7 @@ val packJar by task<ShadowJar> {
|
||||
|
||||
if (kotlinBuildProperties.relocation) {
|
||||
packagesToRelocate.forEach {
|
||||
relocate(it, "$mainKtsRelocatedDepsRootPackage.$it")
|
||||
relocate(it, "$kotlinEmbeddableRootPackage.$it")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user