Skip to content

Commit b18f8d3

Browse files
authored
Merge pull request github#17714 from github/criemen/flip-enable-plus
Bazel: Flip --incompatible_use_plus_in_repo_names.
2 parents 25b3d76 + 6322270 commit b18f8d3

File tree

7 files changed

+8
-7
lines changed

7 files changed

+8
-7
lines changed

.bazelrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@ common --registry=https://bcr.bazel.build
2525

2626
common --@rules_dotnet//dotnet/settings:strict_deps=false
2727
common --experimental_isolated_extension_usages
28+
common --incompatible_use_plus_in_repo_names
2829

2930
try-import %workspace%/local.bazelrc

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ bazel_dep(name = "rules_kotlin", version = "1.9.4-codeql.1")
2727
bazel_dep(name = "gazelle", version = "0.38.0")
2828
bazel_dep(name = "rules_dotnet", version = "0.15.1")
2929
bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
30-
bazel_dep(name = "rules_rust", version = "0.50.0")
30+
bazel_dep(name = "rules_rust", version = "0.52.2")
3131

3232
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
3333

java/kotlin-extractor/deps.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def _get_dep(repository_ctx, name):
1717
return repository_ctx.path(Label("//java/kotlin-extractor/deps:%s" % name))
1818

1919
def _kotlin_dep_impl(repository_ctx):
20-
_, _, name = repository_ctx.name.rpartition("~")
20+
_, _, name = repository_ctx.name.rpartition("+")
2121
lfs_smudge(repository_ctx, [_get_dep(repository_ctx, name + ".jar")])
2222

2323
# for some reason rules_kotlin warns about these jars missing, this is to silence those warnings

misc/bazel/internal/zipmerge/zipmerge_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ std::string get_file(const char* name) {
7575
return ret;
7676
}();
7777
// this works from both `codeql` and the internal repository
78-
for (auto prefix : {"_main", "ql~"}) {
78+
for (auto prefix : {"_main", "ql+"}) {
7979
auto ret = runfiles->Rlocation(prefix + "/misc/bazel/internal/zipmerge/test-files/"s + name);
8080
if (fs::exists(ret)) {
8181
return ret;

misc/bazel/lfs.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ def _download_lfs(repository_ctx):
6464
srcs = [f for f in dir.readdir() if not f.is_dir]
6565
lfs_smudge(repository_ctx, srcs, executable = repository_ctx.attr.executable)
6666

67-
# with bzlmod the name is qualified with `~` separators, and we want the base name here
68-
name = repository_ctx.name.split("~")[-1]
67+
# with bzlmod the name is qualified with `+` separators, and we want the base name here
68+
name = repository_ctx.name.split("+")[-1]
6969
basenames = [src.basename for src in srcs]
7070
build = "exports_files(%s)\n" % repr(basenames)
7171

misc/ripunzip/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -eu
44

5-
source misc/bazel/runfiles.sh 2>/dev/null || source external/ql~/misc/bazel/runfiles.sh
5+
source misc/bazel/runfiles.sh 2>/dev/null || source external/ql+/misc/bazel/runfiles.sh
66

77
dest="${2:-$HOME/.local/bin}"
88

rust/codegen/codegen.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -eu
44

5-
source misc/bazel/runfiles.sh 2>/dev/null || source external/ql~/misc/bazel/runfiles.sh
5+
source misc/bazel/runfiles.sh 2>/dev/null || source external/ql+/misc/bazel/runfiles.sh
66

77
ast_generator="$(rlocation "$1")"
88
ast_generator_manifest="$(rlocation "$2")"

0 commit comments

Comments
 (0)