From db7e06aaa4aaeb5d8ad2c3a4a890e83d03b12138 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 5 Feb 2018 15:34:13 +0100 Subject: [PATCH] Make dependencies to the script-runtime directly to the project... instead to vie projectDist. With the current project bootstrap scheme a dependency to the simply built script-runtime project via dist is not needed anymore, but it breaks proper sources navigation in IDEA. --- compiler/frontend/build.gradle.kts | 2 +- libraries/examples/kotlin-jsr223-local-example/build.gradle.kts | 2 +- ultimate/build.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/frontend/build.gradle.kts b/compiler/frontend/build.gradle.kts index 514053b3781..0231d3fc796 100644 --- a/compiler/frontend/build.gradle.kts +++ b/compiler/frontend/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { compile(project(":compiler:util")) compile(project(":compiler:container")) compile(project(":compiler:resolution")) - compile(projectDist(":kotlin-script-runtime")) + compile(project(":kotlin-script-runtime")) compile(commonDep("io.javaslang","javaslang")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("annotations", "trove4j", "guava", rootProject = rootProject) } diff --git a/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts b/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts index eaeced4dedd..9a78d93e04d 100644 --- a/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts +++ b/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts @@ -5,7 +5,7 @@ apply { plugin("kotlin") } dependencies { compile(projectDist(":kotlin-stdlib")) - compile(projectDist(":kotlin-script-runtime")) + compile(project(":kotlin-script-runtime")) compile(projectRuntimeJar(":kotlin-compiler-embeddable")) compile(project(":kotlin-script-util")) testCompile(projectDist(":kotlin-test:kotlin-test-junit")) diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts index 97850f589bc..8889d015b7b 100644 --- a/ultimate/build.gradle.kts +++ b/ultimate/build.gradle.kts @@ -70,7 +70,7 @@ dependencies { testCompile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } testRuntime(projectDist(":kotlin-reflect")) - testRuntime(projectDist(":kotlin-script-runtime")) + testRuntime(project(":kotlin-script-runtime")) testRuntime(projectRuntimeJar(":kotlin-compiler")) testRuntime(project(":plugins:android-extensions-ide")) { isTransitive = false } testRuntime(project(":plugins:android-extensions-compiler")) { isTransitive = false }