From 8266777bd534ecfe553034cc2898ac2f8b07893b Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Thu, 2 Nov 2017 14:18:21 +0100
Subject: [PATCH] Convert js modules to intellij plugin

---
 js/js.ast/build.gradle.kts        | 13 ++++++++++++-
 js/js.dce/build.gradle.kts        | 11 ++++++++++-
 js/js.frontend/build.gradle.kts   | 11 ++++++++++-
 js/js.parser/build.gradle.kts     | 11 ++++++++++-
 js/js.serializer/build.gradle.kts | 11 ++++++++++-
 js/js.tests/build.gradle.kts      | 10 +++++++++-
 js/js.translator/build.gradle.kts | 11 ++++++++++-
 7 files changed, 71 insertions(+), 7 deletions(-)

diff --git a/js/js.ast/build.gradle.kts b/js/js.ast/build.gradle.kts
index 6546fd1f707..0e0ff5e822e 100644
--- a/js/js.ast/build.gradle.kts
+++ b/js/js.ast/build.gradle.kts
@@ -3,12 +3,23 @@ apply { plugin("kotlin") }
 
 jvmTarget = "1.6"
 
+configureIntellijPlugin {
+    setExtraDependencies("intellij-core")
+}
+
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
-    compile(ideaSdkCoreDeps("trove4j", "intellij-core"))
 }
 
+afterEvaluate {
+    dependencies {
+        compile(intellijCoreJar())
+        compile(intellij { include("trove6j.jar")} )
+    }
+}
+
+
 sourceSets {
     "main" { projectDefault() }
     "test" {}
diff --git a/js/js.dce/build.gradle.kts b/js/js.dce/build.gradle.kts
index ebdd7fb247e..beccdabdbb6 100644
--- a/js/js.dce/build.gradle.kts
+++ b/js/js.dce/build.gradle.kts
@@ -1,11 +1,20 @@
 
 apply { plugin("kotlin") }
 
+configureIntellijPlugin {
+    setExtraDependencies("intellij-core")
+}
+
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":js:js.ast"))
     compile(project(":js:js.translator"))
-    compile(ideaSdkCoreDeps("intellij-core"))
+}
+
+afterEvaluate {
+    dependencies {
+        compile(intellijCoreJar())
+    }
 }
 
 sourceSets {
diff --git a/js/js.frontend/build.gradle.kts b/js/js.frontend/build.gradle.kts
index 7f94ddb68ae..083eca7938a 100644
--- a/js/js.frontend/build.gradle.kts
+++ b/js/js.frontend/build.gradle.kts
@@ -3,13 +3,22 @@ apply { plugin("kotlin") }
 
 jvmTarget = "1.6"
 
+configureIntellijPlugin {
+    setExtraDependencies("intellij-core")
+}
+
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
     compile(project(":js:js.ast"))
     compile(project(":js:js.parser"))
     compile(project(":js:js.serializer"))
-    compile(ideaSdkCoreDeps("intellij-core"))
+}
+
+afterEvaluate {
+    dependencies {
+        compile(intellijCoreJar())
+    }
 }
 
 sourceSets {
diff --git a/js/js.parser/build.gradle.kts b/js/js.parser/build.gradle.kts
index 0e5ab7353a5..35430726ba4 100644
--- a/js/js.parser/build.gradle.kts
+++ b/js/js.parser/build.gradle.kts
@@ -1,10 +1,19 @@
 
 apply { plugin("kotlin") }
 
+configureIntellijPlugin {
+    setExtraDependencies("intellij-core")
+}
+
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":js:js.ast"))
-    compile(ideaSdkCoreDeps("intellij-core"))
+}
+
+afterEvaluate {
+    dependencies {
+        compile(intellijCoreJar())
+    }
 }
 
 sourceSets {
diff --git a/js/js.serializer/build.gradle.kts b/js/js.serializer/build.gradle.kts
index 63d851199f7..3b9fb228fcc 100644
--- a/js/js.serializer/build.gradle.kts
+++ b/js/js.serializer/build.gradle.kts
@@ -3,12 +3,21 @@ apply { plugin("kotlin") }
 
 jvmTarget = "1.6"
 
+configureIntellijPlugin {
+    setExtraDependencies("intellij-core")
+}
+
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
     compile(project(":compiler:serialization"))
     compile(project(":js:js.ast"))
-    compile(ideaSdkCoreDeps("intellij-core"))
+}
+
+afterEvaluate {
+    dependencies {
+        compile(intellijCoreJar())
+    }
 }
 
 sourceSets {
diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts
index b2e5332e855..5731605ccb3 100644
--- a/js/js.tests/build.gradle.kts
+++ b/js/js.tests/build.gradle.kts
@@ -12,6 +12,8 @@ node {
 
 apply { plugin("kotlin") }
 
+configureIntellijPlugin()
+
 dependencies {
     testCompile(protobufFull())
     testCompile(projectTests(":compiler:tests-common"))
@@ -21,7 +23,6 @@ dependencies {
     testCompile(project(":js:js.translator"))
     testCompile(project(":js:js.serializer"))
     testCompile(project(":js:js.dce"))
-    testCompile(ideaSdkDeps("openapi", "idea", "idea_rt"))
     testCompile(commonDep("junit:junit"))
     testCompile(projectTests(":kotlin-build-common"))
     testCompile(projectTests(":generators:test-generator"))
@@ -34,6 +35,13 @@ dependencies {
     testRuntime(commonDep("org.fusesource.jansi", "jansi"))
 }
 
+afterEvaluate {
+    dependencies {
+        testCompile(intellij { include("openapi.jar", "idea.jar", "idea_rt.jar") })
+    }
+}
+
+
 sourceSets {
     "main" {}
     "test" { projectDefault() }
diff --git a/js/js.translator/build.gradle.kts b/js/js.translator/build.gradle.kts
index 2ab8ec6a3e5..7297938335f 100644
--- a/js/js.translator/build.gradle.kts
+++ b/js/js.translator/build.gradle.kts
@@ -8,6 +8,10 @@ apply { plugin("kotlin") }
 
 jvmTarget = "1.6"
 
+configureIntellijPlugin {
+    setExtraDependencies("intellij-core")
+}
+
 dependencies {
     compile(project(":core:descriptors"))
     compile(project(":compiler:util"))
@@ -16,7 +20,12 @@ dependencies {
     compile(project(":js:js.ast"))
     compile(project(":js:js.frontend"))
     compile(project(":js:js.parser"))
-    compile(ideaSdkCoreDeps("intellij-core"))
+}
+
+afterEvaluate {
+    dependencies {
+        compile(intellijCoreJar())
+    }
 }
 
 sourceSets {