Skip to content

Commit aeb4b3b

Browse files
unify test-kotlin1 and test-kotlin2 into test-kotlin
Delete test-kotlin1 (K1 expected output) and test-kotlin2 (K2 expected output) and replace them with the unified test-kotlin pack (codeql/java-kotlin-tests). The expected files come from test-kotlin2 as updated by the preceding extractor commit, which already aligned K1 and K2 output for the properties and accessor location improvements. The unified pack runs against both language modes: * -language-version 1.9 (K1 compatibility mode, e.g. for CI) * -language-version 2.0 / default K2 (standard mode) A follow-up CI commit will wire both modes into the workflow generator. Update CODEOWNERS and labeler.yml to reference test-kotlin instead of test-kotlin1 / test-kotlin2. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent f23c515 commit aeb4b3b

1,277 files changed

Lines changed: 3 additions & 33352 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ JS:
2020

2121
Kotlin:
2222
- java/kotlin-extractor/**/*
23-
- java/ql/test-kotlin*/**/*
23+
- java/ql/test-kotlin/**/*
2424

2525
Python:
2626
- python/**/*

CODEOWNERS

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
/swift/extractor/ @github/codeql-swift @github/code-scanning-language-coverage
2929
/misc/codegen/ @github/codeql-swift
3030
/java/kotlin-extractor/ @github/codeql-kotlin @github/code-scanning-language-coverage
31-
/java/ql/test-kotlin1/ @github/codeql-kotlin
32-
/java/ql/test-kotlin2/ @github/codeql-kotlin
31+
/java/ql/test-kotlin/ @github/codeql-kotlin
3332

3433
# Experimental CodeQL cryptography
3534
**/experimental/**/quantum/ @github/ps-codeql

java/ql/test-kotlin1/TestUtilities/InlineExpectationsTest.qll renamed to java/ql/test-kotlin/TestUtilities/InlineExpectationsTest.qll

File renamed without changes.
File renamed without changes.

java/ql/test-kotlin1/TestUtilities/internal/InlineExpectationsTestImpl.qll renamed to java/ql/test-kotlin/TestUtilities/internal/InlineExpectationsTestImpl.qll

File renamed without changes.
File renamed without changes.

java/ql/test-kotlin1/library-tests/GeneratedFiles/Generated.expected renamed to java/ql/test-kotlin/library-tests/GeneratedFiles/Generated.expected

File renamed without changes.

java/ql/test-kotlin1/library-tests/GeneratedFiles/Generated.kt renamed to java/ql/test-kotlin/library-tests/GeneratedFiles/Generated.kt

File renamed without changes.

java/ql/test-kotlin1/library-tests/GeneratedFiles/Generated.ql renamed to java/ql/test-kotlin/library-tests/GeneratedFiles/Generated.ql

File renamed without changes.

java/ql/test-kotlin1/library-tests/GeneratedFiles/NonGenerated.kt renamed to java/ql/test-kotlin/library-tests/GeneratedFiles/NonGenerated.kt

File renamed without changes.

0 commit comments

Comments
 (0)