From 5fa80a2f8c94e2265fa8ac2eeefa881651b1c27d Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Thu, 20 Aug 2020 13:49:22 +0300 Subject: [PATCH] Merge :core:deserialization:deserialization.common into :core:descriptors.common --- build.gradle.kts | 1 - compiler/fir/tree/build.gradle.kts | 1 - .../fir/tree/tree-generator/build.gradle.kts | 1 - .../kotlin/descriptors/SourceElement.java | 0 .../kotlin/descriptors/SourceFile.java | 0 .../IncompatibleVersionErrorData.kt | 3 +-- .../DeserializedContainerSource.kt | 0 core/descriptors/build.gradle.kts | 1 - core/deserialization/build.gradle.kts | 1 - .../deserialization.common/build.gradle.kts | 24 ------------------- libraries/reflect/build.gradle.kts | 1 - settings.gradle | 1 - 12 files changed, 1 insertion(+), 33 deletions(-) rename core/{deserialization/deserialization.common => descriptors.common}/src/org/jetbrains/kotlin/descriptors/SourceElement.java (100%) rename core/{deserialization/deserialization.common => descriptors.common}/src/org/jetbrains/kotlin/descriptors/SourceFile.java (100%) rename core/{deserialization/deserialization.common => descriptors.common}/src/org/jetbrains/kotlin/serialization/deserialization/IncompatibleVersionErrorData.kt (76%) rename core/{deserialization/deserialization.common => descriptors.common}/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedContainerSource.kt (100%) delete mode 100644 core/deserialization/deserialization.common/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts index 7088e8d4241..73bc7669d39 100644 --- a/build.gradle.kts +++ b/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", diff --git a/compiler/fir/tree/build.gradle.kts b/compiler/fir/tree/build.gradle.kts index 4dd926a7d43..56f2560052a 100644 --- a/compiler/fir/tree/build.gradle.kts +++ b/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")) diff --git a/compiler/fir/tree/tree-generator/build.gradle.kts b/compiler/fir/tree/tree-generator/build.gradle.kts index ed8f2a8ff16..f6308cad0cd 100644 --- a/compiler/fir/tree/tree-generator/build.gradle.kts +++ b/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")) diff --git a/core/deserialization/deserialization.common/src/org/jetbrains/kotlin/descriptors/SourceElement.java b/core/descriptors.common/src/org/jetbrains/kotlin/descriptors/SourceElement.java similarity index 100% rename from core/deserialization/deserialization.common/src/org/jetbrains/kotlin/descriptors/SourceElement.java rename to core/descriptors.common/src/org/jetbrains/kotlin/descriptors/SourceElement.java diff --git a/core/deserialization/deserialization.common/src/org/jetbrains/kotlin/descriptors/SourceFile.java b/core/descriptors.common/src/org/jetbrains/kotlin/descriptors/SourceFile.java similarity index 100% rename from core/deserialization/deserialization.common/src/org/jetbrains/kotlin/descriptors/SourceFile.java rename to core/descriptors.common/src/org/jetbrains/kotlin/descriptors/SourceFile.java diff --git a/core/deserialization/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/IncompatibleVersionErrorData.kt b/core/descriptors.common/src/org/jetbrains/kotlin/serialization/deserialization/IncompatibleVersionErrorData.kt similarity index 76% rename from core/deserialization/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/IncompatibleVersionErrorData.kt rename to core/descriptors.common/src/org/jetbrains/kotlin/serialization/deserialization/IncompatibleVersionErrorData.kt index dab27ed98c3..dd8bab6d6c1 100644 --- a/core/deserialization/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/IncompatibleVersionErrorData.kt +++ b/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( +data class IncompatibleVersionErrorData( val actualVersion: T, val expectedVersion: T, val filePath: String, diff --git a/core/deserialization/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedContainerSource.kt b/core/descriptors.common/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedContainerSource.kt similarity index 100% rename from core/deserialization/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedContainerSource.kt rename to core/descriptors.common/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedContainerSource.kt diff --git a/core/descriptors/build.gradle.kts b/core/descriptors/build.gradle.kts index 35bb1bf02fb..3e2ef190a28 100644 --- a/core/descriptors/build.gradle.kts +++ b/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 { diff --git a/core/deserialization/build.gradle.kts b/core/deserialization/build.gradle.kts index 9df80b4ae35..e6c0e6dc127 100644 --- a/core/deserialization/build.gradle.kts +++ b/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")) } diff --git a/core/deserialization/deserialization.common/build.gradle.kts b/core/deserialization/deserialization.common/build.gradle.kts deleted file mode 100644 index 7fcee07160b..00000000000 --- a/core/deserialization/deserialization.common/build.gradle.kts +++ /dev/null @@ -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 { - sourceCompatibility = "1.6" - targetCompatibility = "1.6" -} diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts index c61c5ef801e..6f9cea2361c 100644 --- a/libraries/reflect/build.gradle.kts +++ b/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") diff --git a/settings.gradle b/settings.gradle index 9c65070dde6..5a7092c38fb 100644 --- a/settings.gradle +++ b/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",