Skip to content

Commit bcc85cb

Browse files
authored
Merge pull request #484 from cushon/depset
`+` operator on a depset is forbidden
2 parents 7456a0b + 550ddae commit bcc85cb

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

scala_proto/scala_proto.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ def _colon_paths(data):
320320

321321
def _gen_proto_srcjar_impl(ctx):
322322
acc_imports = []
323-
transitive_proto_paths = depset()
323+
transitive_proto_paths = []
324324

325325
proto_deps, jvm_deps = [], []
326326
for target in ctx.attr.deps:
@@ -329,7 +329,7 @@ def _gen_proto_srcjar_impl(ctx):
329329
acc_imports.append(target.proto.transitive_sources)
330330
#inline this if after 0.12.0 is the oldest supported version
331331
if hasattr(target.proto, 'transitive_proto_path'):
332-
transitive_proto_paths += target.proto.transitive_proto_path
332+
transitive_proto_paths.append(target.proto.transitive_proto_path)
333333
else:
334334
jvm_deps.append(target)
335335

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

0 commit comments

Comments
 (0)