Introduce new modules for common parts of deserialization

build.gradle.kts

@@ -267,6 +267,8 @@ extra["compilerModules"] = arrayOf(
     ":kotlin-build-common",
     ":core:metadata",
     ":core:metadata.jvm",
+    ":core:deserialization.common",
+    ":core:deserialization.common.jvm",
     ":core:compiler.common",
     ":core:compiler.common.jvm",
     ":core:descriptors",

compiler/fir/fir-deserialization/build.gradle.kts

@@ -6,6 +6,8 @@ plugins {
 dependencies {
     implementation(project(":core:metadata"))
     implementation(project(":core:metadata.jvm"))
+    implementation(project(":core:deserialization.common"))
+    implementation(project(":core:deserialization.common.jvm"))
     implementation(project(":core:compiler.common"))
     implementation(project(":core:compiler.common.jvm"))
 

compiler/fir/fir-serialization/build.gradle.kts

@@ -6,6 +6,7 @@ plugins {
 dependencies {
     implementation(project(":core:compiler.common"))
     implementation(project(":core:compiler.common.jvm"))
+    implementation(project(":core:deserialization.common.jvm"))
     implementation(project(":compiler:fir:fir-deserialization"))
 
     api(project(":compiler:fir:cones"))

compiler/fir/java/build.gradle.kts

@@ -14,6 +14,8 @@ dependencies {
     api(project(":compiler:fir:jvm"))
     api(project(":compiler:fir:fir-deserialization"))
 
+    implementation(project(":core:deserialization.common.jvm"))
+
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }
 

compiler/ir/serialization.jvm/build.gradle.kts

@@ -9,6 +9,7 @@ dependencies {
     compile(project(":compiler:ir.psi2ir"))
     compile(project(":core:descriptors.jvm"))
     compile(project(":core:metadata.jvm"))
+    implementation(project(":core:deserialization.common.jvm"))
     compile(project(":compiler:frontend.java"))
 }
 
@@ -17,4 +18,4 @@ sourceSets {
         projectDefault()
     }
     "test" {}
-}
+}

core/descriptors.jvm/build.gradle.kts

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

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

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

core/deserialization.common/build.gradle.kts

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

core/deserialization/build.gradle.kts

@@ -8,6 +8,7 @@ javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
     compile(project(":core:metadata"))
+    api(project(":core:deserialization.common"))
     compile(project(":core:util.runtime"))
     compile(project(":core:descriptors"))
     compile(commonDep("javax.inject"))

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

@@ -149,6 +149,8 @@ extra["compilerModules"] = arrayOf(
     ":kotlin-build-common",
     ":core:metadata",
     ":core:metadata.jvm",
+    ":core:deserialization.common",
+    ":core:deserialization.common.jvm",
     ":core:descriptors",
     ":core:descriptors.jvm",
     ":core:deserialization",

libraries/kotlinx-metadata/klib/build.gradle.kts

@@ -28,6 +28,7 @@ dependencies {
     shadows(project(":core:compiler.common"))
     shadows(project(":core:metadata"))
     shadows(project(":core:deserialization"))
+    shadows(project(":core:deserialization.common"))
     shadows(project(":compiler:serialization"))
     shadows(project(":kotlin-util-klib-metadata"))
     shadows(project(":kotlin-util-klib"))

libraries/reflect/build.gradle.kts

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

prepare/idea-plugin/build.gradle.kts

@@ -31,6 +31,8 @@ val projectsToShadow by extra(listOf(
         ":core:compiler.common",
         ":core:descriptors",
         ":core:descriptors.jvm",
+        ":core:deserialization.common",
+        ":core:deserialization.common.jvm",
         ":core:deserialization",
         ":idea:jvm-debugger:eval4j",
         ":idea:jvm-debugger:jvm-debugger-util",

settings.gradle

@@ -143,6 +143,8 @@ include ":benchmarks",
         ":core:descriptors.runtime",
         ":core:metadata",
         ":core:metadata.jvm",
+        ":core:deserialization.common",
+        ":core:deserialization.common.jvm",
         ":core:util.runtime",
         ":compiler:compiler.version",
         ":dependencies:android-sdk",