From 19d287f288fdb19b510ab24b9dae80c04db88ede Mon Sep 17 00:00:00 2001 From: Vadim Mishenev Date: Tue, 18 Jul 2023 22:33:24 +0300 Subject: Update Kotlin compiler to 1.8.20 (#3062) --- .../dokka/analysis/kotlin/descriptors/ide/IdeKLibService.kt | 2 +- .../kotlin/org/jetbrains/kotlin/idea/klib/KlibCompatibilityInfo.kt | 6 +++--- .../org/jetbrains/kotlin/idea/klib/KlibLoadingMetadataCache.kt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'subprojects/analysis-kotlin-descriptors/ide/src') diff --git a/subprojects/analysis-kotlin-descriptors/ide/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/descriptors/ide/IdeKLibService.kt b/subprojects/analysis-kotlin-descriptors/ide/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/descriptors/ide/IdeKLibService.kt index a0416375..47fefe11 100644 --- a/subprojects/analysis-kotlin-descriptors/ide/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/descriptors/ide/IdeKLibService.kt +++ b/subprojects/analysis-kotlin-descriptors/ide/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/descriptors/ide/IdeKLibService.kt @@ -1,7 +1,7 @@ package org.jetbrains.dokka.analysis.kotlin.descriptors.ide import org.jetbrains.dokka.analysis.kotlin.descriptors.compiler.KLibService -import org.jetbrains.kotlin.backend.common.serialization.metadata.KlibMetadataModuleDescriptorFactory +import org.jetbrains.kotlin.library.metadata.KlibMetadataModuleDescriptorFactory import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.PackageFragmentProvider diff --git a/subprojects/analysis-kotlin-descriptors/ide/src/main/kotlin/org/jetbrains/kotlin/idea/klib/KlibCompatibilityInfo.kt b/subprojects/analysis-kotlin-descriptors/ide/src/main/kotlin/org/jetbrains/kotlin/idea/klib/KlibCompatibilityInfo.kt index 9f94f249..4923534d 100644 --- a/subprojects/analysis-kotlin-descriptors/ide/src/main/kotlin/org/jetbrains/kotlin/idea/klib/KlibCompatibilityInfo.kt +++ b/subprojects/analysis-kotlin-descriptors/ide/src/main/kotlin/org/jetbrains/kotlin/idea/klib/KlibCompatibilityInfo.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.idea.klib import org.jetbrains.kotlin.library.* -import org.jetbrains.kotlin.backend.common.serialization.metadata.KlibMetadataVersion -import org.jetbrains.kotlin.backend.common.serialization.metadata.metadataVersion +import org.jetbrains.kotlin.library.metadata.KlibMetadataVersion +import org.jetbrains.kotlin.library.metadata.metadataVersion import java.io.IOException /** @@ -30,7 +30,7 @@ internal val KotlinLibrary.compatibilityInfo: KlibCompatibilityInfo if (hasPre14Manifest) return KlibCompatibilityInfo.Pre14Layout - val metadataVersion = safeRead(null) { metadataVersion } + val metadataVersion = safeRead(null) { this.metadataVersion } @Suppress("DEPRECATION") return when { metadataVersion == null -> { diff --git a/subprojects/analysis-kotlin-descriptors/ide/src/main/kotlin/org/jetbrains/kotlin/idea/klib/KlibLoadingMetadataCache.kt b/subprojects/analysis-kotlin-descriptors/ide/src/main/kotlin/org/jetbrains/kotlin/idea/klib/KlibLoadingMetadataCache.kt index 9740e8bc..55c615f6 100644 --- a/subprojects/analysis-kotlin-descriptors/ide/src/main/kotlin/org/jetbrains/kotlin/idea/klib/KlibLoadingMetadataCache.kt +++ b/subprojects/analysis-kotlin-descriptors/ide/src/main/kotlin/org/jetbrains/kotlin/idea/klib/KlibLoadingMetadataCache.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.library.KLIB_MANIFEST_FILE_NAME import org.jetbrains.kotlin.library.KLIB_METADATA_FILE_EXTENSION import org.jetbrains.kotlin.library.KLIB_MODULE_METADATA_FILE_NAME import org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf -import org.jetbrains.kotlin.backend.common.serialization.metadata.KlibMetadataVersion +import org.jetbrains.kotlin.library.metadata.KlibMetadataVersion import org.jetbrains.kotlin.library.metadata.parseModuleHeader import org.jetbrains.kotlin.library.metadata.parsePackageFragment import org.jetbrains.kotlin.library.readKonanLibraryVersioning -- cgit