diff --git a/libraries/tools/kotlin-main-kts-test/build.gradle.kts b/libraries/tools/kotlin-main-kts-test/build.gradle.kts index 2d21b4636b0..b9e558b4ad2 100644 --- a/libraries/tools/kotlin-main-kts-test/build.gradle.kts +++ b/libraries/tools/kotlin-main-kts-test/build.gradle.kts @@ -7,8 +7,8 @@ plugins { } dependencies { - testCompile(project(":kotlin-main-kts")) - testCompile(project(":kotlin-scripting-jvm-host")) + testCompile(projectRuntimeJar(":kotlin-main-kts")) // runtimeJar needed to for proper dependency on the jar with relocations + testCompile(project(":kotlin-scripting-jvm-host-embeddable")) testCompile(commonDep("junit")) compileOnly("org.apache.ivy:ivy:2.4.0") // for jps/pill } diff --git a/libraries/tools/kotlin-main-kts/build.gradle.kts b/libraries/tools/kotlin-main-kts/build.gradle.kts index 09c1fd3b4e2..4c6067d8f15 100644 --- a/libraries/tools/kotlin-main-kts/build.gradle.kts +++ b/libraries/tools/kotlin-main-kts/build.gradle.kts @@ -1,5 +1,4 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -import org.gradle.api.internal.artifacts.publish.ArchivePublishArtifact import proguard.gradle.ProGuardTask description = "Kotlin \"main\" script definition" @@ -59,6 +58,9 @@ publish() noDefaultJar() +val mainKtsRootPackage = "org.jetbrains.kotlin.mainKts" +val mainKtsRelocatedDepsRootPackage = "$mainKtsRootPackage.relocatedDeps" + val packJar by task { configurations = listOf(fatJar) duplicatesStrategy = DuplicatesStrategy.EXCLUDE @@ -68,6 +70,10 @@ val packJar by task { from(mainSourceSet.output) from(fatJarContents) + + packagesToRelocate.forEach { + relocate(it, "$mainKtsRelocatedDepsRootPackage.$it") + } } val proguard by task {