From 9c68f2be3666371194e54023fdafc77cd84633e9 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 24 Aug 2018 13:01:53 +0200 Subject: [PATCH] Advance metadata versions and JVM bytecode version JVM versions are increased in order to differentiate pre-1.3-M2 .class files where signatures mentioning inline classes were not mangled. Other versions are increased in case something similar will need to be detected --- .../org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt | 2 +- .../metadata/jvm/deserialization/JvmBytecodeBinaryVersion.kt | 2 +- .../kotlin/metadata/jvm/deserialization/JvmMetadataVersion.kt | 2 +- .../jetbrains/kotlin/metadata/builtins/BuiltInsBinaryVersion.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt index 524b7ced623..bf3f14073b1 100644 --- a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt +++ b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt @@ -33,7 +33,7 @@ class JsMetadataVersion(vararg numbers: Int) : BinaryVersion(*numbers) { companion object { @JvmField - val INSTANCE = JsMetadataVersion(1, 2, 3) + val INSTANCE = JsMetadataVersion(1, 2, 4) @JvmField val INVALID_VERSION = JsMetadataVersion() diff --git a/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/JvmBytecodeBinaryVersion.kt b/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/JvmBytecodeBinaryVersion.kt index d472e47f163..eb4d4ab1eae 100644 --- a/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/JvmBytecodeBinaryVersion.kt +++ b/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/JvmBytecodeBinaryVersion.kt @@ -16,7 +16,7 @@ class JvmBytecodeBinaryVersion(vararg numbers: Int) : BinaryVersion(*numbers) { companion object { @JvmField - val INSTANCE = JvmBytecodeBinaryVersion(1, 0, 2) + val INSTANCE = JvmBytecodeBinaryVersion(1, 0, 3) @JvmField val INVALID_VERSION = JvmBytecodeBinaryVersion() diff --git a/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/JvmMetadataVersion.kt b/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/JvmMetadataVersion.kt index 57aea09782c..6c8df190766 100644 --- a/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/JvmMetadataVersion.kt +++ b/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/JvmMetadataVersion.kt @@ -18,7 +18,7 @@ class JvmMetadataVersion(vararg numbers: Int) : BinaryVersion(*numbers) { companion object { @JvmField - val INSTANCE = JvmMetadataVersion(1, 1, 11) + val INSTANCE = JvmMetadataVersion(1, 1, 12) @JvmField val INVALID_VERSION = JvmMetadataVersion() diff --git a/core/metadata/src/org/jetbrains/kotlin/metadata/builtins/BuiltInsBinaryVersion.kt b/core/metadata/src/org/jetbrains/kotlin/metadata/builtins/BuiltInsBinaryVersion.kt index 93f4fced132..d59e193637f 100644 --- a/core/metadata/src/org/jetbrains/kotlin/metadata/builtins/BuiltInsBinaryVersion.kt +++ b/core/metadata/src/org/jetbrains/kotlin/metadata/builtins/BuiltInsBinaryVersion.kt @@ -19,7 +19,7 @@ class BuiltInsBinaryVersion(vararg numbers: Int) : BinaryVersion(*numbers) { companion object { @JvmField - val INSTANCE = BuiltInsBinaryVersion(1, 0, 4) + val INSTANCE = BuiltInsBinaryVersion(1, 0, 5) @JvmField val INVALID_VERSION = BuiltInsBinaryVersion()