Pass scalac as executable (#1121)

* Pass scalac as executable

* Add scalac to tools maybe this will resolve runfiles

* proto toolchain exposes ctx.attr.scalac.files_to_run

* change scalac cfg host -> exec

Author: simuons

scala/private/common_attributes.bzl

@@ -100,9 +100,10 @@ implicit_deps = {
         default = Label("@bazel_tools//tools/jdk:current_java_runtime"),
     ),
     "_scalac": attr.label(
-        default = Label(
-            "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/scalac",
-        ),
+        executable = True,
+        cfg = "exec",
+        default = Label("@io_bazel_rules_scala//src/java/io/bazel/rulesscala/scalac"),
+        allow_files = True,
     ),
     "_exe": attr.label(
         executable = True,

scala/private/phases/phase_compile.bzl

@@ -204,7 +204,7 @@ def _compile_or_empty(
             ctx.attr.print_compile_time,
             ctx.attr.expect_java_output,
             ctx.attr.scalac_jvm_flags,
-            ctx.attr._scalac,
+            ctx.executable._scalac,
             dependency_info,
             unused_dependency_checker_ignored_targets,
         )

scala/private/rule_impls.bzl

@@ -177,16 +177,12 @@ DiagnosticsFile: {diagnostics_output}
         content = scalac_args + optional_scalac_args,
     )
 
-    scalac_inputs, _, scalac_input_manifests = ctx.resolve_command(
-        tools = [scalac],
-    )
-
     outs = [output, statsfile, diagnosticsfile]
 
     ins = (
         compiler_classpath_jars.to_list() + all_srcjars.to_list() + list(sources) +
         plugins_list + internal_plugin_jars + classpath_resources + resources +
-        resource_jars + [manifest, argfile] + scalac_inputs
+        resource_jars + [manifest, argfile]
     )
 
     # scalac_jvm_flags passed in on the target override scalac_jvm_flags passed in on the
@@ -199,8 +195,7 @@ DiagnosticsFile: {diagnostics_output}
         ctx.actions.run(
             inputs = ins,
             outputs = outs,
-            executable = scalac.files_to_run.executable,
-            input_manifests = scalac_input_manifests,
+            executable = scalac,
             mnemonic = "Scalac",
             progress_message = "scala %s" % target_label,
             execution_requirements = {"supports-workers": "1"},
@@ -222,8 +217,7 @@ DiagnosticsFile: {diagnostics_output}
         ctx.actions.run(
             inputs = ins,
             outputs = outs,
-            executable = scalac.files_to_run.executable,
-            input_manifests = scalac_input_manifests,
+            executable = scalac,
             mnemonic = "Scalac",
             progress_message = "scala %s" % target_label,
             execution_requirements = {"supports-workers": "1"},

scala_proto/scala_proto_toolchain.bzl

@@ -10,7 +10,7 @@ def _scala_proto_toolchain_impl(ctx):
         blacklisted_protos = ctx.attr.blacklisted_protos,
         code_generator = ctx.attr.code_generator,
         extra_generator_dependencies = ctx.attr.extra_generator_dependencies,
-        scalac = ctx.attr.scalac,
+        scalac = ctx.attr.scalac.files_to_run,
         named_generators = ctx.attr.named_generators,
     )
     return [toolchain]
@@ -39,9 +39,10 @@ scala_proto_toolchain = rule(
             providers = [JavaInfo],
         ),
         "scalac": attr.label(
-            default = Label(
-                "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/scalac",
-            ),
+            executable = True,
+            cfg = "exec",
+            default = Label("@io_bazel_rules_scala//src/java/io/bazel/rulesscala/scalac"),
+            allow_files = True,
         ),
     },
 )

twitter_scrooge/twitter_scrooge.bzl

@@ -284,7 +284,7 @@ def _compile_generated_scala(
         print_compile_time = False,
         expect_java_output = False,
         scalac_jvm_flags = [],
-        scalac = ctx.attr._scalac,
+        scalac = ctx.executable._scalac,
         dependency_info = legacy_unclear_dependency_info_for_protobuf_scrooge(ctx),
         unused_dependency_checker_ignored_targets = [],
     )
@@ -449,10 +449,10 @@ scrooge_scala_aspect = aspect(
         common_attrs,
         {
             "_scalac": attr.label(
-                default = Label(
-                    "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/scalac",
-                ),
+                executable = True,
                 cfg = "exec",
+                default = Label("@io_bazel_rules_scala//src/java/io/bazel/rulesscala/scalac"),
+                allow_files = True,
             ),
         },
     ),