From a8aa334203c43908a1c802c87b2af2c914b908d2 Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Wed, 29 Jan 2020 17:59:16 +0300 Subject: [PATCH] Fix API version parsing: add 1.4 to available values In Kotlin 1.3, we didn't allow setting language version to 1.4. With the default language version changed to 1.4, it worked because the language version had only been checked in the setter of the language settings, and the default value had not been checked. --- .../gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 79b8b0e6e65..21aff84cabe 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 @@ -115,7 +115,7 @@ internal fun applyLanguageSettingsToKotlinTask( } } -private val apiVersionValues = ApiVersion.run { listOf(KOTLIN_1_0, KOTLIN_1_1, KOTLIN_1_2, KOTLIN_1_3) } +private val apiVersionValues = ApiVersion.run { listOf(KOTLIN_1_0, KOTLIN_1_1, KOTLIN_1_2, KOTLIN_1_3, KOTLIN_1_4) } internal fun parseLanguageVersionSetting(versionString: String) = LanguageVersion.fromVersionString(versionString) internal fun parseApiVersionSettings(versionString: String) = apiVersionValues.find { it.versionString == versionString }