Skip to content

Use some more non deprecated APIs #462

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Apr 2, 2018
Merged

Use some more non deprecated APIs #462

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f22916
Use some more non deprecated APIs
johnynek Mar 31, 2018
5497ff8
Use actions.run for scalac
johnynek Mar 31, 2018
d6bc4d9
Merge branch 'master' into oscar/current_action_api
johnynek Mar 31, 2018
3122999
fix a few more old APIs
johnynek Mar 31, 2018
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
27 changes: 14 additions & 13 deletions scala/scala.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def _build_nosrc_jar(ctx, buildijar):
resources += "META-INF/MANIFEST.MF=%s\n" % ctx.outputs.manifest.path

zipper_arg_path = ctx.actions.declare_file("%s_zipper_args" % ctx.label.name)
ctx.file_action(zipper_arg_path, resources)
ctx.actions.write(zipper_arg_path, resources)
cmd = """
rm -f {jar_output}
{zipper} c {jar_output} @{path}
Expand All @@ -117,7 +117,7 @@ touch {statsfile}
zipper_arg_path
]

ctx.action(
ctx.actions.run_shell(
inputs=inputs,
outputs=outs,
command=cmd,
Expand Down Expand Up @@ -243,12 +243,12 @@ StatsfileOutput: {statsfile_output}
dependency_analyzer_mode = dependency_analyzer_mode,
statsfile_output = ctx.outputs.statsfile.path
)
argfile = ctx.new_file(
ctx.outputs.jar,
"%s_worker_input" % ctx.label.name
argfile = ctx.actions.declare_file(
"%s_worker_input" % ctx.label.name,
sibling = ctx.outputs.jar
)

ctx.file_action(output=argfile, content=scalac_args + optional_scalac_args)
ctx.actions.write(output=argfile, content=scalac_args + optional_scalac_args)

outs = [ctx.outputs.jar, ctx.outputs.statsfile]
if buildijar:
Expand All @@ -267,7 +267,7 @@ StatsfileOutput: {statsfile_output}
[ctx.outputs.manifest,
ctx.executable._ijar,
argfile])
ctx.action(
ctx.actions.run(
inputs=ins,
outputs=outs,
executable=ctx.executable._scalac,
Expand Down Expand Up @@ -394,7 +394,7 @@ def _build_deployable(ctx, jars):
if getattr(ctx.attr, "main_class", ""):
args.extend(["--main_class", ctx.attr.main_class])
args.extend(["--output", ctx.outputs.deploy_jar.path])
ctx.action(
ctx.actions.run(
inputs=list(jars),
outputs=[ctx.outputs.deploy_jar],
executable=ctx.executable._singlejar,
Expand All @@ -408,7 +408,7 @@ def write_manifest(ctx):
if getattr(ctx.attr, "main_class", ""):
manifest += "Main-Class: %s\n" % ctx.attr.main_class

ctx.file_action(
ctx.actions.write(
output=ctx.outputs.manifest,
content=manifest)

Expand Down Expand Up @@ -444,8 +444,8 @@ def _write_java_wrapper(ctx, args="", wrapper_preamble=""):
if wrapper_preamble == "":
exec_str = "exec "

wrapper = ctx.new_file(ctx.label.name + "_wrapper.sh")
ctx.file_action(
wrapper = ctx.actions.declare_file(ctx.label.name + "_wrapper.sh")
ctx.actions.write(
output = wrapper,
content = """#!/bin/bash
{preamble}
Expand All @@ -457,6 +457,7 @@ def _write_java_wrapper(ctx, args="", wrapper_preamble=""):
javabin=javabin,
args=args,
),
is_executable = True
)
return wrapper

Expand All @@ -466,7 +467,7 @@ def _write_executable(ctx, rjars, main_class, jvm_flags, wrapper):
# https://github.com/bazelbuild/bazel/blob/0.4.5/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt#L227
classpath = ":".join(["${RUNPATH}%s" % (j.short_path) for j in rjars])
jvm_flags = " ".join([ctx.expand_location(f, ctx.attr.data) for f in jvm_flags])
ctx.template_action(
ctx.actions.expand_template(
template = template,
output = ctx.outputs.executable,
substitutions = {
Expand All @@ -479,7 +480,7 @@ def _write_executable(ctx, rjars, main_class, jvm_flags, wrapper):
"%set_jacoco_metadata%": "",
"%workspace_prefix%": ctx.workspace_name + "/",
},
executable = True,
is_executable = True,
)

def collect_srcjars(targets):
Expand Down