Include FIR modules into compiler #KT-30243 Fixed

(cherry picked from commit 053aa8ca1e)
2019-04-19 19:49:50 +03:00
parent bd16c4629a
commit 3f6be95801
3 changed files with 18 additions and 36 deletions
@@ -30,19 +30,13 @@ val projectsToShadow by extra(listOf(
        ":idea:eval4j",
        ":idea:formatter",
        ":compiler:psi",
-        *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:fir:cones",
+        ":compiler:fir:resolve",
+        ":compiler:fir:tree",
+        ":compiler:fir:java",
+        ":compiler:fir:psi2fir",
+        ":compiler:fir:fir2ir",
+        ":idea:fir-view",
        ":compiler:frontend",
        ":compiler:frontend.common",
        ":compiler:frontend.java",