Skip to content

Commit

Permalink
Dependencies: Use the canonical Bazel Central Repository names.
Browse files Browse the repository at this point in the history
The repository names with reverse domain name used to be the common
way naming dependencies in WORKSPACE environment as they were typically
fetched from some URL.

Now, with the Bazel Central Repository and bzlmod, they all
have canonical names, so use these instead now that we don't
use WORKSPACE anymore.
  • Loading branch information
hzeller committed Dec 17, 2024
1 parent bacb769 commit 47c7794
Show file tree
Hide file tree
Showing 29 changed files with 1,130 additions and 1,130 deletions.
10 changes: 5 additions & 5 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ module(
bazel_dep(name = "platforms", version = "0.0.10")
bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "rules_license", version = "1.0.0")
bazel_dep(name = "nlohmann_json", version = "3.11.3.bcr.1", repo_name = "jsonhpp")
bazel_dep(name = "re2", version = "2024-07-02.bcr.1", repo_name = "com_googlesource_code_re2")
bazel_dep(name = "nlohmann_json", version = "3.11.3.bcr.1")
bazel_dep(name = "re2", version = "2024-07-02.bcr.1")
bazel_dep(name = "zlib", version = "1.3.1.bcr.3")

# Register m4/flex/bison rules and toolchains
Expand Down Expand Up @@ -58,8 +58,8 @@ register_toolchains("@bison//:toolchain")
# abseil-cpp and googletest can not be updated beyond the following currently,
# as newer googletest is not compatible with bazel 6 anymore, and abseil-cpp
# depends on it :( -- to support all active bazel's, we're stuck till EOL bazel6
bazel_dep(name = "googletest", version = "1.14.0.bcr.1", repo_name = "com_google_googletest")
bazel_dep(name = "abseil-cpp", version = "20240116.2", repo_name = "com_google_absl")
bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
bazel_dep(name = "abseil-cpp", version = "20240116.2")
single_version_override(
module_name = "abseil-cpp",
patch_strip = 1,
Expand All @@ -71,6 +71,6 @@ single_version_override(
# This also means that we unfortunately can't use the @protobuf//bazel rules
# but have to use rules_cc and rules_proto.
# TODO: figure out how we can make proto compile beyond 24.4 on Windows.
bazel_dep(name = "protobuf", version = "24.4", repo_name = "com_google_protobuf")
bazel_dep(name = "protobuf", version = "24.4")
bazel_dep(name = "rules_cc", version = "0.0.9")
bazel_dep(name = "rules_proto", version = "6.0.0-rc2")
8 changes: 4 additions & 4 deletions external_libs/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ cc_test(
srcs = ["editscript_test.cc"],
deps = [
":editscript",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:string_view",
"@com_google_googletest//:gtest",
"@com_google_googletest//:gtest_main",
"@abseil-cpp//absl/strings",
"@abseil-cpp//absl/strings:string_view",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)
6 changes: 3 additions & 3 deletions third_party/proto/kythe/BUILD
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Unfortunately, can't use @com_google_protobuf//bazel:cc_proto_library.bzl
# Unfortunately, can't use @protobuf//bazel:cc_proto_library.bzl
# here, as this does not seem to work with windows.
load("@rules_cc//cc:defs.bzl", "cc_proto_library")
load("@rules_proto//proto:defs.bzl", "proto_library")
Expand All @@ -23,8 +23,8 @@ proto_library(
srcs = ["analysis.proto"],
deps = [
":storage_proto",
"@com_google_protobuf//:any_proto",
"@com_google_protobuf//:timestamp_proto",
"@protobuf//:any_proto",
"@protobuf//:timestamp_proto",
],
)

Expand Down
138 changes: 69 additions & 69 deletions verible/common/analysis/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ cc_library(
srcs = ["citation.cc"],
hdrs = ["citation.h"],
deps = [
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:string_view",
"@abseil-cpp//absl/strings",
"@abseil-cpp//absl/strings:string_view",
],
)

Expand All @@ -39,8 +39,8 @@ cc_library(
"//verible/common/text:tree-utils",
"//verible/common/util:logging",
"//verible/common/util:spacer",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:string_view",
"@abseil-cpp//absl/strings",
"@abseil-cpp//absl/strings:string_view",
],
)

Expand All @@ -49,8 +49,8 @@ cc_library(
hdrs = ["lint-rule.h"],
deps = [
":lint-rule-status",
"@com_google_absl//absl/status",
"@com_google_absl//absl/strings:string_view",
"@abseil-cpp//absl/status",
"@abseil-cpp//absl/strings:string_view",
],
)

Expand Down Expand Up @@ -81,7 +81,7 @@ cc_library(
"//verible/common/text:token-stream-view",
"//verible/common/util:iterator-range",
"//verible/common/util:logging",
"@com_google_absl//absl/strings:string_view",
"@abseil-cpp//absl/strings:string_view",
],
)

Expand All @@ -95,9 +95,9 @@ cc_library(
"//verible/common/util:file-util",
"//verible/common/util:logging",
"//verible/common/util:user-interaction",
"@com_google_absl//absl/status",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:string_view",
"@abseil-cpp//absl/status",
"@abseil-cpp//absl/strings",
"@abseil-cpp//absl/strings:string_view",
],
)

Expand All @@ -111,9 +111,9 @@ cc_test(
"//verible/common/text:constants",
"//verible/common/text:token-info",
"//verible/common/text:token-info-test-util",
"@com_google_absl//absl/strings:string_view",
"@com_google_googletest//:gtest",
"@com_google_googletest//:gtest_main",
"@abseil-cpp//absl/strings:string_view",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand All @@ -134,12 +134,12 @@ cc_library(
"//verible/common/util:file-util",
"//verible/common/util:iterator-range",
"//verible/common/util:logging",
"@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:string_view",
"@com_googlesource_code_re2//:re2",
"@abseil-cpp//absl/container:flat_hash_map",
"@abseil-cpp//absl/status",
"@abseil-cpp//absl/status:statusor",
"@abseil-cpp//absl/strings",
"@abseil-cpp//absl/strings:string_view",
"@re2",
],
)

Expand All @@ -159,8 +159,8 @@ cc_library(
"//verible/common/text:token-stream-view",
"//verible/common/util:logging",
"//verible/common/util:spacer",
"@com_google_absl//absl/status",
"@com_google_absl//absl/strings:string_view",
"@abseil-cpp//absl/status",
"@abseil-cpp//absl/strings:string_view",
],
)

Expand All @@ -175,10 +175,10 @@ cc_library(
"//verible/common/text:token-info-test-util",
"//verible/common/util:algorithm",
"//verible/common/util:logging",
"@com_google_absl//absl/status",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:string_view",
"@com_google_googletest//:gtest", # for library testonly
"@abseil-cpp//absl/status",
"@abseil-cpp//absl/strings",
"@abseil-cpp//absl/strings:string_view",
"@googletest//:gtest", # for library testonly
],
)

Expand All @@ -195,7 +195,7 @@ cc_library(
"//verible/common/text:tree-utils",
"//verible/common/util:algorithm",
"//verible/common/util:logging",
"@com_google_absl//absl/strings:string_view",
"@abseil-cpp//absl/strings:string_view",
],
)

Expand All @@ -207,7 +207,7 @@ cc_library(
":line-lint-rule",
":lint-rule-status",
"//verible/common/util:logging",
"@com_google_absl//absl/strings:string_view",
"@abseil-cpp//absl/strings:string_view",
],
)

Expand All @@ -222,7 +222,7 @@ cc_library(
":linter-test-utils",
"//verible/common/text:text-structure",
"//verible/common/util:logging",
"@com_google_absl//absl/strings:string_view",
"@abseil-cpp//absl/strings:string_view",
],
)

Expand All @@ -231,7 +231,7 @@ cc_library(
hdrs = ["line-lint-rule.h"],
deps = [
":lint-rule",
"@com_google_absl//absl/strings:string_view",
"@abseil-cpp//absl/strings:string_view",
],
)

Expand Down Expand Up @@ -261,7 +261,7 @@ cc_library(
":syntax-tree-linter",
"//verible/common/text:text-structure",
"//verible/common/util:logging",
"@com_google_absl//absl/strings:string_view",
"@abseil-cpp//absl/strings:string_view",
],
)

Expand Down Expand Up @@ -301,7 +301,7 @@ cc_library(
":text-structure-lint-rule",
"//verible/common/text:text-structure",
"//verible/common/util:logging",
"@com_google_absl//absl/strings:string_view",
"@abseil-cpp//absl/strings:string_view",
],
)

Expand All @@ -316,7 +316,7 @@ cc_library(
":text-structure-linter",
"//verible/common/text:text-structure",
"//verible/common/util:logging",
"@com_google_absl//absl/strings:string_view",
"@abseil-cpp//absl/strings:string_view",
],
)

Expand All @@ -326,7 +326,7 @@ cc_library(
deps = [
":lint-rule",
"//verible/common/text:text-structure",
"@com_google_absl//absl/strings:string_view",
"@abseil-cpp//absl/strings:string_view",
],
)

Expand All @@ -353,7 +353,7 @@ cc_library(
":token-stream-linter",
"//verible/common/text:text-structure",
"//verible/common/util:logging",
"@com_google_absl//absl/strings:string_view",
"@abseil-cpp//absl/strings:string_view",
],
)

Expand All @@ -374,10 +374,10 @@ cc_test(
"//verible/common/text:concrete-syntax-tree",
"//verible/common/text:token-info",
"//verible/common/text:tree-builder-test-util",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:string_view",
"@com_google_googletest//:gtest",
"@com_google_googletest//:gtest_main",
"@abseil-cpp//absl/strings",
"@abseil-cpp//absl/strings:string_view",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand All @@ -391,9 +391,9 @@ cc_test(
"//verible/common/text:token-info",
"//verible/common/text:token-stream-view",
"//verible/common/util:iterator-range",
"@com_google_absl//absl/strings:string_view",
"@com_google_googletest//:gtest",
"@com_google_googletest//:gtest_main",
"@abseil-cpp//absl/strings:string_view",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand All @@ -405,11 +405,11 @@ cc_test(
"//verible/common/strings:line-column-map",
"//verible/common/text:text-structure",
"//verible/common/text:token-info",
"@com_google_absl//absl/status",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:string_view",
"@com_google_googletest//:gtest",
"@com_google_googletest//:gtest_main",
"@abseil-cpp//absl/status",
"@abseil-cpp//absl/strings",
"@abseil-cpp//absl/strings:string_view",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand All @@ -420,10 +420,10 @@ cc_test(
":lint-rule-status",
":linter-test-utils",
"//verible/common/util:range",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:string_view",
"@com_google_googletest//:gtest",
"@com_google_googletest//:gtest_main",
"@abseil-cpp//absl/strings",
"@abseil-cpp//absl/strings:string_view",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand All @@ -435,9 +435,9 @@ cc_test(
":line-linter",
":lint-rule-status",
"//verible/common/text:token-info",
"@com_google_absl//absl/strings:string_view",
"@com_google_googletest//:gtest",
"@com_google_googletest//:gtest_main",
"@abseil-cpp//absl/strings:string_view",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand All @@ -455,9 +455,9 @@ cc_test(
"//verible/common/text:token-info",
"//verible/common/text:tree-builder-test-util",
"//verible/common/util:casts",
"@com_google_absl//absl/strings:string_view",
"@com_google_googletest//:gtest",
"@com_google_googletest//:gtest_main",
"@abseil-cpp//absl/strings:string_view",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand All @@ -471,8 +471,8 @@ cc_test(
"//verible/common/text:syntax-tree-context",
"//verible/common/text:tree-builder-test-util",
"//verible/common/text:tree-utils",
"@com_google_googletest//:gtest",
"@com_google_googletest//:gtest_main",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand All @@ -484,10 +484,10 @@ cc_test(
":syntax-tree-search-test-utils",
"//verible/common/text:tree-builder-test-util",
"//verible/common/util:range",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:string_view",
"@com_google_googletest//:gtest",
"@com_google_googletest//:gtest_main",
"@abseil-cpp//absl/strings",
"@abseil-cpp//absl/strings:string_view",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand All @@ -500,10 +500,10 @@ cc_test(
":text-structure-linter",
"//verible/common/text:text-structure",
"//verible/common/text:token-info",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:string_view",
"@com_google_googletest//:gtest",
"@com_google_googletest//:gtest_main",
"@abseil-cpp//absl/strings",
"@abseil-cpp//absl/strings:string_view",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)

Expand All @@ -516,8 +516,8 @@ cc_test(
":token-stream-linter",
"//verible/common/text:token-info",
"//verible/common/text:token-stream-view",
"@com_google_absl//absl/strings:string_view",
"@com_google_googletest//:gtest",
"@com_google_googletest//:gtest_main",
"@abseil-cpp//absl/strings:string_view",
"@googletest//:gtest",
"@googletest//:gtest_main",
],
)
Loading

0 comments on commit 47c7794

Please sign in to comment.