From 268d10d3f0c1aa1b0fc0591feb81cadd86763383 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 30 Jan 2017 14:45:40 +0300 Subject: [PATCH] Advance JvmMetadataVersion to 1.1.4, change IS_PRE_RELEASE to false Kotlin 1.1 is no longer considered a pre-release --- .../src/org/jetbrains/kotlin/load/kotlin/JvmMetadataVersion.kt | 2 +- .../src/org/jetbrains/kotlin/config/KotlinCompilerVersion.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmMetadataVersion.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmMetadataVersion.kt index cf48aa525d5..26e3701e451 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmMetadataVersion.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmMetadataVersion.kt @@ -32,7 +32,7 @@ class JvmMetadataVersion(vararg numbers: Int) : BinaryVersion(*numbers) { var skipCheck: Boolean = false @JvmField - val INSTANCE = JvmMetadataVersion(1, 1, 3) + val INSTANCE = JvmMetadataVersion(1, 1, 4) @JvmField val INVALID_VERSION = JvmMetadataVersion() diff --git a/core/util.runtime/src/org/jetbrains/kotlin/config/KotlinCompilerVersion.java b/core/util.runtime/src/org/jetbrains/kotlin/config/KotlinCompilerVersion.java index 42b47022b9d..fd3ab1fef03 100644 --- a/core/util.runtime/src/org/jetbrains/kotlin/config/KotlinCompilerVersion.java +++ b/core/util.runtime/src/org/jetbrains/kotlin/config/KotlinCompilerVersion.java @@ -24,7 +24,7 @@ public class KotlinCompilerVersion { // True if this compiler is of a non-stable (EAP or Beta) version. // Binaries produced by this compiler can not be loaded by release versions of the compiler. // Change this value before and after every major release - public static final boolean IS_PRE_RELEASE = true; + public static final boolean IS_PRE_RELEASE = false; static { if (!VERSION.equals("@snapshot@") && !VERSION.contains("-") && IS_PRE_RELEASE) {