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

Introduce language version 2.1

Browse Source
This commit is contained in:
Ivan Kylchik
2023-03-15 13:03:14 +01:00
committed by Space Team
parent 668dfdd81d
commit 6bce668cac
10 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.common.jvm/src/org/jetbrains/kotlin/utils/metadataHelpers.kt
+1
View File
@@ -26,6 +26,7 @@ private val LANGUAGE_TO_METADATA_VERSION = EnumMap<LanguageVersion, JvmMetadataV
this[LanguageVersion.KOTLIN_1_8] = JvmMetadataVersion(1, 8, 0)
this[LanguageVersion.KOTLIN_1_9] = JvmMetadataVersion.INSTANCE
this[LanguageVersion.KOTLIN_2_0] = JvmMetadataVersion(2, 0, 0)
this[LanguageVersion.KOTLIN_2_1] = JvmMetadataVersion(2, 1, 0)
check(size == LanguageVersion.values().size) {
"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
Supported API versions: 1.4 (deprecated), 1.5 (deprecated), 1.6, 1.7, 1.8, 1.9, 2.0 (experimental)
Supported API versions: 1.4 (deprecated), 1.5 (deprecated), 1.6, 1.7, 1.8, 1.9, 2.0 (experimental), 2.1 (experimental)
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 (deprecated), 1.6, 1.7, 1.8, 1.9, 2.0 (experimental)
Supported language versions: 1.4 (deprecated), 1.5 (deprecated), 1.6, 1.7, 1.8, 1.9, 2.0 (experimental), 2.1 (experimental)
COMPILATION_ERROR
compiler/util/src/org/jetbrains/kotlin/config/ApiVersion.kt
+3
View File
@@ -66,6 +66,9 @@ class ApiVersion private constructor(
@JvmField
val KOTLIN_2_0 = createByLanguageVersion(LanguageVersion.KOTLIN_2_0)
@JvmField
val KOTLIN_2_1 = createByLanguageVersion(LanguageVersion.KOTLIN_2_1)
@JvmField
val LATEST: ApiVersion = createByLanguageVersion(LanguageVersion.values().last())
compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
+3
View File
@@ -288,6 +288,8 @@ enum class LanguageFeature(
ForbidInferringPostponedTypeVariableIntoDeclaredUpperBound(KOTLIN_2_0, kind = BUG_FIX), // KT-47986
ProhibitUseSiteGetTargetAnnotations(KOTLIN_2_0, kind = BUG_FIX), // KT-15470
// 2.1
// End of 2.* language features --------------------------------------------------
// This feature effectively might be removed because we decided to disable it until K2 and there it will be unconditionally enabled.
@@ -426,6 +428,7 @@ enum class LanguageVersion(val major: Int, val minor: Int) : DescriptionAware, L
KOTLIN_1_9(1, 9),
KOTLIN_2_0(2, 0),
KOTLIN_2_1(2, 1),
;
override val isStable: Boolean