From f7bb55433d6d55465076f33b4c1401211bbb57f5 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Fri, 22 Oct 2021 14:57:23 +0300
Subject: [PATCH] Add LanguageVersion and ApiVersion for 1.8

---
 .../src/org/jetbrains/kotlin/codegen/state/GenerationState.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 +++
 .../src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt | 3 ++-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
index 5cf29511774..fcf83fc1503 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
@@ -402,6 +402,7 @@ class GenerationState private constructor(
             this[KOTLIN_1_5] = JvmMetadataVersion(1, 5, 1)
             this[KOTLIN_1_6] = JvmMetadataVersion.INSTANCE
             this[KOTLIN_1_7] = JvmMetadataVersion(1, 7, 0)
+            this[KOTLIN_1_8] = JvmMetadataVersion(1, 8, 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 15ce0ddfa8f..9d84f87e557 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)
+Supported API versions: 1.4 (DEPRECATED), 1.5, 1.6, 1.7 (EXPERIMENTAL), 1.8 (EXPERIMENTAL)
 COMPILATION_ERROR
diff --git a/compiler/testData/cli/jvm/languageVersionInvalid.out b/compiler/testData/cli/jvm/languageVersionInvalid.out
index d6133b7d59b..ddf9958222c 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)
+Supported language versions: 1.4 (DEPRECATED), 1.5, 1.6, 1.7 (EXPERIMENTAL), 1.8 (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 14efdcf7ee4..02378595056 100644
--- a/compiler/util/src/org/jetbrains/kotlin/config/ApiVersion.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/config/ApiVersion.kt
@@ -57,6 +57,9 @@ class ApiVersion private constructor(
         @JvmField
         val KOTLIN_1_7 = createByLanguageVersion(LanguageVersion.KOTLIN_1_7)
 
+        @JvmField
+        val KOTLIN_1_8 = createByLanguageVersion(LanguageVersion.KOTLIN_1_8)
+
         @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 21ec8583fdc..8a9daa04f8d 100644
--- a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
@@ -343,6 +343,7 @@ enum class LanguageVersion(val major: Int, val minor: Int) : DescriptionAware, L
     KOTLIN_1_5(1, 5),
     KOTLIN_1_6(1, 6),
     KOTLIN_1_7(1, 7),
+    KOTLIN_1_8(1, 8),
     ;
 
     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 }
 
         // 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
         // API:       UNSUPPORTED --> DEPRECATED ------> STABLE ---> EXPERIMENTAL