[FIR] Introduce module for all jvm extensions

build.gradle.kts

@@ -247,7 +247,8 @@ extra["compilerModules"] = arrayOf(
     ":compiler:fir:psi2fir",
     ":compiler:fir:lightTree",
     ":compiler:fir:fir2ir",
-    ":compiler:fir:java"
+    ":compiler:fir:java",
+    ":compiler:fir:jvm"
 )
 
 val coreLibProjects = listOfNotNull(

compiler/cli/build.gradle.kts

@@ -22,6 +22,7 @@ dependencies {
     compile(commonDep("org.jline", "jline"))
     compile(project(":compiler:fir:psi2fir"))
     compile(project(":compiler:fir:resolve"))
+    compile(project(":compiler:fir:jvm"))
     compile(project(":compiler:fir:java"))
     compile(project(":compiler:fir:fir2ir"))
     compile(toolsJar())

compiler/fir/java/build.gradle.kts

@@ -8,6 +8,7 @@ dependencies {
     compile(project(":compiler:frontend.common"))
     compile(project(":compiler:frontend.java"))
     compile(project(":compiler:fir:resolve"))
+    implementation(project(":compiler:fir:jvm"))
 
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }

compiler/fir/jvm/build.gradle.kts

@@ -0,0 +1,18 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+
+    implementation(project(":compiler:fir:cones"))
+    implementation(project(":compiler:fir:tree"))
+    implementation(project(":compiler:fir:resolve"))
+}
+
+
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}

idea/build.gradle.kts

@@ -82,6 +82,7 @@ dependencies {
     compile(project(":compiler:fir:fir2ir"))
     compile(project(":compiler:fir:resolve"))
     compile(project(":compiler:fir:java"))
+    compile(project(":compiler:fir:jvm"))
     compile(project(":idea:idea-core"))
     compile(project(":idea:ide-common"))
     compile(project(":idea:idea-jps-common"))

idea/idea-core/build.gradle.kts

@@ -22,6 +22,7 @@ dependencies {
     compile(project(":compiler:fir:fir2ir"))
     compile(project(":compiler:fir:resolve"))
     compile(project(":compiler:fir:java"))
+    compile(project(":compiler:fir:jvm"))
     compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
     compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")) { isTransitive = false }
 

idea/testData/gradle/highlighting/complexBuildGradleKts/build.gradle.kts

@@ -119,6 +119,7 @@ extra["compilerModules"] = arrayOf(
     ":compiler:fir:psi2fir",
     ":compiler:fir:fir2ir",
     ":compiler:fir:java",
+    ":compiler:fir:jvm",
     ":compiler:frontend",
     ":compiler:frontend.common",
     ":compiler:frontend.java",

prepare/idea-plugin/build.gradle.kts

@@ -45,6 +45,7 @@ val projectsToShadow by extra(listOf(
         ":compiler:fir:resolve",
         ":compiler:fir:tree",
         ":compiler:fir:java",
+        ":compiler:fir:jvm",
         ":compiler:fir:psi2fir",
         ":compiler:fir:fir2ir",
         ":idea:fir-view",

settings.gradle

@@ -89,6 +89,7 @@ include ":kotlin-build-common",
         ":compiler:fir:java",
         ":compiler:fir:modularized-tests",
         ":compiler:fir:dump",
+        ":compiler:fir:jvm",
         ":compiler:frontend",
         ":compiler:frontend.common",
         ":compiler:frontend.java",