From b6feec41152b09382fd901417a4523cf3d768809 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 20 Jan 2020 13:51:39 +0100 Subject: [PATCH] Add language version 1.5 --- compiler/testData/cli/jvm/apiVersionInvalid.out | 2 +- compiler/testData/cli/jvm/languageVersionInvalid.out | 2 +- .../org/jetbrains/kotlin/config/LanguageVersionSettings.kt | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/compiler/testData/cli/jvm/apiVersionInvalid.out b/compiler/testData/cli/jvm/apiVersionInvalid.out index d34ed0e0413..6f82a36cb5f 100644 --- a/compiler/testData/cli/jvm/apiVersionInvalid.out +++ b/compiler/testData/cli/jvm/apiVersionInvalid.out @@ -1,3 +1,3 @@ error: unknown API version: 239.42 -Supported API versions: 1.0, 1.1, 1.2, 1.3, 1.4 +Supported API versions: 1.0, 1.1, 1.2, 1.3, 1.4, 1.5 (EXPERIMENTAL) COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/languageVersionInvalid.out b/compiler/testData/cli/jvm/languageVersionInvalid.out index 89c42a9061c..dbaf9764522 100644 --- a/compiler/testData/cli/jvm/languageVersionInvalid.out +++ b/compiler/testData/cli/jvm/languageVersionInvalid.out @@ -1,3 +1,3 @@ error: unknown language version: 239.42 -Supported language versions: 1.0, 1.1, 1.2, 1.3, 1.4 +Supported language versions: 1.0, 1.1, 1.2, 1.3, 1.4, 1.5 (EXPERIMENTAL) COMPILATION_ERROR diff --git a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt index 10433faa2bf..4f354dc7cbe 100644 --- a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt +++ b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt @@ -240,7 +240,9 @@ enum class LanguageVersion(val major: Int, val minor: Int) : DescriptionAware { KOTLIN_1_1(1, 1), KOTLIN_1_2(1, 2), KOTLIN_1_3(1, 3), - KOTLIN_1_4(1, 4); + KOTLIN_1_4(1, 4), + KOTLIN_1_5(1, 5), + ; val isStable: Boolean get() = this <= LATEST_STABLE