From ded6968558c8f69b5127ca00a0b68239c186e44d Mon Sep 17 00:00:00 2001 From: Paolo Tranquilli Date: Thu, 26 Mar 2026 11:43:37 +0100 Subject: [PATCH] Kotlin: update to 2.3.20 --- MODULE.bazel | 3 +++ java/kotlin-extractor/deps/kotlin-compiler-2.3.20.jar | 3 +++ .../deps/kotlin-compiler-embeddable-2.3.20.jar | 3 +++ java/kotlin-extractor/deps/kotlin-stdlib-2.3.20.jar | 3 +++ java/kotlin-extractor/dev/wrapper.py | 2 +- java/kotlin-extractor/src/main/kotlin/utils/GetByFqName.kt | 3 +++ java/kotlin-extractor/versions.bzl | 1 + .../diagnostics/kotlin-version-too-new/diagnostics.expected | 2 +- java/ql/lib/change-notes/2026-03-26-kotlin-2.3.20.md | 4 ++++ 9 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 java/kotlin-extractor/deps/kotlin-compiler-2.3.20.jar create mode 100644 java/kotlin-extractor/deps/kotlin-compiler-embeddable-2.3.20.jar create mode 100644 java/kotlin-extractor/deps/kotlin-stdlib-2.3.20.jar create mode 100644 java/ql/lib/change-notes/2026-03-26-kotlin-2.3.20.md diff --git a/MODULE.bazel b/MODULE.bazel index 1ae9b94996f..7d30e7eb76b 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -242,6 +242,7 @@ use_repo( "kotlin-compiler-2.2.0-Beta1", "kotlin-compiler-2.2.20-Beta2", "kotlin-compiler-2.3.0", + "kotlin-compiler-2.3.20", "kotlin-compiler-embeddable-1.8.0", "kotlin-compiler-embeddable-1.9.0-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.20-Beta2", "kotlin-compiler-embeddable-2.3.0", + "kotlin-compiler-embeddable-2.3.20", "kotlin-stdlib-1.8.0", "kotlin-stdlib-1.9.0-Beta", "kotlin-stdlib-1.9.20-Beta", @@ -262,6 +264,7 @@ use_repo( "kotlin-stdlib-2.2.0-Beta1", "kotlin-stdlib-2.2.20-Beta2", "kotlin-stdlib-2.3.0", + "kotlin-stdlib-2.3.20", ) go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk") diff --git a/java/kotlin-extractor/deps/kotlin-compiler-2.3.20.jar b/java/kotlin-extractor/deps/kotlin-compiler-2.3.20.jar new file mode 100644 index 00000000000..60eae6cb5ed --- /dev/null +++ b/java/kotlin-extractor/deps/kotlin-compiler-2.3.20.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4198518f6d840f2f665b2e3c8319a854281f6af43790aca563e3f6b9c46bca68 +size 61256493 diff --git a/java/kotlin-extractor/deps/kotlin-compiler-embeddable-2.3.20.jar b/java/kotlin-extractor/deps/kotlin-compiler-embeddable-2.3.20.jar new file mode 100644 index 00000000000..a19f1cf3400 --- /dev/null +++ b/java/kotlin-extractor/deps/kotlin-compiler-embeddable-2.3.20.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:976f989d0b5f5d80e8e8a8ad4b73da0bfc27fdd965b9fa38362b2be79ecc1337 +size 59718536 diff --git a/java/kotlin-extractor/deps/kotlin-stdlib-2.3.20.jar b/java/kotlin-extractor/deps/kotlin-stdlib-2.3.20.jar new file mode 100644 index 00000000000..59297c653b7 --- /dev/null +++ b/java/kotlin-extractor/deps/kotlin-stdlib-2.3.20.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ae12504a5040ebaf37703908483420d1a5624dd1d93f357665f8c77c848a01e +size 1804720 diff --git a/java/kotlin-extractor/dev/wrapper.py b/java/kotlin-extractor/dev/wrapper.py index 8aa5b55ee67..6fc51aded79 100755 --- a/java/kotlin-extractor/dev/wrapper.py +++ b/java/kotlin-extractor/dev/wrapper.py @@ -27,7 +27,7 @@ import shutil import io import os -DEFAULT_VERSION = "2.3.10" +DEFAULT_VERSION = "2.3.20" def options(): diff --git a/java/kotlin-extractor/src/main/kotlin/utils/GetByFqName.kt b/java/kotlin-extractor/src/main/kotlin/utils/GetByFqName.kt index 8f85ca7ebd3..14fadbcb6c0 100644 --- a/java/kotlin-extractor/src/main/kotlin/utils/GetByFqName.kt +++ b/java/kotlin-extractor/src/main/kotlin/utils/GetByFqName.kt @@ -1,3 +1,6 @@ +// referenceClass, referenceFunctions, referenceProperties are deprecated since Kotlin 2.3.20 +@file:Suppress("DEPRECATION") + package com.github.codeql.utils import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext diff --git a/java/kotlin-extractor/versions.bzl b/java/kotlin-extractor/versions.bzl index 33fca7a37f8..cea5d649025 100644 --- a/java/kotlin-extractor/versions.bzl +++ b/java/kotlin-extractor/versions.bzl @@ -10,6 +10,7 @@ VERSIONS = [ "2.2.0-Beta1", "2.2.20-Beta2", "2.3.0", + "2.3.20", ] def _version_to_tuple(v): diff --git a/java/ql/integration-tests/kotlin/all-platforms/diagnostics/kotlin-version-too-new/diagnostics.expected b/java/ql/integration-tests/kotlin/all-platforms/diagnostics/kotlin-version-too-new/diagnostics.expected index bbc580f1e48..2720daff0b2 100644 --- a/java/ql/integration-tests/kotlin/all-platforms/diagnostics/kotlin-version-too-new/diagnostics.expected +++ b/java/ql/integration-tests/kotlin/all-platforms/diagnostics/kotlin-version-too-new/diagnostics.expected @@ -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", "source": { "extractorName": "java", diff --git a/java/ql/lib/change-notes/2026-03-26-kotlin-2.3.20.md b/java/ql/lib/change-notes/2026-03-26-kotlin-2.3.20.md new file mode 100644 index 00000000000..b18cff45704 --- /dev/null +++ b/java/ql/lib/change-notes/2026-03-26-kotlin-2.3.20.md @@ -0,0 +1,4 @@ +--- +category: minorAnalysis +--- +* Kotlin versions up to 2.3.20 are now supported.