Merge pull request github#14188 from igfoo/igfoo/kotlin-1.9.20

Kotlin: Support 1.9.20

Author: igfoo

docs/codeql/reusables/supported-versions-compilers.rst

@@ -20,7 +20,7 @@
    Java,"Java 7 to 20 [4]_","javac (OpenJDK and Oracle JDK),
 
    Eclipse compiler for Java (ECJ) [5]_",``.java``
-   Kotlin [6]_,"Kotlin 1.5.0 to 1.9.10","kotlinc",``.kt``
+   Kotlin [6]_,"Kotlin 1.5.0 to 1.9.20","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, 3.11",Not applicable,``.py``
    Ruby [9]_,"up to 3.2",Not applicable,"``.rb``, ``.erb``, ``.gemspec``, ``Gemfile``"

java/kotlin-extractor/kotlin_plugin_versions.py

@@ -24,7 +24,7 @@ def version_string_to_tuple(version):
 # Version number used by CI.
 ci_version = '1.9.0'
 
-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', '1.9.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', '1.9.0-Beta', '1.9.20-Beta' ]
 
 many_versions_tuples = [version_string_to_tuple(v) for v in many_versions]
 

java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt

@@ -1,11 +1,7 @@
 package com.github.codeql
 
 import com.github.codeql.utils.*
-import com.github.codeql.utils.versions.codeQlWithHasQuestionMark
-import com.github.codeql.utils.versions.getFileClassFqName
-import com.github.codeql.utils.versions.getKotlinType
-import com.github.codeql.utils.versions.isRawType
-import com.github.codeql.utils.versions.packageFqName
+import com.github.codeql.utils.versions.*
 import com.semmle.extractor.java.OdasaOutput
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.backend.common.ir.*

java/kotlin-extractor/src/main/kotlin/PrimitiveTypeInfo.kt

@@ -8,7 +8,7 @@ import org.jetbrains.kotlin.ir.types.IrSimpleType
 import org.jetbrains.kotlin.ir.types.classOrNull
 import org.jetbrains.kotlin.name.FqName
 import com.github.codeql.utils.*
-import com.github.codeql.utils.versions.packageFqName
+import com.github.codeql.utils.versions.*
 
 class PrimitiveTypeMapping(val logger: Logger, val pluginContext: IrPluginContext) {
     fun getPrimitiveInfo(s: IrSimpleType) =

java/kotlin-extractor/src/main/kotlin/utils/ClassNames.kt

@@ -1,8 +1,7 @@
 package com.github.codeql
 
 import com.github.codeql.utils.getJvmName
-import com.github.codeql.utils.versions.getFileClassFqName
-import com.github.codeql.utils.versions.packageFqName
+import com.github.codeql.utils.versions.*
 import com.intellij.openapi.vfs.StandardFileSystems
 import org.jetbrains.kotlin.load.java.sources.JavaSourceElement
 import org.jetbrains.kotlin.load.java.structure.impl.classFiles.BinaryJavaClass

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_9_255/packageFqName.kt renamed to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_9_20-Beta/packageFqName.kt

@@ -1,5 +1,5 @@
 {
-  "markdownMessage": "The Kotlin version installed (`999.999.999`) is too recent for this version of CodeQL. Install a version lower than 1.9.20.",
+  "markdownMessage": "The Kotlin version installed (`999.999.999`) is too recent for this version of CodeQL. Install a version lower than 1.9.30.",
   "severity": "error",
   "source": {
     "extractorName": "java",

java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_9_255/IrSymbolInternals.kt renamed to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_9_255-SNAPSHOT/IrSymbolInternals.kt

@@ -1,3 +1,3 @@
 from create_database_utils import *
 
-run_codeql_database_create(["kotlinc SomeClass.kt"], lang="java")
+run_codeql_database_create(["kotlinc -J-Xmx2G SomeClass.kt"], lang="java")

java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/diagnostics.expected

@@ -1,3 +1,3 @@
 from create_database_utils import *
 
-run_codeql_database_create(["kotlinc -language-version 2.0 SomeClass.kt"], lang="java")
+run_codeql_database_create(["kotlinc -J-Xmx2G -language-version 2.0 SomeClass.kt"], lang="java")