From 5d8c2ae429a91e35073473539d7d24b516856236 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 17 May 2019 15:37:32 +0200 Subject: [PATCH] Fix dependencies to compiler in scripting modules --- libraries/scripting/jsr223-embeddable/build.gradle.kts | 2 +- libraries/scripting/jsr223/build.gradle.kts | 3 +-- libraries/scripting/jvm-host-embeddable/build.gradle.kts | 2 +- libraries/scripting/jvm-host/build.gradle.kts | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libraries/scripting/jsr223-embeddable/build.gradle.kts b/libraries/scripting/jsr223-embeddable/build.gradle.kts index 6423df8b419..bace163153e 100644 --- a/libraries/scripting/jsr223-embeddable/build.gradle.kts +++ b/libraries/scripting/jsr223-embeddable/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { runtime(kotlinStdlib()) runtime(project(":kotlin-scripting-common")) runtime(project(":kotlin-scripting-jvm")) - runtime(projectRuntimeJar(":kotlin-compiler-embeddable")) + runtime(project(":kotlin-compiler-embeddable")) runtime(project(":kotlin-scripting-compiler-embeddable")) } diff --git a/libraries/scripting/jsr223/build.gradle.kts b/libraries/scripting/jsr223/build.gradle.kts index 4fee01003a4..dbca5b1b1da 100644 --- a/libraries/scripting/jsr223/build.gradle.kts +++ b/libraries/scripting/jsr223/build.gradle.kts @@ -12,11 +12,10 @@ dependencies { compile(project(":kotlin-scripting-jvm")) compile(project(":kotlin-scripting-jvm-host")) compile(project(":kotlin-scripting-compiler")) - compile(project(":kotlin-scripting-compiler-impl")) compileOnly(project(":compiler:cli")) compileOnly(project(":kotlin-reflect-api")) compileOnly(intellijCoreDep()) - runtime(projectRuntimeJar(":kotlin-compiler")) + runtime(project(":kotlin-compiler")) runtime(project(":kotlin-reflect")) testCompile(commonDep("junit")) } diff --git a/libraries/scripting/jvm-host-embeddable/build.gradle.kts b/libraries/scripting/jvm-host-embeddable/build.gradle.kts index 2688992f403..d420195bae8 100644 --- a/libraries/scripting/jvm-host-embeddable/build.gradle.kts +++ b/libraries/scripting/jvm-host-embeddable/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { runtime(kotlinStdlib()) runtime(project(":kotlin-scripting-common")) runtime(project(":kotlin-scripting-jvm")) - runtime(projectRuntimeJar(":kotlin-compiler-embeddable")) + runtime(project(":kotlin-compiler-embeddable")) runtime(project(":kotlin-scripting-compiler-embeddable")) } diff --git a/libraries/scripting/jvm-host/build.gradle.kts b/libraries/scripting/jvm-host/build.gradle.kts index ee8d4344edc..daf3af59547 100644 --- a/libraries/scripting/jvm-host/build.gradle.kts +++ b/libraries/scripting/jvm-host/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { compileOnly(project(":compiler:cli")) compileOnly(project(":kotlin-reflect-api")) compileOnly(intellijCoreDep()) - runtime(projectRuntimeJar(":kotlin-compiler")) + runtime(project(":kotlin-compiler")) runtime(project(":kotlin-scripting-compiler")) runtime(project(":kotlin-reflect")) runtime(commonDep("org.jetbrains.intellij.deps", "trove4j"))