hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-23 15:55:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Kotlin: Support 1.9.20
This commit is contained in:
Ian Lynagh
2023-09-13 12:19:46 +01:00
committed by GitHub
parent cd5973764b df9c601571
commit bd1d6e1d1e
11 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/kotlin-extractor/kotlin_plugin_versions.py
View File

@@ -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]

6
java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
View File

@@ -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.*

2
java/kotlin-extractor/src/main/kotlin/PrimitiveTypeInfo.kt
View File

@@ -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) =

3
java/kotlin-extractor/src/main/kotlin/utils/ClassNames.kt
View File

@@ -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

0
java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_9_255/packageFqName.kt → java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_9_20-Beta/packageFqName.kt
View File

0
java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_9_255/IrSymbolInternals.kt → java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_9_255-SNAPSHOT/IrSymbolInternals.kt
View File

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

@@ -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",

2
java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin1/test.py
View File

@@ -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")

2
java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin2/test.py
View File

@@ -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")

4
java/ql/lib/change-notes/2023-09-12-kotlin-1.9.20.md Normal file
View File

@@ -0,0 +1,4 @@
---
category: feature
---
* Kotlin versions up to 1.9.20 are now supported.