Skip to content

Commit e2a47e7

Browse files
authored
Merge pull request github#16720 from github/redsun82/kotlin
Kotlin: cleanup after internal changes
2 parents c808953 + f9db786 commit e2a47e7

File tree

4 files changed

+15
-336
lines changed

4 files changed

+15
-336
lines changed

java/kotlin-extractor/BUILD.bazel

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,20 @@ bazel build @codeql//java/kotlin-extractor
1313
```
1414
will build a default variant:
1515
* standalone, unless `CODEQL_KOTLIN_SINGLE_VERSION_EMBEDDABLE` is set to true, in which case it will go for embeddable
16-
* the version will be taken as the last supported version less than the version of the currently installed `kotlinc`
17-
* if `CODEQL_KOTLIN_SINGLE_VERSION` is set, that will be used instead
18-
* if `kotlinc` is not installed, `1.9.20-Beta` will be used
16+
* the version will be taken as the last supported version less than the version of the currently available `kotlinc`,
17+
or `CODEQL_KOTLIN_SINGLE_VERSION` if set.
1918
20-
If `kotlinc` is updated, bazel won't be aware of it and will therefore keep the same default version. Possible workarounds for that:
19+
If building from the `codeql` repository, `@codeql` can be skipped.
20+
21+
It is recommended to use the `kotlinc` wrapper in `dev` (which is also available in `tools` from `semmle-code`), which
22+
takes care about providing a sensible default version and keep the version of the default target up to date.
23+
24+
If the wrapper is not used and `kotlinc` is updated, bazel won't be aware of it and will therefore keep the same default
25+
version. Possible workarounds for that:
26+
* switch to using the `kotlinc` wrapper in `dev` as mentioned above
2127
* `bazel clean`
2228
* `bazel fetch --force @codeql//java/kotlin-extractor`
2329
* `bazel fetch --force @codeql_kotlin_defaults//:all` (only from `codeql`)
24-
25-
If building from the `codeql` repository, `@codeql` can be skipped.
2630
"""
2731

2832
# This file is used in the `@codeql_kotlin_embeddable` external repo, which means we need to

java/kotlin-extractor/build.py

Lines changed: 0 additions & 241 deletions
This file was deleted.

java/kotlin-extractor/kotlin_plugin_versions.py

Lines changed: 0 additions & 89 deletions
This file was deleted.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
category: fix
3+
---
4+
5+
* Support for `codeql test run` for Kotlin sources has been fixed.

0 commit comments

Comments
 (0)