From d2dce8938c14a9ff14ddc09d1b27ef4143a2c702 Mon Sep 17 00:00:00 2001
From: Ian O Connell <ianoc@stripe.com>
Date: Sun, 11 Sep 2016 14:11:14 -0700
Subject: [PATCH] Undo

---
 scala/scala.bzl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scala/scala.bzl b/scala/scala.bzl
index 14b61dbeb..132240dfc 100644
--- a/scala/scala.bzl
+++ b/scala/scala.bzl
@@ -93,12 +93,12 @@ def _build_nosrc_jar(ctx, buildijar):
         out=ctx.outputs.jar.path,
         manifest=ctx.outputs.manifest.path,
         java=ctx.file._java.path,
-        jar=_get_jar_path(ctx.files.__deploy_jar))
+        jar=_get_jar_path(ctx.files._jar))
     outs = [ctx.outputs.jar]
     if buildijar:
         outs.extend([ctx.outputs.ijar])
 
-    inputs = ctx.files.resources + ctx.files._jdk + ctx.files.__deploy_jar + [
+    inputs = ctx.files.resources + ctx.files._jdk + ctx.files._jar + [
       ctx.outputs.manifest, ctx.file._java
       ]
 
@@ -241,7 +241,7 @@ def _compile(ctx, _jars, dep_srcjars, buildijar):
         scalac_args=scalac_args_file.path,
         out=ctx.outputs.jar.path,
         manifest=ctx.outputs.manifest.path,
-        jar=_get_jar_path(ctx.files.__deploy_jar),
+        jar=_get_jar_path(ctx.files._jar),
         ijar=ctx.file._ijar.path,
       )
 
@@ -257,7 +257,7 @@ def _compile(ctx, _jars, dep_srcjars, buildijar):
            ctx.files.resources +
            ctx.files._jdk +
            ctx.files._scalac +
-           ctx.files.__deploy_jar +
+           ctx.files._jar +
            ctx.files._scalasdk +
            [ctx.outputs.manifest,
             ctx.file._ijar,
@@ -303,11 +303,11 @@ def _build_deployable(ctx, jars):
 
   cmd = cmd.format(
       out=ctx.outputs.deploy_jar.path,
-      jar=_get_jar_path(ctx.files.__deploy_jar),
+      jar=_get_jar_path(ctx.files._jar),
       java=ctx.file._java.path,
       manifest=ctx.outputs.manifest.path)
   ctx.action(
-      inputs=list(jars) + ctx.files._jdk + ctx.files.__deploy_jar + [ctx.outputs.manifest],
+      inputs=list(jars) + ctx.files._jdk + ctx.files._jar + [ctx.outputs.manifest],
       outputs=[ctx.outputs.deploy_jar],
       command=cmd,
       mnemonic="ScalaDeployJar",
@@ -533,7 +533,7 @@ _implicit_deps = {
   "_scalareflect": attr.label(default=Label("@scala//:lib/scala-reflect.jar"), single_file=True, allow_files=True),
   "_java": attr.label(executable=True, default=Label("@bazel_tools//tools/jdk:java"), single_file=True, allow_files=True),
   "_javac": attr.label(executable=True, default=Label("@bazel_tools//tools/jdk:javac"), single_file=True, allow_files=True),
-  "__deploy_jar": attr.label(executable=True, default=Label("//src/java/io/bazel/rulesscala/jar:binary_deploy.jar"), allow_files=True),
+  "_jar": attr.label(executable=True, default=Label("//src/java/io/bazel/rulesscala/jar:binary_deploy.jar"), allow_files=True),
   "_jdk": attr.label(default=Label("//tools/defaults:jdk"), allow_files=True),
 }