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

Add LanguageVersion and ApiVersion for 1.8

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-10-22 14:57:23 +03:00
committed by TeamCityServer
parent dbe134e8b2
commit f7bb55433d
5 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
+1
View File
@@ -402,6 +402,7 @@ class GenerationState private constructor(
this[KOTLIN_1_5] = JvmMetadataVersion(1, 5, 1) this[KOTLIN_1_5] = JvmMetadataVersion(1, 5, 1)
this[KOTLIN_1_6] = JvmMetadataVersion.INSTANCE this[KOTLIN_1_6] = JvmMetadataVersion.INSTANCE
this[KOTLIN_1_7] = JvmMetadataVersion(1, 7, 0) this[KOTLIN_1_7] = JvmMetadataVersion(1, 7, 0)
this[KOTLIN_1_8] = JvmMetadataVersion(1, 8, 0)
check(size == LanguageVersion.values().size) { check(size == LanguageVersion.values().size) {
"Please add mappings from the missing LanguageVersion instances to the corresponding JvmMetadataVersion " + "Please add mappings from the missing LanguageVersion instances to the corresponding JvmMetadataVersion " +
compiler/testData/cli/jvm/apiVersionInvalid.out
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
error: unknown API version: 239.42 error: unknown API version: 239.42
Supported API versions: 1.4 (DEPRECATED), 1.5, 1.6, 1.7 (EXPERIMENTAL) Supported API versions: 1.4 (DEPRECATED), 1.5, 1.6, 1.7 (EXPERIMENTAL), 1.8 (EXPERIMENTAL)
COMPILATION_ERROR COMPILATION_ERROR
compiler/testData/cli/jvm/languageVersionInvalid.out
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
error: unknown language version: 239.42 error: unknown language version: 239.42
Supported language versions: 1.4 (DEPRECATED), 1.5, 1.6, 1.7 (EXPERIMENTAL) Supported language versions: 1.4 (DEPRECATED), 1.5, 1.6, 1.7 (EXPERIMENTAL), 1.8 (EXPERIMENTAL)
COMPILATION_ERROR COMPILATION_ERROR
compiler/util/src/org/jetbrains/kotlin/config/ApiVersion.kt
+3
View File
@@ -57,6 +57,9 @@ class ApiVersion private constructor(
@JvmField @JvmField
val KOTLIN_1_7 = createByLanguageVersion(LanguageVersion.KOTLIN_1_7) val KOTLIN_1_7 = createByLanguageVersion(LanguageVersion.KOTLIN_1_7)
@JvmField
val KOTLIN_1_8 = createByLanguageVersion(LanguageVersion.KOTLIN_1_8)
@JvmField @JvmField
val LATEST: ApiVersion = createByLanguageVersion(LanguageVersion.values().last()) val LATEST: ApiVersion = createByLanguageVersion(LanguageVersion.values().last())
compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
+2 -1
View File
@@ -343,6 +343,7 @@ enum class LanguageVersion(val major: Int, val minor: Int) : DescriptionAware, L
KOTLIN_1_5(1, 5), KOTLIN_1_5(1, 5),
KOTLIN_1_6(1, 6), KOTLIN_1_6(1, 6),
KOTLIN_1_7(1, 7), KOTLIN_1_7(1, 7),
KOTLIN_1_8(1, 8),
; ;
override val isStable: Boolean override val isStable: Boolean
@@ -368,7 +369,7 @@ 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 } str.split(".", "-").let { if (it.size >= 2) fromVersionString("${it[0]}.${it[1]}") else null }
// Version status // Version status
// 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 // 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8
// Language: UNSUPPORTED -------> DEPRECATED -> STABLE ---> EXPERIMENTAL // Language: UNSUPPORTED -------> DEPRECATED -> STABLE ---> EXPERIMENTAL
// API: UNSUPPORTED --> DEPRECATED ------> STABLE ---> EXPERIMENTAL // API: UNSUPPORTED --> DEPRECATED ------> STABLE ---> EXPERIMENTAL