From a870208a3bcf7cb0bec587a4adeefb4a1c95cda6 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Fri, 8 Dec 2017 23:19:21 +0100
Subject: [PATCH] Convert the rest of the project to intellij repo prepared in
 buildSrc

Original commit: 7e21573cf488886baa5b8908c65b9cae0ab49182
---
 jps/jps-common/build.gradle.kts | 13 ++-----------
 jps/jps-plugin/build.gradle.kts | 23 +++++++----------------
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/jps/jps-common/build.gradle.kts b/jps/jps-common/build.gradle.kts
index 94e4234f599..11220234466 100644
--- a/jps/jps-common/build.gradle.kts
+++ b/jps/jps-common/build.gradle.kts
@@ -1,23 +1,14 @@
 
 apply { plugin("kotlin") }
 
-configureIntellijPlugin {
-    setExtraDependencies("intellij-core")
-}
-
 dependencies {
     compile(projectDist(":kotlin-stdlib"))
     compileOnly(project(":kotlin-reflect-api"))
     compile(project(":compiler:util"))
     compile(project(":compiler:cli-common"))
     compile(project(":compiler:frontend.java"))
-}
-
-afterEvaluate {
-    dependencies {
-        compileOnly(intellijCoreJar())
-        compileOnly(intellij { include("jdom.jar", "util.jar") })
-    }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijDep()) { includeJars("jdom", "util") }
 }
 
 sourceSets {
diff --git a/jps/jps-plugin/build.gradle.kts b/jps/jps-plugin/build.gradle.kts
index 2dd0c406389..197b71e0952 100644
--- a/jps/jps-plugin/build.gradle.kts
+++ b/jps/jps-plugin/build.gradle.kts
@@ -2,10 +2,6 @@ apply { plugin("kotlin") }
 
 val compilerModules: Array<String> by rootProject.extra
 
-configureIntellijPlugin {
-    setExtraDependencies("intellij-core", "jps-standalone", "jps-build-test")
-}
-
 dependencies {
     compile(project(":kotlin-build-common"))
     compile(project(":core:descriptors"))
@@ -16,6 +12,8 @@ dependencies {
     compile(project(":compiler:frontend.java"))
     compile(projectRuntimeJar(":kotlin-preloader"))
     compile(project(":idea:idea-jps-common"))
+    compileOnly(intellijDep()) { includeJars("jdom", "trove4j", "jps-model", "openapi", "util") }
+    compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
     testCompileOnly(project(":kotlin-reflect-api"))
     testCompile(project(":compiler:incremental-compilation-impl"))
     testCompile(projectTests(":compiler:tests-common"))
@@ -23,24 +21,17 @@ dependencies {
     testCompile(commonDep("junit:junit"))
     testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
     testCompile(projectTests(":kotlin-build-common"))
+    testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") }
+    testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "log4j") }
+    testCompile(intellijDep("jps-build-test"))
     compilerModules.forEach {
         testRuntime(project(it))
     }
+    testRuntime(intellijDep())
+    testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
     testRuntime(projectDist(":kotlin-reflect"))
 }
 
-afterEvaluate {
-    dependencies {
-        compileOnly(intellij { include("jdom.jar", "trove4j.jar", "jps-model.jar", "openapi.jar", "util.jar") })
-        compileOnly(intellijExtra("jps-standalone") { include("jps-builders.jar", "jps-builders-6.jar") })
-        testCompileOnly(intellijExtra("jps-standalone") { include("jps-builders.jar", "jps-builders-6.jar") })
-        testCompileOnly(intellij { include("openapi.jar", "idea.jar", "log4j.jar") })
-        testCompile(intellijExtra("jps-build-test"))
-        testRuntime(intellij())
-        testRuntime(intellijCoreJar())
-    }
-}
-
 sourceSets {
     "main" { projectDefault() }
     "test" {