Skip to content

Commit bf4a202

Browse files
authored
Merge pull request #16932 from igfoo/igfoo/kotlin-2.0.20
Kotlin: Add 2.0.20 support
2 parents 0793c58 + 91dd99d commit bf4a202

File tree

10 files changed

+26
-2
lines changed

10 files changed

+26
-2
lines changed

MODULE.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ use_repo(
112112
"kotlin-compiler-1.9.0-Beta",
113113
"kotlin-compiler-1.9.20-Beta",
114114
"kotlin-compiler-2.0.0-RC1",
115+
"kotlin-compiler-2.0.20-Beta2",
115116
"kotlin-compiler-embeddable-1.5.0",
116117
"kotlin-compiler-embeddable-1.5.10",
117118
"kotlin-compiler-embeddable-1.5.20",
@@ -124,6 +125,7 @@ use_repo(
124125
"kotlin-compiler-embeddable-1.9.0-Beta",
125126
"kotlin-compiler-embeddable-1.9.20-Beta",
126127
"kotlin-compiler-embeddable-2.0.0-RC1",
128+
"kotlin-compiler-embeddable-2.0.20-Beta2",
127129
"kotlin-stdlib-1.5.0",
128130
"kotlin-stdlib-1.5.10",
129131
"kotlin-stdlib-1.5.20",
@@ -136,6 +138,7 @@ use_repo(
136138
"kotlin-stdlib-1.9.0-Beta",
137139
"kotlin-stdlib-1.9.20-Beta",
138140
"kotlin-stdlib-2.0.0-RC1",
141+
"kotlin-stdlib-2.0.20-Beta2",
139142
)
140143

141144
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
Java,"Java 7 to 22 [5]_","javac (OpenJDK and Oracle JDK),
2121

2222
Eclipse compiler for Java (ECJ) [6]_",``.java``
23-
Kotlin,"Kotlin 1.5.0 to 2.0.0\ *x*","kotlinc",``.kt``
23+
Kotlin,"Kotlin 1.5.0 to 2.0.2\ *x*","kotlinc",``.kt``
2424
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]_"
2525
Python [8]_,"2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12",Not applicable,``.py``
2626
Ruby [9]_,"up to 3.3",Not applicable,"``.rb``, ``.erb``, ``.gemspec``, ``Gemfile``"
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:b5cdb8728892eee348f52dbd00eeeffffe8f39a7ec48ceac496dab5f41554915
3+
size 59652360
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:bd05f9081cd85a73d804a1b355356ad433c8bba64388ef51d76e09fdbc4098b4
3+
size 58218956
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:ac59c5888b44b7f392628df7f1adba5d987f022071cfdec8826115a25069cd88
3+
size 1746790

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1511,6 +1511,8 @@ open class KotlinUsesExtractor(
15111511
}
15121512
}
15131513
}
1514+
is IrDynamicType -> {}
1515+
is IrErrorType -> {}
15141516
}
15151517
return t
15161518
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package com.github.codeql.utils.versions
2+
3+
import org.jetbrains.kotlin.ir.types.IrSimpleType
4+
5+
fun getKotlinType(s: IrSimpleType) = s.originalKotlinType

java/kotlin-extractor/versions.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ VERSIONS = [
1212
"1.9.0-Beta",
1313
"1.9.20-Beta",
1414
"2.0.0-RC1",
15+
"2.0.20-Beta2",
1516
]
1617

1718
def _version_to_tuple(v):

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"markdownMessage": "The Kotlin version installed (`999.999.999`) is too recent for this version of CodeQL. Install a version lower than 2.0.10.",
2+
"markdownMessage": "The Kotlin version installed (`999.999.999`) is too recent for this version of CodeQL. Install a version lower than 2.0.30.",
33
"severity": "error",
44
"source": {
55
"extractorName": "java",
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: feature
3+
---
4+
* Kotlin versions up to 2.0.2\ *x* are now supported.

0 commit comments

Comments
 (0)