Skip to content

Commit ff9cb43

Browse files
authored
Merge pull request #1853 from github/igfoo/kot1.9.10
Kotlin: CodeQL >= 2.13.4 supports 1.9.10.
2 parents 9a53fd0 + 2f913c1 commit ff9cb43

File tree

4 files changed

+17
-1
lines changed

4 files changed

+17
-1
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
55
## [UNRELEASED]
66

77
- Fixed a bug in CodeQL Action 2.21.3 onwards that affected beta support for [Project Lombok](https://projectlombok.org/) when analyzing Java. The environment variable `CODEQL_EXTRACTOR_JAVA_RUN_ANNOTATION_PROCESSORS` will now be respected if it was manually configured in the workflow. [#1844](https://github.com/github/codeql-action/pull/1844)
8+
- Enable support for Kotlin 1.9.20 when running with CodeQL CLI v2.13.4 through v2.14.3. [#1853](https://github.com/github/codeql-action/pull/1853)
89

910
## 2.21.4 - 14 Aug 2023
1011

lib/init-action.js

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/init-action.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/init-action.ts

+10
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import {
3131
checkDiskUsage,
3232
checkForTimeout,
3333
checkGitHubVersionInRange,
34+
codeQlVersionAbove,
3435
DEFAULT_DEBUG_ARTIFACT_NAME,
3536
DEFAULT_DEBUG_DATABASE_NAME,
3637
getMemoryFlagValue,
@@ -346,6 +347,15 @@ async function run() {
346347
core.exportVariable("CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN", "true");
347348
}
348349

350+
const kotlinLimitVar =
351+
"CODEQL_EXTRACTOR_KOTLIN_OVERRIDE_MAXIMUM_VERSION_LIMIT";
352+
if (
353+
(await codeQlVersionAbove(codeql, "2.13.4")) &&
354+
!(await codeQlVersionAbove(codeql, "2.14.4"))
355+
) {
356+
core.exportVariable(kotlinLimitVar, "1.9.20");
357+
}
358+
349359
if (config.languages.includes(Language.java)) {
350360
const envVar = "CODEQL_EXTRACTOR_JAVA_RUN_ANNOTATION_PROCESSORS";
351361
if (process.env[envVar]) {

0 commit comments

Comments
 (0)