Skip to content

Commit a9c8952

Browse files
committed
Remove deprecated closure_repositories() macro
This was deprecated in favor of `rules_closure_dependencies()` and `rules_closure_toolchains()` to be more consistent with other rules. See https://docs.bazel.build/versions/master/skylark/deploying.html#dependencies Updates bazelbuild#421
1 parent 2cfab04 commit a9c8952

File tree

3 files changed

+0
-24
lines changed

3 files changed

+0
-24
lines changed

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,6 @@ rules_closure_toolchains()
9090
You are not required to install the Closure Tools, PhantomJS, or anything else
9191
for that matter; they will be fetched automatically by Bazel.
9292

93-
> :bangbang: Release 0.10.x will be the last to support loading dependencies though
94-
> `closure_repositories()`.
95-
9693
### Overriding Dependency Versions
9794

9895
When you call `rules_closure_dependencies()` in your `WORKSPACE` file, it causes a

closure/defs.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ load("//closure/templates:closure_templates_plugin.bzl", _closure_templates_plug
2828
load("//closure/testing:closure_js_test.bzl", _closure_js_test = "closure_js_test")
2929
load("//closure/testing:phantomjs_test.bzl", _phantomjs_test = "phantomjs_test")
3030
load("//closure:filegroup_external.bzl", _filegroup_external = "filegroup_external")
31-
load("//closure:repositories.bzl", _closure_repositories = "closure_repositories")
3231
load("//closure:webfiles/web_library.bzl", _web_library = "web_library")
3332
load("//closure:webfiles/web_library_external.bzl", _web_library_external = "web_library_external")
3433

@@ -49,6 +48,5 @@ closure_templates_plugin = _closure_templates_plugin
4948
closure_js_test = _closure_js_test
5049
phantomjs_test = _phantomjs_test
5150
filegroup_external = _filegroup_external
52-
closure_repositories = _closure_repositories # TODO(yannic): Remove on 2019-11-01.
5351
web_library = _web_library
5452
web_library_external = _web_library_external

closure/repositories.bzl

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,6 @@ load("@bazel_tools//tools/build_defs/repo:java.bzl", "java_import_external")
1818
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
1919
load("//closure/private:platform_http_file.bzl", "platform_http_file")
2020

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-
3721
def rules_closure_toolchains():
3822
"""An utility method to load all Closure toolchains.
3923
@@ -70,7 +54,6 @@ def rules_closure_dependencies(
7054
omit_com_google_javascript_closure_library = False,
7155
omit_com_google_jsinterop_annotations = False,
7256
omit_com_google_protobuf = False,
73-
omit_com_google_protobuf_java = False,
7457
omit_com_google_protobuf_js = False,
7558
omit_com_google_template_soy = False,
7659
omit_com_google_template_soy_jssrc = False,
@@ -98,8 +81,6 @@ def rules_closure_dependencies(
9881
omit_rules_python = False,
9982
omit_zlib = False):
10083
"""Imports dependencies for Closure Rules."""
101-
if omit_com_google_protobuf_java:
102-
fail("omit_com_google_protobuf_java no longer supported and must be not be passed to closure_repositories()")
10384
if not omit_aopalliance:
10485
aopalliance()
10586
if not omit_args4j:

0 commit comments

Comments
 (0)