Skip to content
This repository was archived by the owner on Jul 31, 2023. It is now read-only.

Commit 67ea065

Browse files
authored
Get rules_apple and apple_support via grpc_deps. (#379)
1 parent 8058a1b commit 67ea065

2 files changed

Lines changed: 10 additions & 26 deletions

File tree

WORKSPACE

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -46,47 +46,33 @@ http_archive(
4646
urls = ["https://github.com/google/benchmark/archive/master.zip"],
4747
)
4848

49-
# Used by gRPC.
49+
# gRPC
5050
http_archive(
51-
name = "build_bazel_rules_apple",
52-
strip_prefix = "rules_apple-master",
53-
urls = ["https://github.com/bazelbuild/rules_apple/archive/master.zip"],
51+
name = "com_github_grpc_grpc",
52+
strip_prefix = "grpc-master",
53+
urls = ["https://github.com/grpc/grpc/archive/master.tar.gz"],
5454
)
5555

56+
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
57+
58+
grpc_deps()
59+
60+
# grpc_deps() cannot load() its deps, this WORKSPACE has to do it.
61+
# See also: https://github.com/bazelbuild/bazel/issues/1943
5662
load(
5763
"@build_bazel_rules_apple//apple:repositories.bzl",
5864
"apple_rules_dependencies",
5965
)
6066

6167
apple_rules_dependencies()
6268

63-
# Used by gRPC.
64-
http_archive(
65-
name = "build_bazel_apple_support",
66-
strip_prefix = "apple_support-master",
67-
urls = ["https://github.com/bazelbuild/apple_support/archive/master.zip"],
68-
)
69-
7069
load(
7170
"@build_bazel_apple_support//lib:repositories.bzl",
7271
"apple_support_dependencies",
7372
)
7473

7574
apple_support_dependencies()
7675

77-
# gRPC
78-
http_archive(
79-
name = "com_github_grpc_grpc",
80-
strip_prefix = "grpc-master",
81-
urls = ["https://github.com/grpc/grpc/archive/master.tar.gz"],
82-
)
83-
84-
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
85-
86-
grpc_deps()
87-
88-
# gRPC depends on upb, which depends on a @bazel_version repo
89-
# which it provides but has to be instantiated explicitly.
9076
load("@upb//bazel:repository_defs.bzl", "bazel_version_repository")
9177

9278
bazel_version_repository(name = "bazel_version")

tools/pin_deps.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ def workspace_rule(self):
5555
GitHubProject('com_google_absl', 'abseil', 'abseil-cpp'),
5656
GitHubProject('com_google_googletest', 'google', 'googletest'),
5757
GitHubProject('com_github_google_benchmark', 'google', 'benchmark'),
58-
GitHubProject('build_bazel_apple_support', 'bazelbuild', 'apple_support'),
59-
GitHubProject('build_bazel_rules_apple', 'bazelbuild', 'rules_apple'),
6058
GitHubProject('com_github_grpc_grpc', 'grpc', 'grpc'),
6159
GitHubProject('com_github_jupp0r_prometheus_cpp', 'jupp0r', 'prometheus-cpp'),
6260
GitHubProject('com_github_curl', 'curl', 'curl'),

0 commit comments

Comments
 (0)