diff --git a/compiler/testData/cli/jvm/apiAndLanguageVersionsUnsupported.out b/compiler/testData/cli/jvm/apiAndLanguageVersionsUnsupported.out index 4bb5d5b4b2c..58a0033b730 100644 --- a/compiler/testData/cli/jvm/apiAndLanguageVersionsUnsupported.out +++ b/compiler/testData/cli/jvm/apiAndLanguageVersionsUnsupported.out @@ -1,2 +1,2 @@ -error: language version 1.1 is no longer supported; please, use version 1.4 or greater. +error: language version 1.1 is no longer supported; please, use version 1.3 or greater. COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/apiVersionInvalid.out b/compiler/testData/cli/jvm/apiVersionInvalid.out index 03e34c3f22e..ae650abee8f 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.4 (DEPRECATED), 1.5, 1.6, 1.7 (EXPERIMENTAL), 1.8 (EXPERIMENTAL), 1.9 (EXPERIMENTAL) +Supported API versions: 1.3 (DEPRECATED), 1.4 (DEPRECATED), 1.5, 1.6, 1.7 (EXPERIMENTAL), 1.8 (EXPERIMENTAL), 1.9 (EXPERIMENTAL) COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/deprecatedLanguageUnsupportedApi.out b/compiler/testData/cli/jvm/deprecatedLanguageUnsupportedApi.out index e9fa4e495bc..8a2d8464d6e 100644 --- a/compiler/testData/cli/jvm/deprecatedLanguageUnsupportedApi.out +++ b/compiler/testData/cli/jvm/deprecatedLanguageUnsupportedApi.out @@ -1,2 +1,2 @@ -error: language version 1.2 is no longer supported; please, use version 1.4 or greater. +error: language version 1.2 is no longer supported; please, use version 1.3 or greater. COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/languageVersionInvalid.out b/compiler/testData/cli/jvm/languageVersionInvalid.out index 2cce7fbff3d..1c34775732c 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.4 (DEPRECATED), 1.5, 1.6, 1.7 (EXPERIMENTAL), 1.8 (EXPERIMENTAL), 1.9 (EXPERIMENTAL) +Supported language versions: 1.3 (DEPRECATED), 1.4 (DEPRECATED), 1.5, 1.6, 1.7 (EXPERIMENTAL), 1.8 (EXPERIMENTAL), 1.9 (EXPERIMENTAL) COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/languageVersionUnsupported.out b/compiler/testData/cli/jvm/languageVersionUnsupported.out index 4bb5d5b4b2c..58a0033b730 100644 --- a/compiler/testData/cli/jvm/languageVersionUnsupported.out +++ b/compiler/testData/cli/jvm/languageVersionUnsupported.out @@ -1,2 +1,2 @@ -error: language version 1.1 is no longer supported; please, use version 1.4 or greater. +error: language version 1.1 is no longer supported; please, use version 1.3 or greater. 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 1c18e3abe29..200b083caee 100644 --- a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt +++ b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt @@ -394,15 +394,15 @@ enum class LanguageVersion(val major: Int, val minor: Int) : DescriptionAware, L str.split(".", "-").let { if (it.size >= 2) fromVersionString("${it[0]}.${it[1]}") else null } // Version status - // 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 - // Language: UNSUPPORTED -------> DEPRECATED -> STABLE ---> EXPERIMENTAL + // 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 + // Language: UNSUPPORTED --> DEPRECATED ------> STABLE ---> EXPERIMENTAL // API: UNSUPPORTED --> DEPRECATED ------> STABLE ---> EXPERIMENTAL @JvmField val FIRST_API_SUPPORTED = KOTLIN_1_3 @JvmField - val FIRST_SUPPORTED = KOTLIN_1_4 + val FIRST_SUPPORTED = KOTLIN_1_3 @JvmField val FIRST_NON_DEPRECATED = KOTLIN_1_5 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 425044dfeb7..a874f8c8a2b 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 @@ -14,7 +14,7 @@ interface KotlinCommonOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonToo /** * Provide source compatibility with the specified version of Kotlin - * Possible values: "1.4 (DEPRECATED)", "1.5", "1.6", "1.7 (EXPERIMENTAL)", "1.8 (EXPERIMENTAL)", "1.9 (EXPERIMENTAL)" + * Possible values: "1.3 (DEPRECATED)", "1.4 (DEPRECATED)", "1.5", "1.6", "1.7 (EXPERIMENTAL)", "1.8 (EXPERIMENTAL)", "1.9 (EXPERIMENTAL)" * Default value: null */ var languageVersion: kotlin.String?