From 8616864e6b8988d60f7fb30d5c3fba7c0e3541cb Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 23 Apr 2020 11:21:27 +0200 Subject: [PATCH] Revert "Drop unnecessary dependency from embeddable compiler to daemon" The commit breaks gradle plugin, because it relies on this dependency. This reverts commit 86d47b49 --- .../kotlin-jsr223-daemon-local-eval-example/build.gradle.kts | 1 - prepare/compiler-embeddable/build.gradle.kts | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts index e3318a26c8d..5b5926a1a25 100644 --- a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts +++ b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts @@ -24,7 +24,6 @@ dependencies { testCompile(project(":kotlin-test:kotlin-test-junit")) testRuntime(project(":kotlin-reflect")) compilerClasspath(project(":kotlin-compiler-embeddable")) - compilerClasspath(project(":kotlin-daemon-embeddable")) compilerClasspath(project(":kotlin-scripting-compiler-embeddable")) compilerClasspath(project(":kotlin-reflect")) compilerClasspath(kotlinStdlib()) diff --git a/prepare/compiler-embeddable/build.gradle.kts b/prepare/compiler-embeddable/build.gradle.kts index 27da55979af..986d64b7369 100644 --- a/prepare/compiler-embeddable/build.gradle.kts +++ b/prepare/compiler-embeddable/build.gradle.kts @@ -11,6 +11,7 @@ dependencies { runtime(kotlinStdlib()) runtime(project(":kotlin-script-runtime")) runtime(project(":kotlin-reflect")) + runtime(project(":kotlin-daemon-embeddable")) runtime(commonDep("org.jetbrains.intellij.deps", "trove4j")) testCompile(commonDep("junit:junit")) testCompile(project(":kotlin-test:kotlin-test-junit"))