Introduce new modules for common parts of deserialization

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"))