From 968c9c203442f9999e080081658f55c35a648a16 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 5 May 2017 22:15:38 +0300 Subject: [PATCH] Set LATEST_STABLE language version and current version of stdlib to 1.2 --- .../src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt | 2 +- libraries/stdlib/src/kotlin/util/KotlinVersion.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt index f859963276a..998ab5708e3 100644 --- a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt +++ b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt @@ -123,7 +123,7 @@ enum class LanguageVersion(val major: Int, val minor: Int) : DescriptionAware { fun fromFullVersionString(str: String) = str.split(".", "-").let { if (it.size >= 2) fromVersionString("${it[0]}.${it[1]}") else null } @JvmField - val LATEST_STABLE = KOTLIN_1_1 + val LATEST_STABLE = KOTLIN_1_2 } } diff --git a/libraries/stdlib/src/kotlin/util/KotlinVersion.kt b/libraries/stdlib/src/kotlin/util/KotlinVersion.kt index a056e1f0a31..9594db9740c 100644 --- a/libraries/stdlib/src/kotlin/util/KotlinVersion.kt +++ b/libraries/stdlib/src/kotlin/util/KotlinVersion.kt @@ -70,6 +70,6 @@ public class KotlinVersion(val major: Int, val minor: Int, val patch: Int) : Com */ // TODO: get from metadata or hardcode automatically during build @kotlin.jvm.JvmField - public val CURRENT: KotlinVersion = KotlinVersion(1, 1, 60) + public val CURRENT: KotlinVersion = KotlinVersion(1, 2, 0) } }