Skip to content

Commit

Permalink
Bazel: Adapt gerrit_plugin rule to removal of resource_jars attribute
Browse files Browse the repository at this point in the history
In upcoming Bazel release 5.0 resource_jars attribute was removed: [1].
Preserve the attribute as-is to not change the caller sites and pass in
the resource jars collection to runtime_deps as recommended.

[1] bazelbuild/bazel#13221
Change-Id: I3b49112b65a4787f7d39030c60bc7fee3298f5ba
  • Loading branch information
davido committed Dec 27, 2021
1 parent 9aa1ee6 commit 0eea255
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions tools/bzl/plugin.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ def gerrit_plugin(
provided_deps = [],
srcs = [],
resources = [],
resource_jars = [],
manifest_entries = [],
dir_name = None,
target_suffix = "",
Expand All @@ -35,8 +36,6 @@ def gerrit_plugin(
**kwargs
)

static_jars = []

if not dir_name:
dir_name = name

Expand All @@ -49,7 +48,7 @@ def gerrit_plugin(
main_class = "Dummy",
runtime_deps = [
":%s__plugin" % name,
] + static_jars,
] + resource_jars,
deploy_env = deploy_env,
visibility = ["//visibility:public"],
**kwargs
Expand Down

0 comments on commit 0eea255

Please sign in to comment.