Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename set to depset #117

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build_defs/intellij_plugin.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def _intellij_plugin_jar_impl(ctx):
module_to_merged_xmls = _merge_optional_plugin_xmls(ctx)
final_plugin_xml_file = _add_optional_dependencies_to_plugin_xml(ctx, module_to_merged_xmls.keys())
jar_file = _package_meta_inf_files(ctx, final_plugin_xml_file, module_to_merged_xmls)
files = set([jar_file])
files = depset([jar_file])
return struct(
files = files,
)
Expand Down
6 changes: 3 additions & 3 deletions build_defs/intellij_plugin_debug_target.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def _build_deploy_info_file(deploy_file):
)

def _intellij_plugin_debug_target_impl(ctx):
files = set()
files = depset()
deploy_files = []
for target in ctx.attr.deps:
files = files | target.files
Expand All @@ -108,8 +108,8 @@ def _intellij_plugin_debug_target_impl(ctx):

# We've already consumed any dependent intellij_plugin_debug_targets into our own,
# do not build or report these
files = set([f for f in files if not f.path.endswith(SUFFIX)])
files = files | set([output])
files = depset([f for f in files if not f.path.endswith(SUFFIX)])
files = files | depset([output])

return struct(
files = files,
Expand Down
2 changes: 1 addition & 1 deletion testing/test_defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ def _get_test_class(test_src, test_package_root):

def _get_test_srcs(targets):
"""Returns all files of the given targets that end with Test.java."""
files = set()
files = depset()
for target in targets:
files += target.files
return [f for f in files if f.basename.endswith("Test.java")]