From 25a06bdc566d833e57e1b7df7fb8e13017138557 Mon Sep 17 00:00:00 2001 From: Victor Petukhov Date: Tue, 22 Mar 2022 09:02:10 +0300 Subject: [PATCH] [Compiler CLI] Make language version description not in capital letters ^KT-51673 Fixed --- compiler/testData/cli/jvm/apiVersionInvalid.out | 2 +- compiler/testData/cli/jvm/languageVersionInvalid.out | 2 +- .../org/jetbrains/kotlin/config/LanguageVersionSettings.kt | 6 +++--- .../org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/compiler/testData/cli/jvm/apiVersionInvalid.out b/compiler/testData/cli/jvm/apiVersionInvalid.out index 7c8cfb4bd93..f9406fbf0ee 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.3 (DEPRECATED), 1.4 (DEPRECATED), 1.5, 1.6, 1.7, 1.8 (EXPERIMENTAL), 1.9 (EXPERIMENTAL) +Supported API versions: 1.3 (deprecated), 1.4 (deprecated), 1.5, 1.6, 1.7, 1.8 (experimental), 1.9 (experimental) COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/languageVersionInvalid.out b/compiler/testData/cli/jvm/languageVersionInvalid.out index 990f865d115..b9361f1dc4b 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.3 (DEPRECATED), 1.4 (DEPRECATED), 1.5, 1.6, 1.7, 1.8 (EXPERIMENTAL), 1.9 (EXPERIMENTAL) +Supported language versions: 1.3 (deprecated), 1.4 (deprecated), 1.5, 1.6, 1.7, 1.8 (experimental), 1.9 (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 ed5bb6d5ffc..64aa1de6837 100644 --- a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt +++ b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt @@ -434,9 +434,9 @@ interface LanguageOrApiVersion : DescriptionAware { override val description: String get() = when { - !isStable -> "$versionString (EXPERIMENTAL)" - isDeprecated -> "$versionString (DEPRECATED)" - isUnsupported -> "$versionString (UNSUPPORTED)" + !isStable -> "$versionString (experimental)" + isDeprecated -> "$versionString (deprecated)" + isUnsupported -> "$versionString (unsupported)" else -> versionString } } diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt index 4e0525d0b29..38569e4f1bc 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt @@ -7,14 +7,14 @@ interface KotlinCommonOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonToo /** * Allow using declarations only from the specified version of bundled libraries - * Possible values: "1.3 (DEPRECATED)", "1.4 (DEPRECATED)", "1.5", "1.6", "1.7", "1.8 (EXPERIMENTAL)", "1.9 (EXPERIMENTAL)" + * Possible values: "1.3 (deprecated)", "1.4 (deprecated)", "1.5", "1.6", "1.7", "1.8 (experimental)", "1.9 (experimental)" * Default value: null */ var apiVersion: kotlin.String? /** * Provide source compatibility with the specified version of Kotlin - * Possible values: "1.3 (DEPRECATED)", "1.4 (DEPRECATED)", "1.5", "1.6", "1.7", "1.8 (EXPERIMENTAL)", "1.9 (EXPERIMENTAL)" + * Possible values: "1.3 (deprecated)", "1.4 (deprecated)", "1.5", "1.6", "1.7", "1.8 (experimental)", "1.9 (experimental)" * Default value: null */ var languageVersion: kotlin.String?