From 0761a17e2fbcc46e2641fc580411a22f21a38d1d Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Fri, 31 Jan 2020 16:30:34 +0100
Subject: [PATCH] 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.
---
 libraries/tools/kotlin-main-kts/build.gradle.kts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libraries/tools/kotlin-main-kts/build.gradle.kts b/libraries/tools/kotlin-main-kts/build.gradle.kts
index b39372208ee..4d1a140afa6 100644
--- a/libraries/tools/kotlin-main-kts/build.gradle.kts
+++ b/libraries/tools/kotlin-main-kts/build.gradle.kts
@@ -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")
         }
     }
 }