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
This commit is contained in:
Mikhail Glukhikh
2019-04-23 09:47:18 +03:00
parent d2a3d00548
commit 47f61b2917
3 changed files with 36 additions and 18 deletions
+12 -6
View File
@@ -190,6 +190,17 @@ extra["compilerModules"] = arrayOf(
":compiler:resolution", ":compiler:resolution",
":compiler:serialization", ":compiler:serialization",
":compiler:psi", ":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",
":compiler:frontend.common", ":compiler:frontend.common",
":compiler:frontend.java", ":compiler:frontend.java",
@@ -223,12 +234,7 @@ extra["compilerModules"] = arrayOf(
":core:descriptors.jvm", ":core:descriptors.jvm",
":core:deserialization", ":core:deserialization",
":core:util.runtime", ":core:util.runtime",
":core:type-system", ":core:type-system"
":compiler:fir:cones",
":compiler:fir:resolve",
":compiler:fir:tree",
":compiler:fir:psi2fir",
":compiler:fir:fir2ir"
) )
val coreLibProjects = listOf( val coreLibProjects = listOf(
@@ -113,11 +113,17 @@ extra["compilerModules"] = arrayOf(
":compiler:resolution", ":compiler:resolution",
":compiler:serialization", ":compiler:serialization",
":compiler:psi", ":compiler:psi",
":compiler:fir:cones", *if (project.findProperty("fir.enabled") == "true") {
":compiler:fir:resolve", arrayOf(
":compiler:fir:tree", ":compiler:fir:cones",
":compiler:fir:psi2fir", ":compiler:fir:resolve",
":compiler:fir:fir2ir", ":compiler:fir:tree",
":compiler:fir:psi2fir",
":compiler:fir:fir2ir"
)
} else {
emptyArray()
},
":compiler:frontend", ":compiler:frontend",
":compiler:frontend.common", ":compiler:frontend.common",
":compiler:frontend.java", ":compiler:frontend.java",
+13 -7
View File
@@ -30,13 +30,19 @@ val projectsToShadow by extra(listOf(
":idea:eval4j", ":idea:eval4j",
":idea:formatter", ":idea:formatter",
":compiler:psi", ":compiler:psi",
":compiler:fir:cones", *if (project.findProperty("fir.enabled") == "true") {
":compiler:fir:resolve", arrayOf(
":compiler:fir:tree", ":compiler:fir:cones",
":compiler:fir:java", ":compiler:fir:resolve",
":compiler:fir:psi2fir", ":compiler:fir:tree",
":compiler:fir:fir2ir", ":compiler:fir:java",
":idea:fir-view", ":compiler:fir:psi2fir",
":compiler:fir:fir2ir",
":idea:fir-view"
)
} else {
emptyArray()
},
":compiler:frontend", ":compiler:frontend",
":compiler:frontend.common", ":compiler:frontend.common",
":compiler:frontend.java", ":compiler:frontend.java",