Kotlin: 1.8.0 changes

github · Jan 9, 2023 · 7054bc9 · 7054bc9
1 parent 8bb3b8a
commit 7054bc9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/docs/codeql/reusables/supported-versions-compilers.rst b/docs/codeql/reusables/supported-versions-compilers.rst
@@ -20,7 +20,7 @@
    Java,"Java 7 to 18 [4]_","javac (OpenJDK and Oracle JDK),
 
    Eclipse compiler for Java (ECJ) [5]_",``.java``
-   Kotlin [6]_,"Kotlin 1.5.0 to 1.7.21","kotlinc",``.kt``
+   Kotlin [6]_,"Kotlin 1.5.0 to 1.8.0","kotlinc",``.kt``
    JavaScript,ECMAScript 2022 or lower,Not applicable,"``.js``, ``.jsx``, ``.mjs``, ``.es``, ``.es6``, ``.htm``, ``.html``, ``.xhtm``, ``.xhtml``, ``.vue``, ``.hbs``, ``.ejs``, ``.njk``, ``.json``, ``.yaml``, ``.yml``, ``.raml``, ``.xml`` [7]_"
    Python [8]_,"2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10",Not applicable,``.py``
    Ruby [9]_,"up to 3.1",Not applicable,"``.rb``, ``.erb``, ``.gemspec``, ``Gemfile``"

diff --git a/java/kotlin-extractor/build.gradle b/java/kotlin-extractor/build.gradle
@@ -46,6 +46,9 @@ sourceSets {
 
                     "utils/versions/v_1_7_20-Beta/createImplicitParameterDeclarationWithWrappedDescriptor.kt",
                     "utils/versions/v_1_7_20-Beta/allOverriddenIncludingSelf.kt",
+
+                    "utils/versions/v_1_8_0/ExperimentalCompilerApi.kt",
+                    "utils/versions/v_1_8_0/FirIncompatiblePluginAPI.kt",
             ]
         }
     }

diff --git a/java/kotlin-extractor/kotlin_plugin_versions.py b/java/kotlin-extractor/kotlin_plugin_versions.py
@@ -22,10 +22,10 @@ def version_string_to_tuple(version):
     return tuple([int(m.group(i)) for i in range(1, 4)] + [m.group(4)])
 
 # Version number used by CI. It needs to be one of the versions in many_versions.
-ci_version = '1.8.0-Beta'
+ci_version = '1.8.0'
 
 # Version numbers in the list need to be in semantically increasing order
-many_versions = [ '1.4.32', '1.5.0', '1.5.10', '1.5.20', '1.5.30', '1.6.0', '1.6.20', '1.7.0', '1.7.20', '1.8.0-Beta' ]
+many_versions = [ '1.4.32', '1.5.0', '1.5.10', '1.5.20', '1.5.30', '1.6.0', '1.6.20', '1.7.0', '1.7.20', '1.8.0' ]
 
 many_versions_tuples = [version_string_to_tuple(v) for v in many_versions]
 

diff --git a/...s/v_1_8_0-Beta/ExperimentalCompilerApi.kt → ...rsions/v_1_8_0/ExperimentalCompilerApi.kt b/...s/v_1_8_0-Beta/ExperimentalCompilerApi.kt → ...rsions/v_1_8_0/ExperimentalCompilerApi.kt
diff --git a/.../v_1_8_0-Beta/FirIncompatiblePluginAPI.kt → ...sions/v_1_8_0/FirIncompatiblePluginAPI.kt b/.../v_1_8_0-Beta/FirIncompatiblePluginAPI.kt → ...sions/v_1_8_0/FirIncompatiblePluginAPI.kt