From 70067bc9bfee9f5b8b4342cf112874ac393470ee Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Thu, 26 Dec 2019 17:06:21 +0300
Subject: [PATCH] Better fix for compiler plugin test initialization

The previous one didn't work in 191.
Also revert changes in tests-common module.
---
 compiler/tests-common/build.gradle.kts       | 1 -
 plugins/allopen/allopen-cli/build.gradle.kts | 6 ++----
 plugins/noarg/noarg-cli/build.gradle.kts     | 2 ++
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts
index 27cb636ec44..669f5bde6cb 100644
--- a/compiler/tests-common/build.gradle.kts
+++ b/compiler/tests-common/build.gradle.kts
@@ -67,7 +67,6 @@ dependencies {
 
     Platform[192].orHigher {
         testCompile(intellijDep()) { includeJars("platform-util-ui", "platform-concurrency", "platform-objectSerializer") }
-        testCompile(intellijDep("java"))
     }
 
     Platform[193].orHigher {
diff --git a/plugins/allopen/allopen-cli/build.gradle.kts b/plugins/allopen/allopen-cli/build.gradle.kts
index c93381e1cea..740183fe6b0 100644
--- a/plugins/allopen/allopen-cli/build.gradle.kts
+++ b/plugins/allopen/allopen-cli/build.gradle.kts
@@ -13,14 +13,12 @@ dependencies {
 
     runtime(kotlinStdlib())
 
-    Platform[192].orHigher {
-        testRuntimeOnly(intellijDep()) { includeJars("platform-concurrency") }
-    }
-
     testCompile(project(":compiler:backend"))
     testCompile(project(":compiler:cli"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(commonDep("junit:junit"))
+
+    testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }
 
 sourceSets {
diff --git a/plugins/noarg/noarg-cli/build.gradle.kts b/plugins/noarg/noarg-cli/build.gradle.kts
index b8e8c3e8456..9a726bc7971 100644
--- a/plugins/noarg/noarg-cli/build.gradle.kts
+++ b/plugins/noarg/noarg-cli/build.gradle.kts
@@ -20,6 +20,8 @@ dependencies {
     testCompile(project(":compiler:cli"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(commonDep("junit:junit"))
+
+    testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }
 
 sourceSets {