From 475a7033c6c2be244e9165d832a7de6b77f79cdf Mon Sep 17 00:00:00 2001 From: Oscar Boykin Date: Sun, 25 Mar 2018 12:53:01 -1000 Subject: [PATCH] Fix bazel deprecations in jmh rules --- jmh/jmh.bzl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jmh/jmh.bzl b/jmh/jmh.bzl index 7fe0f49eb..40bfd5dff 100644 --- a/jmh/jmh.bzl +++ b/jmh/jmh.bzl @@ -66,19 +66,19 @@ def _scala_construct_runtime_classpath(deps): java_targets = [d.java for d in deps if hasattr(d, "java")] files = [] for scala in scala_targets: - files += list(scala.transitive_runtime_jars) + files.append(scala.transitive_runtime_jars) for java in java_targets: - files += list(java.transitive_runtime_deps) - return files + files.append(java.transitive_runtime_deps) + return depset(transitive = files) def _scala_generate_benchmark(ctx): class_jar = ctx.attr.src.scala.outputs.class_jar classpath = _scala_construct_runtime_classpath([ctx.attr.src]) - ctx.action( + ctx.actions.run( outputs = [ctx.outputs.src_jar, ctx.outputs.resource_jar], - inputs = [class_jar] + classpath, + inputs = depset([class_jar], transitive = [classpath]), executable = ctx.executable._generator, - arguments = [f.path for f in [class_jar, ctx.outputs.src_jar, ctx.outputs.resource_jar] + classpath], + arguments = [f.path for f in [class_jar, ctx.outputs.src_jar, ctx.outputs.resource_jar] + classpath.to_list()], progress_message = "Generating benchmark code for %s" % ctx.label, )