From 47f61b2917d77b9107352f4ea0341caee10a49ea Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Tue, 23 Apr 2019 09:47:18 +0300
Subject: [PATCH] Revert "Include FIR modules into compiler #KT-30243 Fixed"

This reverts commit 053aa8ca. It causes
"IllegalArgumentException: org.gradle.*.DefaultClassLoaderScope@13fca663
must be locked before it can be used to compute a classpath!"
in Gradle integration tests
---
 build.gradle.kts                              | 18 +++++++++++------
 .../complexBuildGradleKts/build.gradle.kts    | 16 ++++++++++-----
 prepare/idea-plugin/build.gradle.kts          | 20 ++++++++++++-------
 3 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 0b5920e6c00..a18423763dd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -190,6 +190,17 @@ extra["compilerModules"] = arrayOf(
         ":compiler:resolution",
         ":compiler:serialization",
         ":compiler:psi",
+        *if (project.findProperty("fir.enabled") == "true") {
+            arrayOf(
+                ":compiler:fir:cones",
+                ":compiler:fir:resolve",
+                ":compiler:fir:tree",
+                ":compiler:fir:psi2fir",
+                ":compiler:fir:fir2ir"
+            )
+        } else {
+            emptyArray()
+        },
         ":compiler:frontend",
         ":compiler:frontend.common",
         ":compiler:frontend.java",
@@ -223,12 +234,7 @@ extra["compilerModules"] = arrayOf(
         ":core:descriptors.jvm",
         ":core:deserialization",
         ":core:util.runtime",
-        ":core:type-system",
-        ":compiler:fir:cones",
-        ":compiler:fir:resolve",
-        ":compiler:fir:tree",
-        ":compiler:fir:psi2fir",
-        ":compiler:fir:fir2ir"
+        ":core:type-system"
 )
 
 val coreLibProjects = listOf(
diff --git a/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts b/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts
index db95dba7cb6..a7b6bc08259 100644
--- a/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts
+++ b/idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts
@@ -113,11 +113,17 @@ extra["compilerModules"] = arrayOf(
     ":compiler:resolution",
     ":compiler:serialization",
     ":compiler:psi",
-    ":compiler:fir:cones",
-    ":compiler:fir:resolve",
-    ":compiler:fir:tree",
-    ":compiler:fir:psi2fir",
-    ":compiler:fir:fir2ir",
+    *if (project.findProperty("fir.enabled") == "true") {
+        arrayOf(
+            ":compiler:fir:cones",
+            ":compiler:fir:resolve",
+            ":compiler:fir:tree",
+            ":compiler:fir:psi2fir",
+            ":compiler:fir:fir2ir"
+        )
+    } else {
+        emptyArray()
+    },
     ":compiler:frontend",
     ":compiler:frontend.common",
     ":compiler:frontend.java",
diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
index 8428d6970f8..9177ea4377b 100644
--- a/prepare/idea-plugin/build.gradle.kts
+++ b/prepare/idea-plugin/build.gradle.kts
@@ -30,13 +30,19 @@ val projectsToShadow by extra(listOf(
         ":idea:eval4j",
         ":idea:formatter",
         ":compiler:psi",
-        ":compiler:fir:cones",
-        ":compiler:fir:resolve",
-        ":compiler:fir:tree",
-        ":compiler:fir:java",
-        ":compiler:fir:psi2fir",
-        ":compiler:fir:fir2ir",
-        ":idea:fir-view",
+        *if (project.findProperty("fir.enabled") == "true") {
+            arrayOf(
+                ":compiler:fir:cones",
+                ":compiler:fir:resolve",
+                ":compiler:fir:tree",
+                ":compiler:fir:java",
+                ":compiler:fir:psi2fir",
+                ":compiler:fir:fir2ir",
+                ":idea:fir-view"
+            )
+        } else {
+            emptyArray()
+        },
         ":compiler:frontend",
         ":compiler:frontend.common",
         ":compiler:frontend.java",