From 6bce668cac17e85bc0831f06160ebfb9d8dee4e5 Mon Sep 17 00:00:00 2001
From: Ivan Kylchik <ivan.kylchik@jetbrains.com>
Date: Wed, 15 Mar 2023 13:03:14 +0100
Subject: [PATCH] Introduce language version 2.1

---
 .../src/org/jetbrains/kotlin/utils/metadataHelpers.kt         | 1 +
 compiler/testData/cli/jvm/apiVersionInvalid.out               | 2 +-
 compiler/testData/cli/jvm/languageVersionInvalid.out          | 2 +-
 compiler/util/src/org/jetbrains/kotlin/config/ApiVersion.kt   | 3 +++
 .../org/jetbrains/kotlin/config/LanguageVersionSettings.kt    | 3 +++
 .../kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinVersion.kt   | 1 +
 .../kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api | 1 +
 .../kotlin/gradle/dsl/KotlinCommonCompilerOptions.kt          | 4 ++--
 .../org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt    | 4 ++--
 .../gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt   | 1 +
 10 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/compiler/frontend.common.jvm/src/org/jetbrains/kotlin/utils/metadataHelpers.kt b/compiler/frontend.common.jvm/src/org/jetbrains/kotlin/utils/metadataHelpers.kt
index 03f7ebbf549..29f01cba506 100644
--- a/compiler/frontend.common.jvm/src/org/jetbrains/kotlin/utils/metadataHelpers.kt
+++ b/compiler/frontend.common.jvm/src/org/jetbrains/kotlin/utils/metadataHelpers.kt
@@ -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 " +
diff --git a/compiler/testData/cli/jvm/apiVersionInvalid.out b/compiler/testData/cli/jvm/apiVersionInvalid.out
index 1edc185a007..c436c6f08ec 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 (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
diff --git a/compiler/testData/cli/jvm/languageVersionInvalid.out b/compiler/testData/cli/jvm/languageVersionInvalid.out
index 2e675e61b9d..c80d02ed482 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 (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
diff --git a/compiler/util/src/org/jetbrains/kotlin/config/ApiVersion.kt b/compiler/util/src/org/jetbrains/kotlin/config/ApiVersion.kt
index 1e87e103932..cdd15a3e5c9 100644
--- a/compiler/util/src/org/jetbrains/kotlin/config/ApiVersion.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/config/ApiVersion.kt
@@ -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())
 
diff --git a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
index d3fb18bab28..c23a2b44292 100644
--- a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
@@ -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
diff --git a/libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinVersion.kt b/libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinVersion.kt
index 518812f37b1..a762d3ad420 100644
--- a/libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinVersion.kt
+++ b/libraries/tools/kotlin-gradle-compiler-types/src/generated/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinVersion.kt
@@ -17,6 +17,7 @@ enum class KotlinVersion(val version: String) {
     KOTLIN_1_8("1.8"),
     KOTLIN_1_9("1.9"),
     KOTLIN_2_0("2.0"),
+    KOTLIN_2_1("2.1"),
     ;
 
     companion object {
diff --git a/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api b/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api
index 6ed57648845..3c344e71f00 100644
--- a/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api
+++ b/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api
@@ -550,6 +550,7 @@ public final class org/jetbrains/kotlin/gradle/dsl/KotlinVersion : java/lang/Enu
 	public static final field KOTLIN_1_8 Lorg/jetbrains/kotlin/gradle/dsl/KotlinVersion;
 	public static final field KOTLIN_1_9 Lorg/jetbrains/kotlin/gradle/dsl/KotlinVersion;
 	public static final field KOTLIN_2_0 Lorg/jetbrains/kotlin/gradle/dsl/KotlinVersion;
+	public static final field KOTLIN_2_1 Lorg/jetbrains/kotlin/gradle/dsl/KotlinVersion;
 	public final fun getVersion ()Ljava/lang/String;
 	public static fun valueOf (Ljava/lang/String;)Lorg/jetbrains/kotlin/gradle/dsl/KotlinVersion;
 	public static fun values ()[Lorg/jetbrains/kotlin/gradle/dsl/KotlinVersion;
diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptions.kt
index e89a4a28d61..9993651aecb 100644
--- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptions.kt
+++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonCompilerOptions.kt
@@ -9,7 +9,7 @@ interface KotlinCommonCompilerOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCo
 
     /**
      * Allow using declarations only from the specified version of bundled libraries
-     * Possible values: "1.4 (deprecated)", "1.5 (deprecated)", "1.6", "1.7", "1.8", "1.9", "2.0 (experimental)"
+     * Possible values: "1.4 (deprecated)", "1.5 (deprecated)", "1.6", "1.7", "1.8", "1.9", "2.0 (experimental)", "2.1 (experimental)"
      * Default value: null
      */
     @get:org.gradle.api.tasks.Optional
@@ -18,7 +18,7 @@ interface KotlinCommonCompilerOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCo
 
     /**
      * Provide source compatibility with the specified version of Kotlin
-     * Possible values: "1.4 (deprecated)", "1.5 (deprecated)", "1.6", "1.7", "1.8", "1.9", "2.0 (experimental)"
+     * Possible values: "1.4 (deprecated)", "1.5 (deprecated)", "1.6", "1.7", "1.8", "1.9", "2.0 (experimental)", "2.1 (experimental)"
      * Default value: null
      */
     @get:org.gradle.api.tasks.Optional
diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt
index e1d9cd3dac9..03b556c9101 100644
--- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt
+++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt
@@ -14,7 +14,7 @@ interface KotlinCommonOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonTool
 
     /**
      * Allow using declarations only from the specified version of bundled libraries
-     * Possible values: "1.4 (deprecated)", "1.5 (deprecated)", "1.6", "1.7", "1.8", "1.9", "2.0 (experimental)"
+     * Possible values: "1.4 (deprecated)", "1.5 (deprecated)", "1.6", "1.7", "1.8", "1.9", "2.0 (experimental)", "2.1 (experimental)"
      * Default value: null
      */
     var apiVersion: kotlin.String?
@@ -27,7 +27,7 @@ interface KotlinCommonOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonTool
 
     /**
      * Provide source compatibility with the specified version of Kotlin
-     * Possible values: "1.4 (deprecated)", "1.5 (deprecated)", "1.6", "1.7", "1.8", "1.9", "2.0 (experimental)"
+     * Possible values: "1.4 (deprecated)", "1.5 (deprecated)", "1.6", "1.7", "1.8", "1.9", "2.0 (experimental)", "2.1 (experimental)"
      * Default value: null
      */
     var languageVersion: kotlin.String?
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt
index 76a76ef7fd3..e8657215f45 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultLanguageSettingsBuilder.kt
@@ -148,6 +148,7 @@ private val apiVersionValues = ApiVersion.run {
         KOTLIN_1_8,
         KOTLIN_1_9,
         KOTLIN_2_0,
+        KOTLIN_2_1,
     )
 }