From 1dea01a479ef22f0d0ee4f1b30b20b381591eabd Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Mon, 2 Jul 2018 21:50:36 +0300
Subject: [PATCH] Build: remove testRuntime dependency on
 ":kotlin-compiler:dist"

---
 jps-plugin/build.gradle.kts      | 4 +++-
 jps-plugin/build.gradle.kts.173  | 4 +++-
 jps-plugin/build.gradle.kts.as31 | 4 +++-
 jps-plugin/build.gradle.kts.as32 | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/jps-plugin/build.gradle.kts b/jps-plugin/build.gradle.kts
index 0a980219458..dc9cb5f05e7 100644
--- a/jps-plugin/build.gradle.kts
+++ b/jps-plugin/build.gradle.kts
@@ -35,7 +35,6 @@ dependencies {
     }
     testRuntime(intellijDep())
     testRuntime(projectDist(":kotlin-reflect"))
-    testRuntime(projectDist(":kotlin-compiler"))
     testRuntime(projectDist(":kotlin-script-runtime"))
 }
 
@@ -47,6 +46,9 @@ sourceSets {
 }
 
 projectTest {
+    // do not replace with compile/runtime dependency,
+    // because it forces Intellij reindexing after each compiler change
+    dependsOn(":kotlin-compiler:dist")
     workingDir = rootDir
 }
 
diff --git a/jps-plugin/build.gradle.kts.173 b/jps-plugin/build.gradle.kts.173
index 24a8a334bdf..334e963c60f 100644
--- a/jps-plugin/build.gradle.kts.173
+++ b/jps-plugin/build.gradle.kts.173
@@ -35,7 +35,6 @@ dependencies {
     }
     testRuntime(intellijDep())
     testRuntime(projectDist(":kotlin-reflect"))
-    testRuntime(projectDist(":kotlin-compiler"))
     testRuntime(projectDist(":kotlin-script-runtime"))
 }
 
@@ -47,6 +46,9 @@ sourceSets {
 }
 
 projectTest {
+    // do not replace with compile/runtime dependency,
+    // because it forces Intellij reindexing after each compiler change
+    dependsOn(":kotlin-compiler:dist")
     workingDir = rootDir
 }
 
diff --git a/jps-plugin/build.gradle.kts.as31 b/jps-plugin/build.gradle.kts.as31
index afe03026d0a..825ced1cb2d 100644
--- a/jps-plugin/build.gradle.kts.as31
+++ b/jps-plugin/build.gradle.kts.as31
@@ -34,7 +34,6 @@ dependencies {
     }
     testRuntime(intellijDep())
     testRuntime(projectDist(":kotlin-reflect"))
-    testRuntime(projectDist(":kotlin-compiler"))
     testRuntime(projectDist(":kotlin-script-runtime"))
 }
 
@@ -46,6 +45,9 @@ sourceSets {
 }
 
 projectTest {
+    // do not replace with compile/runtime dependency,
+    // because it forces Intellij reindexing after each compiler change
+    dependsOn(":kotlin-compiler:dist")
     workingDir = rootDir
 }
 
diff --git a/jps-plugin/build.gradle.kts.as32 b/jps-plugin/build.gradle.kts.as32
index 98ba37d321a..905e952bbbc 100644
--- a/jps-plugin/build.gradle.kts.as32
+++ b/jps-plugin/build.gradle.kts.as32
@@ -34,7 +34,6 @@ dependencies {
     }
     testRuntime(intellijDep())
     testRuntime(projectDist(":kotlin-reflect"))
-    testRuntime(projectDist(":kotlin-compiler"))
     testRuntime(projectDist(":kotlin-script-runtime"))
 }
 
@@ -46,6 +45,9 @@ sourceSets {
 }
 
 projectTest {
+    // do not replace with compile/runtime dependency,
+    // because it forces Intellij reindexing after each compiler change
+    dependsOn(":kotlin-compiler:dist")
     workingDir = rootDir
 }