From 36d2129fd3fc45524d34805ee86079df3b2d5166 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Wed, 9 Sep 2020 13:15:54 +0300
Subject: [PATCH] Move common deserialization classes from :core:metadata
 modules

---
 .../src/org/jetbrains/kotlin/SpecialJvmAnnotations.kt            | 0
 .../src/org/jetbrains/kotlin/load/kotlin/JvmPackagePartSource.kt | 0
 .../src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.kt    | 0
 .../src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.kt | 0
 .../jetbrains/kotlin/load/kotlin/KotlinJvmBinarySourceElement.kt | 0
 .../src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt      | 0
 .../src/org/jetbrains/kotlin/load/kotlin/PackagePartProvider.kt  | 0
 .../org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt | 0
 .../kotlin/serialization/SerializerExtensionProtocol.kt          | 0
 .../jetbrains/kotlin/serialization/deserialization/ClassData.kt  | 0
 .../kotlin/serialization/deserialization/ClassDataFinder.java    | 0
 .../kotlin/serialization/deserialization/NameResolverUtil.kt     | 0
 .../serialization/deserialization/ProtoBasedClassDataFinder.kt   | 0
 .../kotlin/serialization/deserialization/ProtoEnumFlags.kt       | 0
 .../deserialization/builtins/BuiltInSerializerProtocol.kt        | 0
 core/metadata.jvm/build.gradle.kts                               | 1 -
 core/metadata/build.gradle.kts                                   | 1 -
 17 files changed, 2 deletions(-)
 rename core/{metadata.jvm => deserialization.common.jvm}/src/org/jetbrains/kotlin/SpecialJvmAnnotations.kt (100%)
 rename core/{metadata.jvm => deserialization.common.jvm}/src/org/jetbrains/kotlin/load/kotlin/JvmPackagePartSource.kt (100%)
 rename core/{metadata.jvm => deserialization.common.jvm}/src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.kt (100%)
 rename core/{metadata.jvm => deserialization.common.jvm}/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.kt (100%)
 rename core/{metadata.jvm => deserialization.common.jvm}/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinarySourceElement.kt (100%)
 rename core/{metadata.jvm => deserialization.common.jvm}/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt (100%)
 rename core/{metadata.jvm => deserialization.common.jvm}/src/org/jetbrains/kotlin/load/kotlin/PackagePartProvider.kt (100%)
 rename core/{metadata.jvm => deserialization.common.jvm}/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt (100%)
 rename core/{metadata => deserialization.common}/src/org/jetbrains/kotlin/serialization/SerializerExtensionProtocol.kt (100%)
 rename core/{metadata => deserialization.common}/src/org/jetbrains/kotlin/serialization/deserialization/ClassData.kt (100%)
 rename core/{metadata => deserialization.common}/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.java (100%)
 rename core/{metadata => deserialization.common}/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverUtil.kt (100%)
 rename core/{metadata => deserialization.common}/src/org/jetbrains/kotlin/serialization/deserialization/ProtoBasedClassDataFinder.kt (100%)
 rename core/{metadata => deserialization.common}/src/org/jetbrains/kotlin/serialization/deserialization/ProtoEnumFlags.kt (100%)
 rename core/{metadata => deserialization.common}/src/org/jetbrains/kotlin/serialization/deserialization/builtins/BuiltInSerializerProtocol.kt (100%)

diff --git a/core/metadata.jvm/src/org/jetbrains/kotlin/SpecialJvmAnnotations.kt b/core/deserialization.common.jvm/src/org/jetbrains/kotlin/SpecialJvmAnnotations.kt
similarity index 100%
rename from core/metadata.jvm/src/org/jetbrains/kotlin/SpecialJvmAnnotations.kt
rename to core/deserialization.common.jvm/src/org/jetbrains/kotlin/SpecialJvmAnnotations.kt
diff --git a/core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmPackagePartSource.kt b/core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmPackagePartSource.kt
similarity index 100%
rename from core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmPackagePartSource.kt
rename to core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmPackagePartSource.kt
diff --git a/core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.kt b/core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.kt
similarity index 100%
rename from core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.kt
rename to core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.kt
diff --git a/core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.kt b/core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.kt
similarity index 100%
rename from core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.kt
rename to core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.kt
diff --git a/core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinarySourceElement.kt b/core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinarySourceElement.kt
similarity index 100%
rename from core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinarySourceElement.kt
rename to core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinarySourceElement.kt
diff --git a/core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt b/core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt
similarity index 100%
rename from core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt
rename to core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt
diff --git a/core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/PackagePartProvider.kt b/core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/PackagePartProvider.kt
similarity index 100%
rename from core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/PackagePartProvider.kt
rename to core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/PackagePartProvider.kt
diff --git a/core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt b/core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt
similarity index 100%
rename from core/metadata.jvm/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt
rename to core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt
diff --git a/core/metadata/src/org/jetbrains/kotlin/serialization/SerializerExtensionProtocol.kt b/core/deserialization.common/src/org/jetbrains/kotlin/serialization/SerializerExtensionProtocol.kt
similarity index 100%
rename from core/metadata/src/org/jetbrains/kotlin/serialization/SerializerExtensionProtocol.kt
rename to core/deserialization.common/src/org/jetbrains/kotlin/serialization/SerializerExtensionProtocol.kt
diff --git a/core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/ClassData.kt b/core/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/ClassData.kt
similarity index 100%
rename from core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/ClassData.kt
rename to core/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/ClassData.kt
diff --git a/core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.java b/core/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.java
similarity index 100%
rename from core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.java
rename to core/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.java
diff --git a/core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverUtil.kt b/core/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverUtil.kt
similarity index 100%
rename from core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverUtil.kt
rename to core/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverUtil.kt
diff --git a/core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/ProtoBasedClassDataFinder.kt b/core/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/ProtoBasedClassDataFinder.kt
similarity index 100%
rename from core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/ProtoBasedClassDataFinder.kt
rename to core/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/ProtoBasedClassDataFinder.kt
diff --git a/core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/ProtoEnumFlags.kt b/core/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/ProtoEnumFlags.kt
similarity index 100%
rename from core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/ProtoEnumFlags.kt
rename to core/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/ProtoEnumFlags.kt
diff --git a/core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/builtins/BuiltInSerializerProtocol.kt b/core/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/builtins/BuiltInSerializerProtocol.kt
similarity index 100%
rename from core/metadata/src/org/jetbrains/kotlin/serialization/deserialization/builtins/BuiltInSerializerProtocol.kt
rename to core/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/builtins/BuiltInSerializerProtocol.kt
diff --git a/core/metadata.jvm/build.gradle.kts b/core/metadata.jvm/build.gradle.kts
index 5c420c20f77..9b76b6bfa58 100644
--- a/core/metadata.jvm/build.gradle.kts
+++ b/core/metadata.jvm/build.gradle.kts
@@ -8,7 +8,6 @@ javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
     api(project(":core:metadata"))
-    api(project(":core:compiler.common.jvm"))
 }
 
 sourceSets {
diff --git a/core/metadata/build.gradle.kts b/core/metadata/build.gradle.kts
index c1f1f6245b6..b3086b20d53 100644
--- a/core/metadata/build.gradle.kts
+++ b/core/metadata/build.gradle.kts
@@ -9,7 +9,6 @@ javaHome = rootProject.extra["JDK_16"] as String
 dependencies {
     compile(protobufLite())
     compile(kotlinStdlib())
-    api(project(":core:compiler.common"))
 }
 
 sourceSets {