Support for selecting scala version

WORKSPACE

@@ -24,26 +24,35 @@ load("//specs2:specs2_junit.bzl", "specs2_junit_repositories")
 
 specs2_junit_repositories()
 
-load("//scala:scala_cross_version.bzl", "scala_mvn_artifact")
+load("//scala:scala_cross_version.bzl", "scala_mvn_artifact", "default_scala_major_version")
 
 # test adding a scala jar:
 maven_jar(
     name = "com_twitter__scalding_date",
-    artifact = scala_mvn_artifact("com.twitter:scalding-date:0.17.0"),
+    artifact = scala_mvn_artifact(
+        "com.twitter:scalding-date:0.17.0",
+        default_scala_major_version(),
+    ),
     sha1 = "420fb0c4f737a24b851c4316ee0362095710caa5",
 )
 
 # For testing that we don't include sources jars to the classpath
 maven_jar(
     name = "org_typelevel__cats_core",
-    artifact = scala_mvn_artifact("org.typelevel:cats-core:0.9.0"),
+    artifact = scala_mvn_artifact(
+        "org.typelevel:cats-core:0.9.0",
+        default_scala_major_version(),
+    ),
     sha1 = "b2f8629c6ec834d8b6321288c9fe77823f1e1314",
 )
 
 # test of a plugin
 maven_jar(
     name = "org_psywerx_hairyfotr__linter",
-    artifact = scala_mvn_artifact("org.psywerx.hairyfotr:linter:0.1.13"),
+    artifact = scala_mvn_artifact(
+        "org.psywerx.hairyfotr:linter:0.1.13",
+        default_scala_major_version(),
+    ),
     sha1 = "e5b3e2753d0817b622c32aedcb888bcf39e275b4",
 )
 

scala/BUILD

@@ -1,3 +1,7 @@
+load(
+    "@io_bazel_rules_scala//scala:providers.bzl",
+    _declare_scalac_provider = "declare_scalac_provider",
+)
 load("//scala:scala_toolchain.bzl", "scala_toolchain")
 
 toolchain_type(
@@ -23,3 +27,22 @@ java_import(
     jars = ["@bazel_tools//tools/jdk:TestRunner_deploy.jar"],
     visibility = ["//visibility:public"],
 )
+
+_declare_scalac_provider(
+    name = "scala_default",
+    default_classpath = [
+        "@io_bazel_rules_scala_scala_library",
+        "@io_bazel_rules_scala_scala_reflect",
+    ],
+    default_macro_classpath = [
+        "@io_bazel_rules_scala_scala_library",
+        "@io_bazel_rules_scala_scala_reflect",
+    ],
+    default_repl_classpath = [
+        "@io_bazel_rules_scala_scala_library",
+        "@io_bazel_rules_scala_scala_reflect",
+        "@io_bazel_rules_scala_scala_compiler",
+    ],
+    scalac = "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/scalac:scalac_worker",
+    visibility = ["//visibility:public"],
+)

scala/private/rule_impls.bzl

@@ -13,7 +13,10 @@
 # limitations under the License.
 """Rules for supporting the Scala language."""
 load("@io_bazel_rules_scala//scala:scala_toolchain.bzl", "scala_toolchain")
-load("@io_bazel_rules_scala//scala:providers.bzl", "create_scala_provider")
+load(
+    "@io_bazel_rules_scala//scala:providers.bzl",
+    "create_scala_provider",
+    _ScalacProvider = "ScalacProvider")
 load(
     ":common.bzl",
     "add_labels_of_jars_to",
@@ -131,7 +134,7 @@ def compile_scala(ctx, target_label, output, manifest, statsfile, sources,
                   cjars, all_srcjars, transitive_compile_jars, plugins,
                   resource_strip_prefix, resources, resource_jars, labels,
                   in_scalacopts, print_compile_time, expect_java_output,
-                  scalac_jvm_flags):
+                  scalac_jvm_flags, scalac_provider):
   # look for any plugins:
   plugins = _collect_plugin_paths(plugins)
   dependency_analyzer_plugin_jars = []
@@ -222,15 +225,20 @@ StatsfileOutput: {statsfile_output}
   ctx.actions.write(
       output = argfile, content = scalac_args + optional_scalac_args)
 
+  scalac_inputs, _, scalac_input_manifests = ctx.resolve_command(
+      tools = [scalac_provider.scalac])
+
   outs = [output, statsfile]
-  ins = (compiler_classpath_jars.to_list() + all_srcjars.to_list() +
-         list(sources) + plugins_list + dependency_analyzer_plugin_jars +
-         classpath_resources + resources + resource_jars + [manifest, argfile])
+  ins = (
+      compiler_classpath_jars.to_list() + all_srcjars.to_list() + list(sources)
+      + plugins_list + dependency_analyzer_plugin_jars + classpath_resources +
+      resources + resource_jars + [manifest, argfile] + scalac_inputs)
 
   ctx.actions.run(
       inputs = ins,
       outputs = outs,
-      executable = ctx.executable._scalac,
+      executable = scalac_provider.scalac.files_to_run.executable,
+      input_manifests = scalac_input_manifests,
       mnemonic = "Scalac",
       progress_message = "scala %s" % target_label,
       execution_requirements = {"supports-workers": "1"},
@@ -327,7 +335,7 @@ def _compile_or_empty(ctx, manifest, jars, srcjars, buildijar,
                   ctx.attr.resource_strip_prefix, ctx.files.resources,
                   ctx.files.resource_jars, jars2labels, ctx.attr.scalacopts,
                   ctx.attr.print_compile_time, ctx.attr.expect_java_output,
-                  ctx.attr.scalac_jvm_flags)
+                  ctx.attr.scalac_jvm_flags, ctx.attr._scalac[_ScalacProvider])
 
     # build ijar if needed
     if buildijar:
@@ -472,15 +480,16 @@ def is_dependency_analyzer_off(ctx):
 # Extract very common code out from dependency analysis into single place
 # automatically adds dependency on scala-library and scala-reflect
 # collects jars from deps, runtime jars from runtime_deps, and
-def _collect_jars_from_common_ctx(ctx, extra_deps = [],
+def _collect_jars_from_common_ctx(ctx,
+                                  base_classpath,
+                                  extra_deps = [],
                                   extra_runtime_deps = []):
 
   dependency_analyzer_is_off = is_dependency_analyzer_off(ctx)
 
-  # Get jars from deps
-  auto_deps = [ctx.attr._scalalib, ctx.attr._scalareflect]
-  deps_jars = collect_jars(ctx.attr.deps + auto_deps + extra_deps,
+  deps_jars = collect_jars(ctx.attr.deps + extra_deps + base_classpath,
                            dependency_analyzer_is_off)
+
   (cjars, transitive_rjars, jars2labels,
    transitive_compile_jars) = (deps_jars.compile_jars,
                                deps_jars.transitive_runtime_jars,
@@ -497,13 +506,14 @@ def _collect_jars_from_common_ctx(ctx, extra_deps = [],
       jars2labels = jars2labels,
       transitive_compile_jars = transitive_compile_jars)
 
-def _lib(ctx, non_macro_lib):
+def _lib(ctx, base_classpath, non_macro_lib):
   # Build up information from dependency-like attributes
 
   # This will be used to pick up srcjars from non-scala library
   # targets (like thrift code generation)
   srcjars = collect_srcjars(ctx.attr.deps)
-  jars = _collect_jars_from_common_ctx(ctx)
+
+  jars = _collect_jars_from_common_ctx(ctx, base_classpath)
   (cjars, transitive_rjars) = (jars.compile_jars, jars.transitive_runtime_jars)
 
   write_manifest(ctx)
@@ -549,10 +559,13 @@ def _lib(ctx, non_macro_lib):
     )
 
 def scala_library_impl(ctx):
-  return _lib(ctx, True)
+  scalac_provider = ctx.attr._scalac[_ScalacProvider]
+  return _lib(ctx, scalac_provider.default_classpath, True)
 
 def scala_macro_library_impl(ctx):
-  return _lib(ctx, False)  # don't build the ijar for macros
+  scalac_provider = ctx.attr._scalac[_ScalacProvider]
+  return _lib(ctx, scalac_provider.default_macro_classpath,
+              False)  # don't build the ijar for macros
 
 # Common code shared by all scala binary implementations.
 def _scala_binary_common(ctx,
@@ -598,7 +611,8 @@ def _scala_binary_common(ctx,
       runfiles = runfiles)
 
 def scala_binary_impl(ctx):
-  jars = _collect_jars_from_common_ctx(ctx)
+  scalac_provider = ctx.attr._scalac[_ScalacProvider]
+  jars = _collect_jars_from_common_ctx(ctx, scalac_provider.default_classpath)
   (cjars, transitive_rjars) = (jars.compile_jars, jars.transitive_runtime_jars)
 
   wrapper = _write_java_wrapper(ctx, "", "")
@@ -614,9 +628,12 @@ def scala_binary_impl(ctx):
   return out
 
 def scala_repl_impl(ctx):
+  scalac_provider = ctx.attr._scalac[_ScalacProvider]
   # need scala-compiler for MainGenericRunner below
   jars = _collect_jars_from_common_ctx(
-      ctx, extra_runtime_deps = [ctx.attr._scalacompiler])
+      ctx,
+      scalac_provider.default_repl_classpath,
+  )
   (cjars, transitive_rjars) = (jars.compile_jars, jars.transitive_runtime_jars)
 
   args = " ".join(ctx.attr.scalacopts)
@@ -664,8 +681,11 @@ def _scala_test_flags(ctx):
 def scala_test_impl(ctx):
   if len(ctx.attr.suites) != 0:
     print("suites attribute is deprecated. All scalatest test suites are run")
+
+  scalac_provider = ctx.attr._scalac[_ScalacProvider]
   jars = _collect_jars_from_common_ctx(
       ctx,
+      scalac_provider.default_classpath,
       extra_runtime_deps = [
           ctx.attr._scalatest_reporter, ctx.attr._scalatest_runner
       ],
@@ -727,8 +747,10 @@ def scala_junit_test_impl(ctx):
     fail(
         "Setting at least one of the attributes ('prefixes','suffixes') is required"
     )
+  scalac_provider = ctx.attr._scalac[_ScalacProvider]
   jars = _collect_jars_from_common_ctx(
       ctx,
+      scalac_provider.default_classpath,
       extra_deps = [
           ctx.attr._junit, ctx.attr._hamcrest, ctx.attr.suite_label,
           ctx.attr._bazel_test_runner

scala/providers.bzl

@@ -24,3 +24,35 @@ def create_scala_provider(ijar, class_jar, compile_jars,
       transitive_runtime_jars = transitive_runtime_jars,
       transitive_exports = []  #needed by intellij plugin
   )
+
+ScalacProvider = provider(
+    doc = "ScalaProvider",
+    fields = [
+        "scalac",
+        "default_classpath",
+        "default_macro_classpath",
+        "default_repl_classpath",
+    ])
+
+def _declare_scalac_provider(ctx):
+  return [
+      ScalacProvider(
+          scalac = ctx.attr.scalac,
+          default_classpath = ctx.attr.default_classpath,
+          default_repl_classpath = ctx.attr.default_repl_classpath,
+          default_macro_classpath = ctx.attr.default_macro_classpath,
+      )
+  ]
+
+declare_scalac_provider = rule(
+    implementation = _declare_scalac_provider,
+    attrs = {
+        "scalac": attr.label(
+            executable = True,
+            cfg = "host",
+            allow_files = True,
+            mandatory = True),
+        "default_classpath": attr.label_list(allow_files = True),
+        "default_repl_classpath": attr.label_list(allow_files = True),
+        "default_macro_classpath": attr.label_list(allow_files = True),
+    })