From 12ba0efd191a7ec297c04f14d1646fe482104b4e Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Thu, 18 Apr 2019 21:40:02 +0300 Subject: [PATCH] Build: Use embedded configuration in kotlin-compiler-client-embeddable --- .../build.gradle.kts | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/prepare/compiler-client-embeddable/build.gradle.kts b/prepare/compiler-client-embeddable/build.gradle.kts index a2a57048652..c274a520a10 100644 --- a/prepare/compiler-client-embeddable/build.gradle.kts +++ b/prepare/compiler-client-embeddable/build.gradle.kts @@ -1,5 +1,3 @@ -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar - description = "Kotlin compiler client embeddable" plugins { @@ -7,17 +5,16 @@ plugins { kotlin("jvm") } -val jarContents by configurations.creating val testRuntimeCompilerJar by configurations.creating val testStdlibJar by configurations.creating val testScriptRuntimeJar by configurations.creating -val archives by configurations dependencies { - jarContents(project(":compiler:cli-common")) { isTransitive = false } - jarContents(project(":daemon-common")) { isTransitive = false } - jarContents(project(":daemon-common-new")) { isTransitive = false } - jarContents(projectRuntimeJar(":kotlin-daemon-client")) + embedded(project(":compiler:cli-common")) { isTransitive = false } + embedded(project(":daemon-common")) { isTransitive = false } + embedded(project(":daemon-common-new")) { isTransitive = false } + embedded(projectRuntimeJar(":kotlin-daemon-client")) + testCompile(project(":compiler:cli-common")) testCompile(project(":daemon-common")) testCompile(project(":daemon-common-new")) @@ -53,11 +50,8 @@ projectTest { publish() -noDefaultJar() - -runtimeJar(task("shadowJar")) { - from(jarContents) -} +runtimeJar() sourcesJar() + javadocJar()