Undo setup_scala_toolchain_with_default_classpaths macro

Author: aszady

scala/BUILD

@@ -1,31 +1,28 @@
 load("@rules_java//java:defs.bzl", "java_import", "java_library")
 load("//scala:providers.bzl", "declare_deps_provider")
-load("//scala/private:macros/setup_scala_toolchain.bzl", "default_deps", "setup_scala_toolchain_with_default_classpaths")
+load("//scala/private:macros/setup_scala_toolchain.bzl", "default_deps", "setup_scala_toolchain")
 load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSION")
 
 toolchain_type(
     name = "toolchain_type",
     visibility = ["//visibility:public"],
 )
 
-setup_scala_toolchain_with_default_classpaths(
+setup_scala_toolchain(
     name = "default_toolchain",
-    scala_version = SCALA_VERSION,
     use_argument_file_in_runner = True,
 )
 
-setup_scala_toolchain_with_default_classpaths(
+setup_scala_toolchain(
     name = "unused_dependency_checker_error_toolchain",
     dependency_tracking_method = "ast-plus",
-    scala_version = SCALA_VERSION,
     unused_dependency_checker_mode = "error",
 )
 
-setup_scala_toolchain_with_default_classpaths(
+setup_scala_toolchain(
     name = "minimal_direct_source_deps",
     dependency_mode = "plus-one",
     dependency_tracking_method = "ast",
-    scala_version = SCALA_VERSION,
     strict_deps_mode = "error",
     unused_dependency_checker_mode = "error",
 )

scala/private/macros/setup_scala_toolchain.bzl

@@ -5,9 +5,9 @@ load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSION")
 
 def setup_scala_toolchain(
         name,
-        scala_compile_classpath,
-        scala_library_classpath,
-        scala_macro_classpath,
+        scala_compile_classpath = None,
+        scala_library_classpath = None,
+        scala_macro_classpath = None,
         scala_version = SCALA_VERSION,
         scala_xml_deps = None,
         parser_combinators_deps = None,
@@ -22,20 +22,26 @@ def setup_scala_toolchain(
     scala_macro_classpath_provider = "%s_scala_macro_classpath_provider" % name
     semanticdb_deps_provider = "%s_semanticdb_deps_provider" % name
 
+    if scala_compile_classpath == None:
+        scala_compile_classpath = default_deps("scala_compile_classpath", scala_version)
     declare_deps_provider(
         name = scala_compile_classpath_provider,
         deps_id = "scala_compile_classpath",
         visibility = visibility,
         deps = scala_compile_classpath,
     )
 
+    if scala_library_classpath == None:
+        scala_library_classpath = default_deps("scala_library_classpath", scala_version)
     declare_deps_provider(
         name = scala_library_classpath_provider,
         deps_id = "scala_library_classpath",
         visibility = visibility,
         deps = scala_library_classpath,
     )
 
+    if scala_macro_classpath == None:
+        scala_macro_classpath = default_deps("scala_macro_classpath", scala_version)
     declare_deps_provider(
         name = scala_macro_classpath_provider,
         deps_id = "scala_macro_classpath",
@@ -152,16 +158,3 @@ _DEFAULT_DEPS = {
 def default_deps(deps_id, scala_version):
     versions = _DEFAULT_DEPS[deps_id]
     return versions.get("any", []) + versions.get(scala_version[0], [])
-
-def setup_scala_toolchain_with_default_classpaths(
-        name,
-        scala_version,
-        **kwargs):
-    for dep_id in (
-        "scala_compile_classpath",
-        "scala_library_classpath",
-        "scala_macro_classpath",
-    ):
-        if dep_id not in kwargs:
-            kwargs[dep_id] = default_deps(dep_id, scala_version)
-    setup_scala_toolchain(name = name, **kwargs)