diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2019-03-03 10:19:01 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2019-03-03 12:47:16 +0100 |
| commit | 41541224b3743921bbd833270113e9b4cc1ff490 (patch) | |
| tree | 7b9f45e5159a7159d19ba7e09bfe6f1bd4f4f7dc /tools | |
| parent | 5cd7ef3ebf86469e7be0e3dc4d95c27de2671308 (diff) | |
javadoc.bzl: Avoid using deprecated depset union
Change-Id: I159907dcdbbe23e50cfe1e7a1f50357576e0217e
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/bzl/javadoc.bzl | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tools/bzl/javadoc.bzl b/tools/bzl/javadoc.bzl index d315f8f6f6..fcf9f336d6 100644 --- a/tools/bzl/javadoc.bzl +++ b/tools/bzl/javadoc.bzl @@ -17,13 +17,10 @@ def _impl(ctx): zip_output = ctx.outputs.zip - transitive_jar_set = depset() - source_jars = depset() - for l in ctx.attr.libs: - source_jars += l.java.source_jars - transitive_jar_set += l.java.transitive_deps + transitive_jars = depset(transitive = [l.java.transitive_deps for l in ctx.attr.libs]) + source_jars = depset(transitive = [l.java.source_jars for l in ctx.attr.libs]) - transitive_jar_paths = [j.path for j in transitive_jar_set.to_list()] + transitive_jar_paths = [j.path for j in transitive_jars.to_list()] dir = ctx.outputs.zip.path + ".dir" source = ctx.outputs.zip.path + ".source" external_docs = ["http://docs.oracle.com/javase/8/docs/api"] + ctx.attr.external_docs @@ -56,7 +53,7 @@ def _impl(ctx): "(cd %s && zip -Xqr ../%s *)" % (dir, ctx.outputs.zip.basename), ] ctx.actions.run_shell( - inputs = transitive_jar_set.to_list() + source_jars.to_list() + ctx.files._jdk, + inputs = transitive_jars.to_list() + source_jars.to_list() + ctx.files._jdk, outputs = [zip_output], command = " && ".join(cmd), ) |