azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore support of language version 1.3

Browse Source 
#KT-50251 Fixed

(cherry picked from commit a0004ed03adc9f50f26c8b11d178afcc2abf2a9c)
This commit is contained in:
Alexander Udalov
2021-11-23 19:32:48 +01:00
parent 92c80873ba
commit 9a9a8f1999
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cli/jvm/apiAndLanguageVersionsUnsupported.out
Vendored
+1 -1
View File
@@ -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
compiler/testData/cli/jvm/apiVersionInvalid.out
Vendored
+1 -1
View File
@@ -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
compiler/testData/cli/jvm/deprecatedLanguageUnsupportedApi.out
Vendored
+1 -1
View File
@@ -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
compiler/testData/cli/jvm/languageVersionInvalid.out
Vendored
+1 -1
View File
@@ -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
compiler/testData/cli/jvm/languageVersionUnsupported.out
Vendored
+1 -1
View File
@@ -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
compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
+3 -3
View File
@@ -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
libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt
+1 -1
View File
@@ -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?