Skip to content
Merged
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
6 changes: 3 additions & 3 deletions scala_proto/scala_proto.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ def _colon_paths(data):

def _gen_proto_srcjar_impl(ctx):
acc_imports = []
transitive_proto_paths = depset()
transitive_proto_paths = []

proto_deps, jvm_deps = [], []
for target in ctx.attr.deps:
Expand All @@ -329,7 +329,7 @@ def _gen_proto_srcjar_impl(ctx):
acc_imports.append(target.proto.transitive_sources)
#inline this if after 0.12.0 is the oldest supported version
if hasattr(target.proto, 'transitive_proto_path'):
transitive_proto_paths += target.proto.transitive_proto_path
transitive_proto_paths.append(target.proto.transitive_proto_path)
else:
jvm_deps.append(target)

Expand All @@ -345,7 +345,7 @@ def _gen_proto_srcjar_impl(ctx):
# Command line args to worker cannot be empty so using padding
flags_arg = "-" + ",".join(ctx.attr.flags),
# Command line args to worker cannot be empty so using padding
packages = "-" + ":".join(transitive_proto_paths.to_list())
packages = "-" + ":".join(transitive_proto_paths)
)
argfile = ctx.actions.declare_file("%s_worker_input" % ctx.label.name, sibling = ctx.outputs.srcjar)
ctx.actions.write(output=argfile, content=worker_content)
Expand Down