azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include FIR modules into compiler #KT-30243 Fixed

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-04-19 19:49:50 +03:00
parent 77d74a261d
commit 053aa8ca1e
3 changed files with 18 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+6 -12
View File
@@ -190,17 +190,6 @@ 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",
@@ -234,7 +223,12 @@ 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(
idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts
Vendored
+5 -11
View File
@@ -113,17 +113,11 @@ extra["compilerModules"] = arrayOf(
":compiler:resolution", ":compiler:resolution",
":compiler:serialization", ":compiler:serialization",
":compiler:psi", ":compiler:psi",
*if (project.findProperty("fir.enabled") == "true") { ":compiler:fir:cones",
arrayOf( ":compiler:fir:resolve",
":compiler:fir:cones", ":compiler:fir:tree",
":compiler:fir:resolve", ":compiler:fir:psi2fir",
":compiler:fir:tree", ":compiler:fir:fir2ir",
":compiler:fir:psi2fir",
":compiler:fir:fir2ir"
)
} else {
emptyArray()
},
":compiler:frontend", ":compiler:frontend",
":compiler:frontend.common", ":compiler:frontend.common",
":compiler:frontend.java", ":compiler:frontend.java",
prepare/idea-plugin/build.gradle.kts
+7 -13
View File
@@ -30,19 +30,13 @@ val projectsToShadow by extra(listOf(
":idea:eval4j", ":idea:eval4j",
":idea:formatter", ":idea:formatter",
":compiler:psi", ":compiler:psi",
*if (project.findProperty("fir.enabled") == "true") { ":compiler:fir:cones",
arrayOf( ":compiler:fir:resolve",
":compiler:fir:cones", ":compiler:fir:tree",
":compiler:fir:resolve", ":compiler:fir:java",
":compiler:fir:tree", ":compiler:fir:psi2fir",
":compiler:fir:java", ":compiler:fir:fir2ir",
":compiler:fir:psi2fir", ":idea:fir-view",
":compiler:fir:fir2ir",
":idea:fir-view"
)
} else {
emptyArray()
},
":compiler:frontend", ":compiler:frontend",
":compiler:frontend.common", ":compiler:frontend.common",
":compiler:frontend.java", ":compiler:frontend.java",