From a6cdf27204871a27784320b385b2d5ebeb1cab0c Mon Sep 17 00:00:00 2001 From: Leonid Startsev Date: Thu, 15 Feb 2024 17:52:42 +0100 Subject: [PATCH] Fix compilation of :tools:kotlinp-klib and related projects Conflicting PRs https://jetbrains.team/p/kt/reviews/14253 and https://jetbrains.team/p/kt/reviews/14384/files were merged too close to each other for Safe-Merge to catch the problem and therefore resulted in compilation error. --- kotlin-native/klib/build.gradle.kts | 2 +- .../kotlin/cli/klib/KotlinpBasedMetadataDumper.kt | 10 +++++----- libraries/tools/kotlinp/klib/build.gradle.kts | 4 ++-- .../kotlin/kotlinp/klib/DeclarationIdOverMetadata.kt | 2 +- .../kotlin/kotlinp/klib/ExternalSignatureComputer.kt | 2 +- .../org/jetbrains/kotlin/kotlinp/klib/KlibKotlinp.kt | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/kotlin-native/klib/build.gradle.kts b/kotlin-native/klib/build.gradle.kts index 3a5f1042331..dff7d8ba4d1 100644 --- a/kotlin-native/klib/build.gradle.kts +++ b/kotlin-native/klib/build.gradle.kts @@ -20,7 +20,7 @@ dependencies { implementation(project(":kotlin-util-klib-abi")) implementation(project(":tools:kotlinp-klib")) implementation(project(":kotlinx-metadata-klib")) { isTransitive = false } - implementation(project(":kotlinx-metadata")) { isTransitive = false } + implementation(project(":kotlin-metadata")) { isTransitive = false } } tasks.withType> { diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KotlinpBasedMetadataDumper.kt b/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KotlinpBasedMetadataDumper.kt index e554f7c8dd9..48280f5bffc 100644 --- a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KotlinpBasedMetadataDumper.kt +++ b/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KotlinpBasedMetadataDumper.kt @@ -5,11 +5,11 @@ package org.jetbrains.kotlin.cli.klib -import kotlinx.metadata.KmConstructor -import kotlinx.metadata.KmFunction -import kotlinx.metadata.KmPackage -import kotlinx.metadata.KmProperty -import kotlinx.metadata.internal.common.KmModuleFragment +import kotlin.metadata.KmConstructor +import kotlin.metadata.KmFunction +import kotlin.metadata.KmPackage +import kotlin.metadata.KmProperty +import kotlin.metadata.internal.common.KmModuleFragment import kotlinx.metadata.klib.KlibModuleMetadata import kotlinx.metadata.klib.className import kotlinx.metadata.klib.fqName diff --git a/libraries/tools/kotlinp/klib/build.gradle.kts b/libraries/tools/kotlinp/klib/build.gradle.kts index b45e7bf92ec..8b6192632c0 100644 --- a/libraries/tools/kotlinp/klib/build.gradle.kts +++ b/libraries/tools/kotlinp/klib/build.gradle.kts @@ -4,14 +4,14 @@ plugins { } dependencies { - compileOnly(project(":kotlinx-metadata")) + compileOnly(project(":kotlin-metadata")) compileOnly(project(":kotlinx-metadata-klib")) api(project(":tools:kotlinp")) testApi(intellijCore()) - testCompileOnly(project(":kotlinx-metadata")) + testCompileOnly(project(":kotlin-metadata")) testCompileOnly(project(":kotlinx-metadata-klib")) testImplementation(libs.junit4) diff --git a/libraries/tools/kotlinp/klib/src/org/jetbrains/kotlin/kotlinp/klib/DeclarationIdOverMetadata.kt b/libraries/tools/kotlinp/klib/src/org/jetbrains/kotlin/kotlinp/klib/DeclarationIdOverMetadata.kt index ec31b3a685e..95c5e496f88 100644 --- a/libraries/tools/kotlinp/klib/src/org/jetbrains/kotlin/kotlinp/klib/DeclarationIdOverMetadata.kt +++ b/libraries/tools/kotlinp/klib/src/org/jetbrains/kotlin/kotlinp/klib/DeclarationIdOverMetadata.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.kotlinp.klib -import kotlinx.metadata.* +import kotlin.metadata.* import kotlinx.metadata.klib.KlibEnumEntry import org.jetbrains.kotlin.kotlinp.klib.TypeArgumentId.VarianceId diff --git a/libraries/tools/kotlinp/klib/src/org/jetbrains/kotlin/kotlinp/klib/ExternalSignatureComputer.kt b/libraries/tools/kotlinp/klib/src/org/jetbrains/kotlin/kotlinp/klib/ExternalSignatureComputer.kt index 23f269eb2da..1b646d97264 100644 --- a/libraries/tools/kotlinp/klib/src/org/jetbrains/kotlin/kotlinp/klib/ExternalSignatureComputer.kt +++ b/libraries/tools/kotlinp/klib/src/org/jetbrains/kotlin/kotlinp/klib/ExternalSignatureComputer.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.kotlinp.klib -import kotlinx.metadata.* +import kotlin.metadata.* import kotlinx.metadata.klib.KlibEnumEntry import kotlinx.metadata.klib.KlibModuleMetadata import kotlinx.metadata.klib.fqName diff --git a/libraries/tools/kotlinp/klib/src/org/jetbrains/kotlin/kotlinp/klib/KlibKotlinp.kt b/libraries/tools/kotlinp/klib/src/org/jetbrains/kotlin/kotlinp/klib/KlibKotlinp.kt index 31b2ea3dac4..bf3bfe7f4c8 100644 --- a/libraries/tools/kotlinp/klib/src/org/jetbrains/kotlin/kotlinp/klib/KlibKotlinp.kt +++ b/libraries/tools/kotlinp/klib/src/org/jetbrains/kotlin/kotlinp/klib/KlibKotlinp.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.kotlinp.klib -import kotlinx.metadata.* -import kotlinx.metadata.internal.common.KmModuleFragment +import kotlin.metadata.* +import kotlin.metadata.internal.common.KmModuleFragment import kotlinx.metadata.klib.* import org.jetbrains.kotlin.kotlinp.Kotlinp import org.jetbrains.kotlin.kotlinp.Settings