mirror of
https://github.com/github/codeql.git
synced 2026-04-25 16:55:19 +02:00
Merge pull request #21583 from github/redsun82/update-kotlin-2.3.20
Kotlin: update to 2.3.20
This commit is contained in:
@@ -7,9 +7,9 @@ repos:
|
|||||||
rev: v3.2.0
|
rev: v3.2.0
|
||||||
hooks:
|
hooks:
|
||||||
- id: trailing-whitespace
|
- id: trailing-whitespace
|
||||||
exclude: /test/.*$(?<!\.qlref)|.*\.patch$|.*\.qll?$
|
exclude: /test([^/]*)/.*$(?<!\.qlref)|.*\.patch$|.*\.qll?$
|
||||||
- id: end-of-file-fixer
|
- id: end-of-file-fixer
|
||||||
exclude: Cargo.lock$|/test/.*$(?<!\.qlref)|.*\.patch$|.*\.qll?$
|
exclude: Cargo.lock$|/test([^/]*)/.*$(?<!\.qlref)|.*\.patch$|.*\.qll?$
|
||||||
|
|
||||||
- repo: https://github.com/pre-commit/mirrors-clang-format
|
- repo: https://github.com/pre-commit/mirrors-clang-format
|
||||||
rev: v17.0.6
|
rev: v17.0.6
|
||||||
|
|||||||
@@ -242,6 +242,7 @@ use_repo(
|
|||||||
"kotlin-compiler-2.2.0-Beta1",
|
"kotlin-compiler-2.2.0-Beta1",
|
||||||
"kotlin-compiler-2.2.20-Beta2",
|
"kotlin-compiler-2.2.20-Beta2",
|
||||||
"kotlin-compiler-2.3.0",
|
"kotlin-compiler-2.3.0",
|
||||||
|
"kotlin-compiler-2.3.20",
|
||||||
"kotlin-compiler-embeddable-1.8.0",
|
"kotlin-compiler-embeddable-1.8.0",
|
||||||
"kotlin-compiler-embeddable-1.9.0-Beta",
|
"kotlin-compiler-embeddable-1.9.0-Beta",
|
||||||
"kotlin-compiler-embeddable-1.9.20-Beta",
|
"kotlin-compiler-embeddable-1.9.20-Beta",
|
||||||
@@ -252,6 +253,7 @@ use_repo(
|
|||||||
"kotlin-compiler-embeddable-2.2.0-Beta1",
|
"kotlin-compiler-embeddable-2.2.0-Beta1",
|
||||||
"kotlin-compiler-embeddable-2.2.20-Beta2",
|
"kotlin-compiler-embeddable-2.2.20-Beta2",
|
||||||
"kotlin-compiler-embeddable-2.3.0",
|
"kotlin-compiler-embeddable-2.3.0",
|
||||||
|
"kotlin-compiler-embeddable-2.3.20",
|
||||||
"kotlin-stdlib-1.8.0",
|
"kotlin-stdlib-1.8.0",
|
||||||
"kotlin-stdlib-1.9.0-Beta",
|
"kotlin-stdlib-1.9.0-Beta",
|
||||||
"kotlin-stdlib-1.9.20-Beta",
|
"kotlin-stdlib-1.9.20-Beta",
|
||||||
@@ -262,6 +264,7 @@ use_repo(
|
|||||||
"kotlin-stdlib-2.2.0-Beta1",
|
"kotlin-stdlib-2.2.0-Beta1",
|
||||||
"kotlin-stdlib-2.2.20-Beta2",
|
"kotlin-stdlib-2.2.20-Beta2",
|
||||||
"kotlin-stdlib-2.3.0",
|
"kotlin-stdlib-2.3.0",
|
||||||
|
"kotlin-stdlib-2.3.20",
|
||||||
)
|
)
|
||||||
|
|
||||||
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
|
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
Java,"Java 7 to 26 [6]_","javac (OpenJDK and Oracle JDK),
|
Java,"Java 7 to 26 [6]_","javac (OpenJDK and Oracle JDK),
|
||||||
|
|
||||||
Eclipse compiler for Java (ECJ) [7]_",``.java``
|
Eclipse compiler for Java (ECJ) [7]_",``.java``
|
||||||
Kotlin,"Kotlin 1.8.0 to 2.3.0\ *x*","kotlinc",``.kt``
|
Kotlin,"Kotlin 1.8.0 to 2.3.2\ *x*","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`` [8]_"
|
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`` [8]_"
|
||||||
Python [9]_,"2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12, 3.13",Not applicable,``.py``
|
Python [9]_,"2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12, 3.13",Not applicable,``.py``
|
||||||
Ruby [10]_,"up to 3.3",Not applicable,"``.rb``, ``.erb``, ``.gemspec``, ``Gemfile``"
|
Ruby [10]_,"up to 3.3",Not applicable,"``.rb``, ``.erb``, ``.gemspec``, ``Gemfile``"
|
||||||
|
|||||||
BIN
java/kotlin-extractor/deps/kotlin-compiler-2.3.20.jar
(Stored with Git LFS)
Normal file
BIN
java/kotlin-extractor/deps/kotlin-compiler-2.3.20.jar
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
java/kotlin-extractor/deps/kotlin-compiler-embeddable-2.3.20.jar
(Stored with Git LFS)
Normal file
BIN
java/kotlin-extractor/deps/kotlin-compiler-embeddable-2.3.20.jar
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
java/kotlin-extractor/deps/kotlin-stdlib-2.3.20.jar
(Stored with Git LFS)
Normal file
BIN
java/kotlin-extractor/deps/kotlin-stdlib-2.3.20.jar
(Stored with Git LFS)
Normal file
Binary file not shown.
@@ -27,7 +27,7 @@ import shutil
|
|||||||
import io
|
import io
|
||||||
import os
|
import os
|
||||||
|
|
||||||
DEFAULT_VERSION = "2.3.10"
|
DEFAULT_VERSION = "2.3.20"
|
||||||
|
|
||||||
|
|
||||||
def options():
|
def options():
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
|
// referenceClass, referenceFunctions, referenceProperties are deprecated since Kotlin 2.3.20
|
||||||
|
@file:Suppress("DEPRECATION")
|
||||||
|
|
||||||
package com.github.codeql.utils
|
package com.github.codeql.utils
|
||||||
|
|
||||||
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
|
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ VERSIONS = [
|
|||||||
"2.2.0-Beta1",
|
"2.2.0-Beta1",
|
||||||
"2.2.20-Beta2",
|
"2.2.20-Beta2",
|
||||||
"2.3.0",
|
"2.3.0",
|
||||||
|
"2.3.20",
|
||||||
]
|
]
|
||||||
|
|
||||||
def _version_to_tuple(v):
|
def _version_to_tuple(v):
|
||||||
|
|||||||
@@ -281,7 +281,12 @@ test.kt:
|
|||||||
# 40| 11: [Class] HasKotlinDeprecatedAnnotationUsedByJava
|
# 40| 11: [Class] HasKotlinDeprecatedAnnotationUsedByJava
|
||||||
#-----| -3: (Annotations)
|
#-----| -3: (Annotations)
|
||||||
# 40| 1: [Annotation] Deprecated
|
# 40| 1: [Annotation] Deprecated
|
||||||
# 40| 1: [StringLiteral] "Kotlin deprecation message 1"
|
# 0| 1: [Annotation] ReplaceWith
|
||||||
|
# 0| 1: [StringLiteral] ""
|
||||||
|
# 0| 2: [ArrayInit] {...}
|
||||||
|
# 0| 2: [VarAccess] DeprecationLevel.WARNING
|
||||||
|
# 0| -1: [TypeAccess] DeprecationLevel
|
||||||
|
# 40| 3: [StringLiteral] "Kotlin deprecation message 1"
|
||||||
# 40| 1: [Constructor] HasKotlinDeprecatedAnnotationUsedByJava
|
# 40| 1: [Constructor] HasKotlinDeprecatedAnnotationUsedByJava
|
||||||
# 40| 5: [BlockStmt] { ... }
|
# 40| 5: [BlockStmt] { ... }
|
||||||
# 40| 0: [SuperConstructorInvocationStmt] super(...)
|
# 40| 0: [SuperConstructorInvocationStmt] super(...)
|
||||||
@@ -298,7 +303,12 @@ test.kt:
|
|||||||
# 46| 13: [Class] HasKotlinDeprecatedAnnotationUsedByKotlin
|
# 46| 13: [Class] HasKotlinDeprecatedAnnotationUsedByKotlin
|
||||||
#-----| -3: (Annotations)
|
#-----| -3: (Annotations)
|
||||||
# 46| 1: [Annotation] Deprecated
|
# 46| 1: [Annotation] Deprecated
|
||||||
# 46| 1: [StringLiteral] "Kotlin deprecation message 2"
|
# 0| 1: [Annotation] ReplaceWith
|
||||||
|
# 0| 1: [StringLiteral] ""
|
||||||
|
# 0| 2: [ArrayInit] {...}
|
||||||
|
# 0| 2: [VarAccess] DeprecationLevel.WARNING
|
||||||
|
# 0| -1: [TypeAccess] DeprecationLevel
|
||||||
|
# 46| 3: [StringLiteral] "Kotlin deprecation message 2"
|
||||||
# 46| 1: [Constructor] HasKotlinDeprecatedAnnotationUsedByKotlin
|
# 46| 1: [Constructor] HasKotlinDeprecatedAnnotationUsedByKotlin
|
||||||
# 46| 5: [BlockStmt] { ... }
|
# 46| 5: [BlockStmt] { ... }
|
||||||
# 46| 0: [SuperConstructorInvocationStmt] super(...)
|
# 46| 0: [SuperConstructorInvocationStmt] super(...)
|
||||||
|
|||||||
@@ -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 2.3.20.",
|
"markdownMessage": "The Kotlin version installed (`999.999.999`) is too recent for this version of CodeQL. Install a version lower than 2.3.30.",
|
||||||
"severity": "error",
|
"severity": "error",
|
||||||
"source": {
|
"source": {
|
||||||
"extractorName": "java",
|
"extractorName": "java",
|
||||||
|
|||||||
4
java/ql/lib/change-notes/2026-03-26-kotlin-2.3.20.md
Normal file
4
java/ql/lib/change-notes/2026-03-26-kotlin-2.3.20.md
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
category: minorAnalysis
|
||||||
|
---
|
||||||
|
* Kotlin versions up to 2.3.20 are now supported.
|
||||||
Reference in New Issue
Block a user