From 539e0f49611395e90f269a910421013dee326ac5 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Fri, 31 Aug 2018 13:32:35 +0200
Subject: [PATCH] [minor] switch to project dependencies in scripting projects

---
 .../examples/scripting/jvm-maven-deps/host/build.gradle.kts  | 5 +++--
 .../scripting/jvm-simple-script/host/build.gradle.kts        | 1 +
 libraries/scripting/common/build.gradle.kts                  | 5 +++--
 libraries/scripting/jvm-host/build.gradle.kts                | 2 +-
 libraries/scripting/jvm/build.gradle.kts                     | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts b/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts
index c081aa711bd..d00829803e3 100644
--- a/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts
+++ b/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts
@@ -7,9 +7,10 @@ plugins {
 dependencies {
     compile(project(":examples:scripting-jvm-maven-deps"))
     compile(project(":kotlin-scripting-jvm-host"))
-    compile(projectDist(":kotlin-stdlib"))
-    compile(projectDist(":kotlin-reflect"))
+    compile(project(":kotlin-stdlib"))
+    compileOnly(project(":kotlin-reflect-api"))
     compileOnly(project(":compiler:util"))
+    runtime(project(":kotlin-reflect"))
 
     testRuntimeOnly(projectRuntimeJar(":kotlin-compiler"))
     testCompile(commonDep("junit"))
diff --git a/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts b/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts
index 892f5e723a7..312a8db593b 100644
--- a/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts
+++ b/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts
@@ -9,6 +9,7 @@ dependencies {
     compile(project(":kotlin-scripting-jvm-host"))
     compile(project(":kotlin-script-util"))
     testRuntimeOnly(projectRuntimeJar(":kotlin-compiler"))
+    testRuntimeOnly(project(":kotlin-reflect"))
     testCompile(commonDep("junit"))
 }
 
diff --git a/libraries/scripting/common/build.gradle.kts b/libraries/scripting/common/build.gradle.kts
index b01c802ecc9..6c275ceabfb 100644
--- a/libraries/scripting/common/build.gradle.kts
+++ b/libraries/scripting/common/build.gradle.kts
@@ -8,9 +8,10 @@ plugins {
 jvmTarget = "1.6"
 
 dependencies {
-    compile(projectDist(":kotlin-stdlib"))
-    compile(projectDist(":kotlin-reflect"))
+    compile(project(":kotlin-stdlib"))
+    compileOnly(project(":kotlin-reflect-api"))
     compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
+    runtime(project(":kotlin-reflect"))
 }
 
 sourceSets {
diff --git a/libraries/scripting/jvm-host/build.gradle.kts b/libraries/scripting/jvm-host/build.gradle.kts
index f8478f2cfe8..4bcffa575de 100644
--- a/libraries/scripting/jvm-host/build.gradle.kts
+++ b/libraries/scripting/jvm-host/build.gradle.kts
@@ -10,7 +10,7 @@ jvmTarget = "1.6"
 
 dependencies {
     compile(project(":kotlin-script-runtime"))
-    compile(projectDist(":kotlin-stdlib"))
+    compile(project(":kotlin-stdlib"))
     compile(project(":kotlin-scripting-common"))
     compile(project(":kotlin-scripting-jvm"))
     compile(project(":kotlin-script-util"))
diff --git a/libraries/scripting/jvm/build.gradle.kts b/libraries/scripting/jvm/build.gradle.kts
index bf03eb080a5..f9eafe945d2 100644
--- a/libraries/scripting/jvm/build.gradle.kts
+++ b/libraries/scripting/jvm/build.gradle.kts
@@ -9,7 +9,7 @@ jvmTarget = "1.6"
 
 dependencies {
     compile(project(":kotlin-script-runtime"))
-    compile(projectDist(":kotlin-stdlib"))
+    compile(project(":kotlin-stdlib"))
     compile(project(":kotlin-scripting-common"))
     compile(project(":kotlin-script-util"))
 }