summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2019-03-03 10:22:00 +0100
committerDavid Ostrovsky <david@ostrovsky.org>2019-03-03 12:47:22 +0100
commitaf39827411cba8ac36d9c386c5e5a8e967e828d3 (patch)
treeff13c45c0755d4fe5205a6da9af03ea93f499741 /tools
parent41541224b3743921bbd833270113e9b4cc1ff490 (diff)
classpath.bzl: Avoid using deprecated depset union
Diffstat (limited to 'tools')
-rw-r--r--tools/bzl/classpath.bzl10
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/bzl/classpath.bzl b/tools/bzl/classpath.bzl
index 9ec5f156c5..55479c50c7 100644
--- a/tools/bzl/classpath.bzl
+++ b/tools/bzl/classpath.bzl
@@ -1,13 +1,13 @@
def _classpath_collector(ctx):
- all = depset()
+ all = []
for d in ctx.attr.deps:
if hasattr(d, "java"):
- all += d.java.transitive_runtime_deps
- all += d.java.compilation_info.runtime_classpath
+ all.append(d.java.transitive_runtime_deps)
+ all.append(d.java.compilation_info.runtime_classpath)
elif hasattr(d, "files"):
- all += d.files
+ all.append(d.files)
- as_strs = [c.path for c in all.to_list()]
+ as_strs = [c.path for c in depset(transitive = all).to_list()]
ctx.actions.write(
output = ctx.outputs.runtime,
content = "\n".join(sorted(as_strs)),