Merge :core:deserialization:deserialization.common into :core:descriptors.common

build.gradle.kts

@@ -270,7 +270,6 @@ extra["compilerModules"] = arrayOf(
     ":core:descriptors.jvm",
     ":core:descriptors.runtime",
     ":core:deserialization",
-    ":core:deserialization:deserialization.common",
     ":core:util.runtime",
     ":core:type-system",
     ":compiler:fir:cones",

compiler/fir/tree/build.gradle.kts

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

compiler/fir/tree/tree-generator/build.gradle.kts

@@ -11,7 +11,6 @@ val compileOnly by configurations
 runtimeOnly.extendsFrom(compileOnly)
 
 dependencies {
-    implementation(project(":core:deserialization:deserialization.common"))
     implementation(project(":core:descriptors.common"))
     implementation(project(":compiler:frontend.common"))
     implementation(project(":compiler:fir:cones"))

core/descriptors.common/src/org/jetbrains/kotlin/serialization/deserialization/IncompatibleVersionErrorData.kt

@@ -5,10 +5,9 @@
 
 package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.kotlin.metadata.deserialization.BinaryVersion
 import org.jetbrains.kotlin.name.ClassId
 
-data class IncompatibleVersionErrorData<out T : BinaryVersion>(
+data class IncompatibleVersionErrorData<out T>(
     val actualVersion: T,
     val expectedVersion: T,
     val filePath: String,

core/descriptors/build.gradle.kts

@@ -12,7 +12,6 @@ dependencies {
     compile(project(":core:type-system"))
     compile(kotlinStdlib())
     compile(project(":kotlin-annotations-jvm"))
-    api(project(":core:deserialization:deserialization.common"))
 }
 
 sourceSets {

core/deserialization/build.gradle.kts

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

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

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

libraries/reflect/build.gradle.kts

@@ -52,7 +52,6 @@ dependencies {
     embedded(project(":core:descriptors.common"))
     embedded(project(":core:descriptors.jvm"))
     embedded(project(":core:deserialization"))
-    embedded(project(":core:deserialization:deserialization.common"))
     embedded(project(":core:descriptors.runtime"))
     embedded(project(":core:util.runtime"))
     embedded("javax.inject:javax.inject:1")

settings.gradle

@@ -138,7 +138,6 @@ include ":benchmarks",
         ":core:type-system",
         ":core:descriptors.jvm",
         ":core:deserialization",
-        ":core:deserialization:deserialization.common",
         ":core:descriptors.runtime",
         ":core:metadata",
         ":core:metadata.jvm",