Introduce new modules for common jvm related parts of compiler

build.gradle.kts

@@ -222,6 +222,7 @@ extra["compilerModules"] = arrayOf(
     ":compiler:config.jvm",
     ":compiler:container",
     ":compiler:resolution.common",
+    ":compiler:resolution.common.jvm",
     ":compiler:resolution",
     ":compiler:serialization",
     ":compiler:psi",
@@ -267,6 +268,7 @@ extra["compilerModules"] = arrayOf(
     ":core:metadata",
     ":core:metadata.jvm",
     ":core:compiler.common",
+    ":core:compiler.common.jvm",
     ":core:descriptors",
     ":core:descriptors.jvm",
     ":core:descriptors.runtime",
@@ -298,6 +300,7 @@ extra["compilerModulesForJps"] = listOf(
     ":daemon-common",
     ":daemon-common-new",
     ":core:compiler.common",
+    ":core:compiler.common.jvm",
     ":core:descriptors",
     ":core:descriptors.jvm",
     ":idea:idea-jps-common",

compiler/fir/jvm/build.gradle.kts

@@ -4,6 +4,8 @@ plugins {
 }
 
 dependencies {
+    implementation(project(":core:compiler.common.jvm"))
+    implementation(project(":compiler:resolution.common.jvm"))
     implementation(project(":compiler:fir:cones"))
     implementation(project(":compiler:fir:tree"))
     implementation(project(":compiler:fir:resolve"))

compiler/frontend.java/build.gradle.kts

@@ -10,6 +10,7 @@ dependencies {
     compile(project(":compiler:config.jvm"))
     compile("javax.annotation:jsr250-api:1.0")
     compile(project(":compiler:frontend"))
+    api(project(":compiler:resolution.common.jvm"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "guava", rootProject = rootProject) }
 }

compiler/frontend/build.gradle.kts

@@ -15,6 +15,7 @@ dependencies {
     compile(project(":compiler:frontend.common"))
     compile(project(":kotlin-script-runtime"))
     compile(commonDep("io.javaslang","javaslang"))
+    api(project(":core:compiler.common.jvm"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeJars("trove4j", "guava", rootProject = rootProject) }
 }

compiler/resolution.common.jvm/build.gradle.kts

@@ -0,0 +1,15 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    api(project(":compiler:resolution.common"))
+    api(project(":core:compiler.common.jvm"))
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}

core/compiler.common.jvm/build.gradle.kts

@@ -0,0 +1,21 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+jvmTarget = "1.6"
+javaHome = rootProject.extra["JDK_16"] as String
+
+dependencies {
+    api(project(":core:compiler.common"))
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}
+
+tasks.withType<JavaCompile> {
+    sourceCompatibility = "1.6"
+    targetCompatibility = "1.6"
+}

core/descriptors.jvm/build.gradle.kts

@@ -10,6 +10,7 @@ dependencies {
     compile(project(":kotlin-annotations-jvm"))
     compile(project(":core:descriptors"))
     compile(project(":core:deserialization"))
+    api(project(":core:compiler.common.jvm"))
     compile(project(":core:metadata.jvm"))
     compile(project(":core:util.runtime"))
     compile(commonDep("javax.inject"))

libraries/reflect/build.gradle.kts

@@ -48,6 +48,7 @@ dependencies {
     embedded(project(":core:metadata"))
     embedded(project(":core:metadata.jvm"))
     embedded(project(":core:compiler.common"))
+    embedded(project(":core:compiler.common.jvm"))
     embedded(project(":core:descriptors"))
     embedded(project(":core:descriptors.jvm"))
     embedded(project(":core:deserialization"))

settings.gradle

@@ -79,6 +79,7 @@ include ":benchmarks",
         ":kotlin-runner",
         ":compiler:container",
         ":compiler:resolution.common",
+        ":compiler:resolution.common.jvm",
         ":compiler:resolution",
         ":compiler:serialization",
         ":compiler:psi",
@@ -135,6 +136,7 @@ include ":benchmarks",
         ":jps-plugin",
         ":kotlin-jps-plugin",
         ":core:compiler.common",
+        ":core:compiler.common.jvm",
         ":core:descriptors",
         ":core:descriptors.jvm",
         ":core:deserialization",