From ec36f5761f2141faa0347f6f61810a97bae3375d Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Thu, 24 Aug 2017 17:11:23 +0300
Subject: [PATCH] Fix tests in the new build infrastructure

Original commit: d039d191f2b013fd024dcae56f55b48753060d37
---
 jps/jps-common/build.gradle.kts | 2 +-
 jps/jps-plugin/build.gradle.kts | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jps/jps-common/build.gradle.kts b/jps/jps-common/build.gradle.kts
index ab1719ae365..bb73a4bdde6 100644
--- a/jps/jps-common/build.gradle.kts
+++ b/jps/jps-common/build.gradle.kts
@@ -2,7 +2,7 @@
 apply { plugin("kotlin") }
 
 dependencies {
-    compile(project(":kotlin-stdlib"))
+    compile(projectDist(":kotlin-stdlib"))
     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 36043244ed9..9261fc7ebc4 100644
--- a/jps/jps-plugin/build.gradle.kts
+++ b/jps/jps-plugin/build.gradle.kts
@@ -7,9 +7,9 @@ dependencies {
     compile(project(":core"))
     compile(project(":compiler:compiler-runner"))
     compile(project(":compiler:daemon-common"))
-    compile(project(":kotlin-daemon-client"))
+    compile(projectDist(":kotlin-daemon-client"))
     compile(project(":compiler:frontend.java"))
-    compile(project(":kotlin-preloader"))
+    compile(projectDist(":kotlin-preloader"))
     compile(project(":idea:idea-jps-common"))
     compile(ideaSdkDeps("jps-builders", "jps-builders-6", subdir = "jps"))
     testCompile(project(":compiler.tests-common"))
@@ -17,7 +17,7 @@ dependencies {
     testCompile(projectTests(":compiler:incremental-compilation-impl"))
     testCompileOnly(ideaSdkDeps("jps-build-test", subdir = "jps/test"))
     testCompile(commonDep("junit:junit"))
-    testCompile(project(":kotlin-test:kotlin-test-jvm"))
+    testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
     testCompile(projectTests(":kotlin-build-common"))
     compilerModules.forEach {
         testRuntime(project(it))