From dbfa43a60af3db576f7f041bb0c3fd55fa9a43fe Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Wed, 27 May 2020 13:22:27 +0300
Subject: [PATCH] FIR IDE: remove unneeded dependencies of idea-fir &
 idea-frontend-fir modules

---
 idea/idea-fir/build.gradle.kts          | 52 ++++++++-----------------
 idea/idea-frontend-fir/build.gradle.kts | 48 ++++++++++++++---------
 2 files changed, 45 insertions(+), 55 deletions(-)

diff --git a/idea/idea-fir/build.gradle.kts b/idea/idea-fir/build.gradle.kts
index 55635ef8f9f..f477027cab8 100644
--- a/idea/idea-fir/build.gradle.kts
+++ b/idea/idea-fir/build.gradle.kts
@@ -5,15 +5,19 @@ plugins {
 
 dependencies {
     compile(project(":idea:idea-frontend-fir"))
+    compile(project(":idea:formatter"))
+    compile(intellijDep())
+    compile(intellijCoreDep())
 
-    testCompileOnly(toolsJar())
-    testRuntimeOnly(toolsJar())
+// <temp>
+    compile(project(":idea:idea-core"))
+    compile(project(":idea"))
+// </temp>
 
-    testRuntimeOnly(intellijPluginDep("gradle"))
-    testCompile(project(":idea"))
+    testCompile(toolsJar())
     testCompile(projectTests(":idea"))
     testCompile(projectTests(":compiler:tests-common"))
-    testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false }
+    testCompile(projectTests(":idea:idea-test-framework"))
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testCompile(commonDep("junit:junit"))
 
@@ -21,34 +25,8 @@ dependencies {
     testRuntime(intellijDep())
 
     Platform[192].orHigher {
-        testCompileOnly(intellijPluginDep("java"))
-        testRuntime(intellijPluginDep("java"))
+        compile(intellijPluginDep("java"))
     }
-
-    testCompile(projectTests(":idea:idea-test-framework"))
-    testRuntime(intellijRuntimeAnnotations())
-    testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false }
-    testRuntime(project(":kotlin-reflect"))
-    testRuntime(project(":kotlin-preloader"))
-
-    testCompile(project(":kotlin-sam-with-receiver-compiler-plugin")) { isTransitive = false }
-
-    testRuntime(project(":plugins:android-extensions-compiler"))
-    testRuntimeOnly(project(":kotlin-android-extensions-runtime")) // TODO: fix import (workaround for jps build)
-    testRuntime(project(":plugins:android-extensions-ide")) { isTransitive = false }
-    testRuntime(project(":allopen-ide-plugin")) { isTransitive = false }
-    testRuntime(project(":kotlin-allopen-compiler-plugin"))
-    testRuntime(project(":noarg-ide-plugin")) { isTransitive = false }
-    testRuntime(project(":kotlin-noarg-compiler-plugin"))
-    testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false }
-    testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false }
-    testRuntime(project(":kotlin-scripting-compiler-impl"))
-    testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false }
-    testRuntime(project(":kotlinx-serialization-compiler-plugin"))
-    testRuntime(project(":kotlinx-serialization-ide-plugin")) { isTransitive = false }
-    testRuntime(project(":idea:idea-android")) { isTransitive = false }
-    testRuntime(project(":plugins:lint")) { isTransitive = false }
-    testRuntime(project(":plugins:uast-kotlin"))
 }
 
 sourceSets {
@@ -56,9 +34,11 @@ sourceSets {
     "test" { projectDefault() }
 }
 
-projectTest(parallel = false) {
-    dependsOn(":dist")
-    workingDir = rootDir
+if (rootProject.findProperty("idea.fir.plugin") == "true") {
+    projectTest(parallel = true) {
+        dependsOn(":dist")
+        workingDir = rootDir
+    }
 }
 
-testsJar()
+testsJar()
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/build.gradle.kts b/idea/idea-frontend-fir/build.gradle.kts
index b6a254b0058..eb6cb72bbe2 100644
--- a/idea/idea-frontend-fir/build.gradle.kts
+++ b/idea/idea-frontend-fir/build.gradle.kts
@@ -4,24 +4,31 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":compiler:psi"))
-    compileOnly(project(":idea:idea-frontend-independent"))
-    implementation(project(":idea:idea-frontend-api"))
-    compileOnly(project(":idea:idea-core"))
-    compileOnly(project(":compiler:fir:fir2ir"))
-    compileOnly(project(":compiler:fir:resolve"))
-    compileOnly(project(":compiler:fir:checkers"))
-    compileOnly(project(":compiler:fir:java"))
-    compileOnly(project(":compiler:fir:jvm"))
-    compileOnly(intellijCoreDep())
-    compileOnly(intellijDep())
+    compile(project(":compiler:psi"))
+    compile(project(":idea:idea-frontend-independent"))
+    compile(project(":idea:idea-frontend-api"))
+    compile(project(":idea:idea-core"))
+    compile(project(":compiler:fir:fir2ir"))
+    compile(project(":compiler:fir:resolve"))
+    compile(project(":compiler:fir:checkers"))
+    compile(project(":compiler:fir:java"))
+    compile(project(":compiler:fir:jvm"))
+    compile(intellijDep())
+    compile(intellijCoreDep())
 
-    Platform[191].orLower {
-        compileOnly(intellijDep()) { includeJars("java-api", "java-impl") }
-    }
+// <temp>
+    compile(project(":idea:idea-core"))
+// </temp>
+
+    testCompile(toolsJar())
+    testCompile(projectTests(":idea"))
+    testCompile(projectTests(":compiler:tests-common"))
+    testCompile(projectTests(":idea:idea-test-framework"))
+    testCompile(project(":kotlin-test:kotlin-test-junit"))
+    testCompile(commonDep("junit:junit"))
 
     Platform[192].orHigher {
-        compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
+        compile(intellijPluginDep("java"))
     }
 }
 
@@ -30,9 +37,12 @@ sourceSets {
     "test" { projectDefault() }
 }
 
+if (rootProject.findProperty("idea.fir.plugin") == "true")  {
+    projectTest {
+        dependsOn(":dist")
+        workingDir = rootDir
+    }
+}
+
 testsJar()
 
-projectTest {
-    dependsOn(":dist")
-    workingDir = rootDir
-}