diff options
| author |  vladmos <vladmos@google.com> | 2018-01-03 12:20:57 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-03 12:22:55 -0800 |
| commit | ceaed5145f5ad27facd103a79d047cf0e301b4b5 (patch) | |
| tree | 86d92a80caa06522c5f21ea971b3b692d3520016 /tools/build_rules | |
| parent | e981d20dafc268ff9c1b5e23452e060327a0ace2 (diff) | |
Remove usages of `+` on dicts
The `+` operator on dicts is deprecated and will be removed. This change makes
Bazel files compatible with the new behavior.
Fixes #4346.
PiperOrigin-RevId: 180702882
Diffstat (limited to 'tools/build_rules')
| -rw-r--r-- | tools/build_rules/java_rules_skylark.bzl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/build_rules/java_rules_skylark.bzl b/tools/build_rules/java_rules_skylark.bzl index 4b12958c2a..ec103830d2 100644 --- a/tools/build_rules/java_rules_skylark.bzl +++ b/tools/build_rules/java_rules_skylark.bzl @@ -211,14 +211,14 @@ bootstrap_java_library = rule( fragments = ['java'], ) -java_binary_attrs_common = java_library_attrs + { +java_binary_attrs_common = dict(java_library_attrs) +java_binary_attrs_common.update({ "jvm_flags": attr.string_list(), "jvm": attr.label(default=Label("//tools/jdk:jdk"), allow_files=True), -} +}) -java_binary_attrs = java_binary_attrs_common + { - "main_class": attr.string(mandatory=True), -} +java_binary_attrs = dict(java_binary_attrs_common) +java_binary_attrs["main_class"] = attr.string(mandatory=True) java_binary_outputs = { "class_jar": "lib%{name}.jar", @@ -243,12 +243,12 @@ bootstrap_java_binary = rule(java_binary_impl, java_test = rule(java_binary_impl, executable = True, - attrs = java_binary_attrs_common + { - "main_class": attr.string(default="org.junit.runner.JUnitCore"), + attrs = dict(java_binary_attrs_common.items() + [ + ("main_class", attr.string(default="org.junit.runner.JUnitCore")), # TODO(bazel-team): it would be better if we could offer a # test_class attribute, but the "args" attribute is hard # coded in the bazel infrastructure. - }, + ]), outputs = java_binary_outputs, test = True, fragments = ['java', 'cpp'], |