Merge :compiler:fir:jvm module into :compiler:fir:java

build.gradle.kts

@@ -245,7 +245,6 @@ extra["compilerModules"] = arrayOf(
     ":compiler:fir:fir2ir",
     ":compiler:fir:fir2ir:jvm-backend",
     ":compiler:fir:java",
-    ":compiler:fir:jvm",
     ":compiler:fir:checkers",
     ":compiler:fir:checkers:checkers.jvm",
     ":compiler:fir:entrypoint",

compiler/cli/build.gradle.kts

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

compiler/fir/fir2ir/jvm-backend/build.gradle.kts

@@ -8,7 +8,7 @@ dependencies {
     compileOnly(project(":compiler:backend.common.jvm"))
     compileOnly(project(":compiler:fir:cones"))
     compileOnly(project(":compiler:fir:resolve"))
-    compileOnly(project(":compiler:fir:jvm"))
+    compileOnly(project(":compiler:fir:java"))
     compileOnly(project(":compiler:fir:tree"))
     compileOnly(project(":compiler:fir:fir2ir"))
     compileOnly(project(":compiler:fir:fir-serialization"))

compiler/fir/java/build.gradle.kts

@@ -7,11 +7,11 @@ plugins {
 dependencies {
     api(project(":core:compiler.common.jvm"))
     api(project(":core:metadata.jvm"))
+    api(project(":compiler:config.jvm"))
     api(project(":compiler:resolution.common.jvm"))
     api(project(":compiler:frontend.common"))
     api(project(":compiler:fir:resolve"))
     api(project(":compiler:fir:checkers"))
-    api(project(":compiler:fir:jvm"))
     api(project(":compiler:fir:fir-deserialization"))
 
     implementation(project(":core:deserialization.common.jvm"))

compiler/fir/jvm/build.gradle.kts

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

compiler/tests-common/build.gradle.kts

@@ -18,7 +18,6 @@ dependencies {
     testCompile(project(":compiler:fir:raw-fir:psi2fir"))
     testCompile(project(":compiler:fir:raw-fir:light-tree2fir"))
     testCompile(project(":compiler:fir:fir2ir"))
-    testCompile(project(":compiler:fir:jvm"))
     testCompile(project(":compiler:fir:fir2ir:jvm-backend"))
     testCompile(project(":compiler:fir:fir-serialization"))
     testCompile(project(":compiler:fir:fir-deserialization"))

idea/idea-frontend-fir/build.gradle.kts

@@ -12,7 +12,6 @@ dependencies {
     compile(project(":compiler:fir:checkers"))
     compile(project(":compiler:fir:checkers:checkers.jvm"))
     compile(project(":compiler:fir:java"))
-    compile(project(":compiler:fir:jvm"))
     compile(project(":idea-frontend-fir:idea-fir-low-level-api"))
     compile(project(":idea-frontend-api"))
     compile(project(":compiler:light-classes"))

idea/idea-frontend-fir/idea-fir-low-level-api/build.gradle.kts

@@ -12,7 +12,6 @@ dependencies {
     compile(project(":compiler:fir:checkers"))
     compile(project(":compiler:fir:checkers:checkers.jvm"))
     compile(project(":compiler:fir:java"))
-    compile(project(":compiler:fir:jvm"))
     compile(project(":compiler:backend.common.jvm"))
     testCompile(project(":idea-frontend-fir"))
     implementation(project(":compiler:ir.psi2ir"))

settings.gradle

@@ -278,7 +278,6 @@ include ":compiler:fir",
         ":compiler:fir:java",
         ":compiler:fir:modularized-tests",
         ":compiler:fir:dump",
-        ":compiler:fir:jvm",
         ":compiler:fir:checkers",
         ":compiler:fir:checkers:checkers.jvm",
         ":compiler:fir:checkers:checkers-component-generator",