opendev/gerrit
Code Issues Proposed changes

Remove the + operator on dicts from .bzl files

Browse Source 
The + operator on dicts is deprecated and will be removed from future
version of Bazel.

Change-Id: I9f3db02f13c1c56c3afc4cc94b142513f0ae3908
(cherry picked from commit 4c8be85fcf)
This commit is contained in:
Vladimir Moskva 2018-01-05 16:59:03 +01:00 committed by Paladox none
parent 66a0c4a343
commit a10e967160
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/bzl/asciidoc.bzl
View File

@ -137,9 +137,9 @@ _asciidoc_attrs = {
}
_asciidoc = rule(
attrs = _asciidoc_attrs + {
attrs = dict(_asciidoc_attrs.items() + {
"outs": attr.output_list(mandatory = True),
},
}.items()),
implementation = _asciidoc_impl,
)

8
tools/bzl/js.bzl
View File

@ -184,10 +184,10 @@ def _js_component(ctx):
js_component = rule(
_js_component,
attrs = _common_attrs + {
attrs = dict(_common_attrs.items() + {
"srcs": attr.label_list(allow_files = [".js"]),
"license": attr.label(allow_single_file = True),
},
}.items()),
outputs = {
"zip": "%{name}.zip",
},
@ -195,14 +195,14 @@ js_component = rule(
_bower_component = rule(
_bower_component_impl,
attrs = _common_attrs + {
attrs = dict(_common_attrs.items() + {
"zipfile": attr.label(allow_single_file = [".zip"]),
"license": attr.label(allow_single_file = True),
"version_json": attr.label(allow_files = [".json"]),
# If set, define by hand, and don't regenerate this entry in bower2bazel.
"seed": attr.bool(default = False),
},
}.items()),
)
# TODO(hanwen): make license mandatory.