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:
Ilya Chernikov
2020-01-31 16:30:34 +01:00
parent 514282fb0a
commit 0761a17e2f
@@ -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")
}
}
}