Change singlejar to use rules_java label instead of bazel_tools

Author: jjudd

rules/common/private/utils.bzl

@@ -215,8 +215,8 @@ def action_singlejar(
     args.add("--output", output)
     if main_class != None:
         args.add("--main_class", main_class)
-        args.set_param_file_format("multiline")
-        args.use_param_file("@%s", use_always = True)
+    args.set_param_file_format("multiline")
+    args.use_param_file("@%s", use_always = True)
 
     all_inputs = depset(resources.values(), transitive = [inputs])
 

rules/scala.bzl

@@ -57,7 +57,7 @@ _compile_private_attributes = {
     ),
     "_singlejar": attr.label(
         cfg = "exec",
-        default = "@bazel_tools//tools/jdk:singlejar",
+        default = "@rules_java//toolchains:singlejar",
         executable = True,
     ),