Skip to content

Commit 000d824

Browse files
committed
address review
1 parent e4871fc commit 000d824

File tree

9 files changed

+6
-96
lines changed

9 files changed

+6
-96
lines changed

misc/bazel/registry/fix.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ def update(data):
6262
patch_json(
6363
version / "source.json",
6464
patches={
65-
p.name: sha256(p) for p in patches.iterdir()
65+
p.name: sha256(p) for p in sorted(patches.iterdir())
6666
} if patches.is_dir() else None,
6767
patch_strip=1 if patches.is_dir() else None,
6868
overlay={
69-
o.name: sha256(o) for o in overlay.iterdir()
69+
o.name: sha256(o) for o in sorted(overlay.iterdir())
7070
} if overlay.is_dir() else None,
7171
)

misc/bazel/registry/modules/rules_kotlin/2.2.0-codeql.1/MODULE.bazel

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

misc/bazel/registry/modules/rules_kotlin/2.2.0-codeql.1/patches/codeql_add_language_version_option.patch

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

misc/bazel/registry/modules/rules_kotlin/2.2.0-codeql.1/patches/codeql_do_not_emit_jdeps.patch

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

misc/bazel/registry/modules/rules_kotlin/2.2.0-codeql.1/source.json

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

misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/patches/codeql_do_not_emit_jdeps.patch

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Emitting jdeps is broken for the 2.0.0 kotlin extractor, and we don't need those files.
22
Patching it here rather than passing `--@rules_kotlin//kotlin/settings:jvm_emit_jdeps=false`
3-
allows us to not have to specify that option (and therefore pull in `rules_kotlin`) in `semmle-code`.
3+
allows us to not have to specify that option (and therefore pull in `rules_kotlin`) in the
4+
internal repo.
45
--- a/kotlin/settings/BUILD.bazel
56
+++ b/kotlin/settings/BUILD.bazel
67
@@ -16,6 +16,6 @@ release_archive(

misc/bazel/registry/modules/rules_kotlin/2.2.2-codeql.1/source.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"url": "https://github.com/bazelbuild/rules_kotlin/releases/download/v2.2.2/rules_kotlin-v2.2.2.tar.gz",
44
"patches": {
55
"codeql_add_language_version_option.patch": "sha256-HoH8NWXxmYHmm/SxaugRdXgMntvcQx5gRLW2yQIvWhM=",
6-
"codeql_do_not_emit_jdeps.patch": "sha256-gIlhXEY71vlCkpr5wj2vm3yv6RwcuKLhgbTGqdVvQfU="
6+
"codeql_do_not_emit_jdeps.patch": "sha256-cg06knW+Eq13qHCaelbnZka/WnGPvRrcqXHtpXsy/rA="
77
},
88
"patch_strip": 1
99
}

misc/bazel/registry/modules/rules_kotlin/metadata.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
"github:bazelbuild/rules_kotlin"
2222
],
2323
"versions": [
24-
"2.2.0-codeql.1",
2524
"2.2.2-codeql.1"
2625
],
2726
"yanked_versions": {}

swift/rules.bzl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
2-
load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
1+
load("@rules_cc//cc:defs.bzl", "CcInfo", "cc_binary", "cc_library")
32
load("//misc/bazel:os.bzl", "os_select")
43

54
# TODO: make a shared library with the internal repos for transitions

0 commit comments

Comments
 (0)