From 8a8de052a30b12b8649861eabf9bc80ce64fcab0 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Sun, 3 Mar 2019 12:22:03 +0100 Subject: [PATCH] Fix JSR-223 and scripting samples dependencies --- .../build.gradle.kts | 4 ++-- .../examples/kotlin-jsr223-local-example/build.gradle.kts | 6 +++--- .../examples/scripting/jvm-embeddable-host/build.gradle.kts | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) 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 68786f670c6..961e43ccee6 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 @@ -22,8 +22,8 @@ dependencies { testCompile(commonDep("junit:junit")) testCompile(project(":kotlin-test:kotlin-test-junit")) testRuntime(project(":kotlin-reflect")) - compilerClasspath(projectRuntimeJar(":kotlin-compiler-embeddable")) - compilerClasspath(projectRuntimeJar(":kotlin-scripting-compiler-embeddable")) + compilerClasspath(project(":kotlin-compiler-embeddable")) + compilerClasspath(project(":kotlin-scripting-compiler-embeddable")) compilerClasspath(project(":kotlin-reflect")) compilerClasspath(kotlinStdlib()) compilerClasspath(project(":kotlin-script-runtime")) diff --git a/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts b/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts index 8cc1be3dd8f..9648adc3f9a 100644 --- a/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts +++ b/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts @@ -14,16 +14,16 @@ pill { dependencies { compile(kotlinStdlib()) compile(project(":kotlin-script-runtime")) - compile(projectRuntimeJar(":kotlin-compiler-embeddable")) + compile(project(":kotlin-compiler-embeddable")) compile(project(":kotlin-script-util")) - runtime(projectRuntimeJar(":kotlin-scripting-compiler-embeddable")) + runtime(project(":kotlin-scripting-compiler-embeddable")) testCompile(project(":kotlin-test:kotlin-test-junit")) testCompile(commonDep("junit:junit")) testRuntime(project(":kotlin-reflect")) compileOnly(project(":compiler:cli-common")) // TODO: fix import (workaround for jps build) testCompileOnly(project(":core:util.runtime")) // TODO: fix import (workaround for jps build) testCompileOnly(project(":compiler:daemon-common")) // TODO: fix import (workaround for jps build) - testRuntime(projectRuntimeJar(":kotlin-scripting-compiler-embeddable")) + testRuntime(project(":kotlin-scripting-compiler-embeddable")) } projectTest() diff --git a/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts b/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts index 67de83f4017..0c4220b3ef3 100644 --- a/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts +++ b/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts @@ -7,8 +7,8 @@ dependencies { compile(project(":examples:scripting-jvm-simple-script")) compileOnly(project(":kotlin-scripting-jvm-host")) compile(project(":kotlin-script-util")) - testRuntimeOnly(projectRuntimeJar(":kotlin-compiler-embeddable")) - testRuntimeOnly(projectRuntimeJar(":kotlin-scripting-compiler-embeddable")) + testRuntimeOnly(project(":kotlin-compiler-embeddable")) + testRuntimeOnly(project(":kotlin-scripting-compiler-embeddable")) testRuntimeOnly(project(":kotlin-scripting-jvm-host-embeddable")) testRuntimeOnly(project(":kotlin-reflect")) testRuntimeOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }