From ef48c38eb48c6ee2f8b6617864f60297fb01cfa6 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Sat, 13 Jun 2020 11:07:39 +0300 Subject: [PATCH] Build: Fix kotlin.kotlin-scripting-jsr223-tes test runtime --- libraries/scripting/jsr223-test/build.gradle.kts | 5 +++-- prepare/compiler-client-embeddable/build.gradle.kts | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/scripting/jsr223-test/build.gradle.kts b/libraries/scripting/jsr223-test/build.gradle.kts index f76c059c928..09eac696732 100644 --- a/libraries/scripting/jsr223-test/build.gradle.kts +++ b/libraries/scripting/jsr223-test/build.gradle.kts @@ -21,9 +21,10 @@ dependencies { testRuntimeOnly(project(":kotlin-scripting-jsr223-unshaded")) testRuntimeOnly(project(":kotlin-compiler")) testRuntimeOnly(project(":kotlin-reflect")) - + embeddableTestRuntime(commonDep("junit")) - embeddableTestRuntime(project(":kotlin-scripting-jsr223")) + embeddableTestRuntime(project(":kotlin-scripting-jsr223", configuration = "runtimeElements")) + embeddableTestRuntime(project(":kotlin-scripting-compiler-embeddable", configuration = "runtimeElements")) embeddableTestRuntime(testSourceSet.output) } diff --git a/prepare/compiler-client-embeddable/build.gradle.kts b/prepare/compiler-client-embeddable/build.gradle.kts index babcff99610..294f1159fb7 100644 --- a/prepare/compiler-client-embeddable/build.gradle.kts +++ b/prepare/compiler-client-embeddable/build.gradle.kts @@ -27,6 +27,7 @@ dependencies { testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(project(":kotlin-test:kotlin-test-junit")) testCompilerClasspath(project(":kotlin-compiler")) + testCompilerClasspath(commonDep("org.jetbrains.intellij.deps", "trove4j")) testCompilerClasspath(project(":kotlin-scripting-compiler")) testCompilerClasspath(project(":kotlin-daemon")) testCompilationClasspath(kotlinStdlib())