Use JvmMetadataVersion/JvmBytecodeBinaryVersion in kotlinx-metadata

#KT-23198
This commit is contained in:
Alexander Udalov
2018-05-16 12:21:14 +02:00
parent ffa6b6233b
commit c87218ac6c
5 changed files with 12 additions and 14 deletions
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.load.kotlin
import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion
import org.jetbrains.kotlin.metadata.jvm.deserialization.ModuleMapping
import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfiguration
@@ -17,7 +16,6 @@ fun ModuleMapping.Companion.loadModuleMapping(
loadModuleMapping(
bytes,
debugName,
{ version -> JvmMetadataVersion(*version).isCompatible() },
configuration.skipMetadataVersionCheck,
configuration.isJvmPackageNameSupported
)
@@ -33,7 +33,6 @@ class ModuleMapping private constructor(
fun loadModuleMapping(
bytes: ByteArray?,
debugName: String,
isVersionCompatible: (IntArray) -> Boolean,
skipMetadataVersionCheck: Boolean,
isJvmPackageNameSupported: Boolean
): ModuleMapping {
@@ -50,7 +49,7 @@ class ModuleMapping private constructor(
return CORRUPTED
}
if (skipMetadataVersionCheck || isVersionCompatible(versionNumber)) {
if (skipMetadataVersionCheck || JvmMetadataVersion(*versionNumber).isCompatible()) {
val moduleProto = JvmModuleProtoBuf.Module.parseFrom(stream) ?: return EMPTY
val result = linkedMapOf<String, PackageParts>()