From 4f7103b2a15571045c403f9667e8113f0b8479a3 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 27 Sep 2021 13:48:53 +0300 Subject: [PATCH] Add ApiVersion for 1.7 --- compiler/util/src/org/jetbrains/kotlin/config/ApiVersion.kt | 3 +++ .../gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler/util/src/org/jetbrains/kotlin/config/ApiVersion.kt b/compiler/util/src/org/jetbrains/kotlin/config/ApiVersion.kt index 4e1b4b39794..7e00626f71e 100644 --- a/compiler/util/src/org/jetbrains/kotlin/config/ApiVersion.kt +++ b/compiler/util/src/org/jetbrains/kotlin/config/ApiVersion.kt @@ -61,6 +61,9 @@ class ApiVersion private constructor( @JvmField val KOTLIN_1_6 = createByLanguageVersion(LanguageVersion.KOTLIN_1_6) + @JvmField + val KOTLIN_1_7 = createByLanguageVersion(LanguageVersion.KOTLIN_1_7) + @JvmField val LATEST: ApiVersion = createByLanguageVersion(LanguageVersion.values().last()) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt index 940cb741cae..70870f61d5c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt @@ -163,10 +163,11 @@ private val apiVersionValues = ApiVersion.run { KOTLIN_1_3, KOTLIN_1_4, KOTLIN_1_5, - KOTLIN_1_6 + KOTLIN_1_6, + KOTLIN_1_7 ) } internal fun parseLanguageVersionSetting(versionString: String) = LanguageVersion.fromVersionString(versionString) internal fun parseApiVersionSettings(versionString: String) = apiVersionValues.find { it.versionString == versionString } -internal fun parseLanguageFeature(featureName: String) = LanguageFeature.fromString(featureName) \ No newline at end of file +internal fun parseLanguageFeature(featureName: String) = LanguageFeature.fromString(featureName)