From ceb243c096345a29c054d36b5aef72f837f96b2f Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 22 Feb 2018 08:10:38 +0300 Subject: [PATCH] Don't pack kotlin-daemon-client and daemon-common into kotlin-compiler-runner jar --- compiler/compiler-runner/build.gradle.kts | 4 ---- idea/build.gradle.kts | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/compiler/compiler-runner/build.gradle.kts b/compiler/compiler-runner/build.gradle.kts index b7956db0e6a..b71e2016fbc 100644 --- a/compiler/compiler-runner/build.gradle.kts +++ b/compiler/compiler-runner/build.gradle.kts @@ -26,10 +26,6 @@ sourceSets { } val jar: Jar by tasks -jar.apply { - from(getSourceSetsFrom(":kotlin-daemon-client")["main"].output.classesDirs) - from(getSourceSetsFrom(":compiler:daemon-common")["main"].output.classesDirs) -} runtimeJar(rewriteDepsToShadedCompiler(jar)) sourcesJar() diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index ffdc7964ea7..ca6b1dcae31 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -21,6 +21,7 @@ dependencies { compile(project(":compiler:util")) compile(project(":kotlin-build-common")) compile(project(":compiler:daemon-common")) + compile(projectRuntimeJar(":kotlin-daemon-client")) compile(project(":kotlin-compiler-runner")) { isTransitive = false } compile(project(":compiler:plugin-api")) compile(project(":eval4j"))