From 96bcadbbba0f21608cff1bd542f50e05dbc21745 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Mon, 24 Jun 2019 17:36:56 +0300
Subject: [PATCH] Modify dependencies for 192 branch: more dependencies to full
 java plugin

Original commit: b7c12014ee4f01b418e8c9db24181455df534f4c
---
 jps/jps-plugin/build.gradle.kts | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/jps/jps-plugin/build.gradle.kts b/jps/jps-plugin/build.gradle.kts
index 9587501a2c3..b1265cd780b 100644
--- a/jps/jps-plugin/build.gradle.kts
+++ b/jps/jps-plugin/build.gradle.kts
@@ -25,17 +25,7 @@ dependencies {
             includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all", rootProject = rootProject)
         }
     }
-
-    Platform[191].orLower {
-        testCompileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") }
-        compileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") }
-    }
-    Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java")) { includeJars("jps-builders", "jps-builders-6") }
-        testCompileOnly(intellijPluginDep("java")) { includeJars("jps-builders", "jps-builders-6") }
-        testRuntimeOnly(intellijPluginDep("java"))
-    }
-
+    compileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") }
     testCompileOnly(project(":kotlin-reflect-api"))
     testCompile(project(":compiler:incremental-compilation-impl"))
     testCompile(projectTests(":compiler:tests-common"))
@@ -43,7 +33,7 @@ dependencies {
     testCompile(commonDep("junit:junit"))
     testCompile(project(":kotlin-test:kotlin-test-jvm"))
     testCompile(projectTests(":kotlin-build-common"))
-
+    testCompileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") }
     Ide.IJ {
         testCompile(intellijDep("devkit"))
     }
@@ -55,6 +45,10 @@ dependencies {
         testRuntime(project(it))
     }
 
+    Platform[192].orHigher {
+        testRuntimeOnly(intellijPluginDep("java"))
+    }
+
     testRuntime(project(":kotlin-reflect"))
     testRuntime(project(":kotlin-script-runtime"))
 }