Skip to content

Commit 9f55af3

Browse files
committed
Deprecate closure_repositories in favor of rules_closure_{dependencies,toolchains}
This PR adds macros to closure/repositories.bzl to make rules_closure more compliant with Bazel's Style Guide for Rules. Working towards bazelbuild#421
1 parent c93f1c4 commit 9f55af3

File tree

3 files changed

+28
-12
lines changed

3 files changed

+28
-12
lines changed

WORKSPACE

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,10 @@ workspace(name = "io_bazel_rules_closure")
22

33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44
load("//closure/private:java_import_external.bzl", "java_import_external")
5-
load("//closure:repositories.bzl", "closure_repositories")
65

7-
closure_repositories()
8-
9-
http_archive(
10-
name = "zlib",
11-
build_file = "//:third_party/zlib.BUILD",
12-
sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1",
13-
strip_prefix = "zlib-1.2.11",
14-
urls = ["https://zlib.net/zlib-1.2.11.tar.gz"],
15-
)
6+
load("@io_bazel_rules_closure//closure:repositories.bzl", "rules_closure_dependencies", "rules_closure_toolchains")
7+
rules_closure_dependencies()
8+
rules_closure_toolchains()
169

1710
http_archive(
1811
name = "bazel_skylib",

closure/defs.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ closure_js_template_library = _closure_js_template_library
4949
closure_js_test = _closure_js_test
5050
phantomjs_test = _phantomjs_test
5151
filegroup_external = _filegroup_external
52-
closure_repositories = _closure_repositories
52+
closure_repositories = _closure_repositories # TODO(yannic): Remove on 2019-11-01.
5353
web_library = _web_library
5454
web_library_external = _web_library_external

closure/repositories.bzl

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,30 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file"
1818
load("//closure/private:java_import_external.bzl", "java_import_external")
1919
load("//closure/private:platform_http_file.bzl", "platform_http_file")
2020

21-
def closure_repositories(
21+
_ERROR_CLOSURE_REPOSITORIES_IS_DEPRECATED = """
22+
closure_repositories() is deprecated.
23+
24+
Please add the following to your workspace instead:
25+
26+
load("@io_bazel_rules_closure//closure:repositories.bzl", "rules_closure_dependencies", "rules_closure_toolchains")
27+
rules_closure_dependencies()
28+
rules_closure_toolchains()
29+
""".strip()
30+
31+
def closure_repositories(**kargs):
32+
"""Legacy macro to import dependencies for Closure Rules."""
33+
34+
print(_ERROR_CLOSURE_REPOSITORIES_IS_DEPRECATED)
35+
rules_closure_dependencies(**kargs)
36+
37+
def rules_closure_toolchains():
38+
"""An utility method to load all Closure toolchains.
39+
40+
It doesn't do anything at the moment.
41+
"""
42+
pass
43+
44+
def rules_closure_dependencies(
2245
omit_aopalliance = False,
2346
omit_args4j = False,
2447
omit_bazel_skylib = False,

0 commit comments

Comments
 (0)