From 53e90b6d407bf0be6b7e8e863cfaeb3d3b173b49 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Fri, 10 Nov 2017 14:11:12 +0100
Subject: [PATCH] Replace dependencies on kotlin-reflect with
 kotlin-reflect-api

See the previous commit for information on the kotlin-reflect vs
kotlin-reflect-api distinction.

Add kotlin-reflect as an explicit runtime dependency of most of the test
configurations because even though they all depend on tests-common, the
runtime dependency on kotlin-reflect is not exported from tests-common
to other modules because the projectTests dependency is not transitive.

Original commit: aca74cef0e6d9244722227bccd6ce20cab18bad4
---
 jps/jps-common/build.gradle.kts | 1 +
 jps/jps-plugin/build.gradle.kts | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/jps/jps-common/build.gradle.kts b/jps/jps-common/build.gradle.kts
index bb73a4bdde6..439d7e17ff3 100644
--- a/jps/jps-common/build.gradle.kts
+++ b/jps/jps-common/build.gradle.kts
@@ -3,6 +3,7 @@ apply { plugin("kotlin") }
 
 dependencies {
     compile(projectDist(":kotlin-stdlib"))
+    compileOnly(project(":kotlin-reflect-api"))
     compile(project(":compiler:util"))
     compile(project(":compiler:cli-common"))
     compile(project(":compiler:frontend.java"))
diff --git a/jps/jps-plugin/build.gradle.kts b/jps/jps-plugin/build.gradle.kts
index 39c5940de3e..f93fb866aa3 100644
--- a/jps/jps-plugin/build.gradle.kts
+++ b/jps/jps-plugin/build.gradle.kts
@@ -13,6 +13,7 @@ dependencies {
     compile(projectRuntimeJar(":kotlin-preloader"))
     compile(project(":idea:idea-jps-common"))
     compile(ideaSdkDeps("jps-builders", "jps-builders-6", subdir = "jps"))
+    testCompileOnly(project(":kotlin-reflect-api"))
     testCompile(project(":compiler:incremental-compilation-impl"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(projectTests(":compiler:incremental-compilation-impl"))
@@ -24,6 +25,7 @@ dependencies {
     compilerModules.forEach {
         testRuntime(project(it))
     }
+    testRuntime(projectDist(":kotlin-reflect"))
     testRuntime(ideaSdkCoreDeps("*.jar"))
     testRuntime(ideaSdkDeps("*.jar"))
     testRuntime(ideaSdkDeps("*.jar", subdir = "jps/test"))