From 7ecab7f0aa22799ede0eeb8275145a221c2377f8 Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Fri, 24 Jan 2020 16:19:08 +0300 Subject: [PATCH] Pass proper metadata_version in K2MetadataKlibSerializer Otherwise newer IDE Plugins will think that it's an old klib and will refuse to analyze against it --- .../jetbrains/kotlin/cli/metadata/K2MetadataKlibSerializer.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/K2MetadataKlibSerializer.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/K2MetadataKlibSerializer.kt index 1a7791c08b6..66f365ccb1f 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/K2MetadataKlibSerializer.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/K2MetadataKlibSerializer.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.analyzer.common.CommonDependenciesContainer import org.jetbrains.kotlin.analyzer.common.CommonPlatformAnalyzerServices import org.jetbrains.kotlin.backend.common.serialization.DescriptorTable import org.jetbrains.kotlin.backend.common.serialization.metadata.KlibMetadataMonolithicSerializer +import org.jetbrains.kotlin.backend.common.serialization.metadata.KlibMetadataVersion import org.jetbrains.kotlin.builtins.DefaultBuiltIns import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment @@ -79,7 +80,7 @@ internal class K2MetadataKlibSerializer(private val metadataVersion: BuiltInsBin abiVersion = KotlinAbiVersion.CURRENT, libraryVersion = null, compilerVersion = KotlinCompilerVersion.getVersion(), - metadataVersion = null, + metadataVersion = KlibMetadataVersion.INSTANCE.toString(), irVersion = null )