mirror of
https://github.com/github/codeql.git
synced 2025-12-16 16:53:25 +01:00
Bazel: remove 2.0.0 rules_kotlin patching
This commit is contained in:
committed by
Chris Smowton
parent
a2836f5aab
commit
3001d0bd1c
@@ -1,35 +0,0 @@
|
||||
module(
|
||||
name = "rules_kotlin",
|
||||
version = "2.0.0-codeql.1",
|
||||
compatibility_level = 1,
|
||||
repo_name = "rules_kotlin",
|
||||
)
|
||||
|
||||
bazel_dep(name = "platforms", version = "0.0.10")
|
||||
bazel_dep(name = "bazel_skylib", version = "1.7.1")
|
||||
bazel_dep(name = "rules_java", version = "7.2.0")
|
||||
bazel_dep(name = "rules_python", version = "0.23.1")
|
||||
bazel_dep(name = "rules_cc", version = "0.0.8")
|
||||
bazel_dep(name = "rules_android", version = "0.1.1")
|
||||
|
||||
rules_kotlin_extensions = use_extension(
|
||||
"//src/main/starlark/core/repositories:bzlmod_setup.bzl",
|
||||
"rules_kotlin_extensions",
|
||||
)
|
||||
use_repo(
|
||||
rules_kotlin_extensions,
|
||||
"com_github_google_ksp",
|
||||
"com_github_jetbrains_kotlin",
|
||||
"com_github_pinterest_ktlint",
|
||||
"kotlinx_serialization_core_jvm",
|
||||
"kotlinx_serialization_json",
|
||||
"kotlinx_serialization_json_jvm",
|
||||
)
|
||||
|
||||
register_toolchains("//kotlin/internal:default_toolchain")
|
||||
|
||||
# TODO(bencodes) We should be able to remove this once rules_android has rolled out official Bzlmod support
|
||||
remote_android_extensions = use_extension("@bazel_tools//tools/android:android_extensions.bzl", "remote_android_tools_extensions")
|
||||
use_repo(remote_android_extensions, "android_gmaven_r8", "android_tools")
|
||||
|
||||
bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
|
||||
@@ -1,34 +0,0 @@
|
||||
We need to build different extractor variants with different -language-version options, which is not allowed
|
||||
in current kotlin_rules
|
||||
diff --git a/src/main/starlark/core/options/opts.kotlinc.bzl b/src/main/starlark/core/options/opts.kotlinc.bzl
|
||||
index 5e1461b..b93e6aa 100644
|
||||
--- a/src/main/starlark/core/options/opts.kotlinc.bzl
|
||||
+++ b/src/main/starlark/core/options/opts.kotlinc.bzl
|
||||
@@ -33,6 +33,11 @@ def _map_jdk_release_to_flag(version):
|
||||
return None
|
||||
return ["-Xjdk-release=%s" % version]
|
||||
|
||||
+def _map_language_version_to_flag(version):
|
||||
+ if not version:
|
||||
+ return None
|
||||
+ return ["-language-version=%s" % version, "-api-version=%s" % version]
|
||||
+
|
||||
_KOPTS_ALL = {
|
||||
"warn": struct(
|
||||
args = dict(
|
||||
@@ -417,6 +422,15 @@ _KOPTS_ALL = {
|
||||
value_to_flag = None,
|
||||
map_value_to_flag = _map_jdk_release_to_flag,
|
||||
),
|
||||
+ "language_version": struct(
|
||||
+ args = dict(
|
||||
+ default = "1.9",
|
||||
+ doc = "-language-version",
|
||||
+ ),
|
||||
+ type = attr.string,
|
||||
+ value_to_flag = None,
|
||||
+ map_value_to_flag = _map_language_version_to_flag,
|
||||
+ ),
|
||||
}
|
||||
|
||||
# Filters out options that are not available in current compiler release
|
||||
@@ -1,16 +0,0 @@
|
||||
Emitting jdeps is broken for the 2.0.0 kotlin extractor, and we don't need those files.
|
||||
Patching it here rather than passing `--@rules_kotlin//kotlin/settings:jvm_emit_jdeps=false`
|
||||
allows us to not have to specify that option (and therefore pull in `rules_kotlin`) in `semmle-code`.
|
||||
diff --git a/kotlin/settings/BUILD.bazel b/kotlin/settings/BUILD.bazel
|
||||
index 2c93c11..f352b80 100644
|
||||
--- a/kotlin/settings/BUILD.bazel
|
||||
+++ b/kotlin/settings/BUILD.bazel
|
||||
@@ -25,7 +25,7 @@ release_archive(
|
||||
# Flag that controls the emission of jdeps files during kotlin jvm compilation.
|
||||
bool_flag(
|
||||
name = "jvm_emit_jdeps",
|
||||
- build_setting_default = True, # Upstream default behavior
|
||||
+ build_setting_default = False,
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
{
|
||||
"integrity": "sha256-2JcjzJ67t72y66yhr30jg+B0YVZDz5ejZrdYp2t9xEM=",
|
||||
"url": "https://github.com/bazelbuild/rules_kotlin/releases/download/v2.0.0/rules_kotlin-v2.0.0.tar.gz",
|
||||
"patches": {
|
||||
"codeql_do_not_emit_jdeps.patch": "sha256-1ir4Aio1SICxnj1wafQ0GefT/m7bwn2n+SQwq19V3A8=",
|
||||
"codeql_add_language_version_option.patch": "sha256-t8Fm0bYZ4Q4vTqcoXZjyK4WPEoAafjE4whJLNnrnRbg="
|
||||
},
|
||||
"patch_strip": 1
|
||||
}
|
||||
@@ -21,8 +21,7 @@
|
||||
"github:bazelbuild/rules_kotlin"
|
||||
],
|
||||
"versions": [
|
||||
"2.1.3-codeql.1",
|
||||
"2.0.0-codeql.1"
|
||||
"2.1.3-codeql.1"
|
||||
],
|
||||
"yanked_versions": {}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user