Fix the remaining default providers in setup_scala_toolchain

These should also point to Scala version-specific artifacts.
See previous PR: bazel-contrib#1561

Author: aszady

scala/private/macros/setup_scala_toolchain.bzl

@@ -49,25 +49,23 @@ def setup_scala_toolchain(
         deps = scala_macro_classpath,
     )
 
-    if scala_xml_deps != None:
-        declare_deps_provider(
-            name = scala_xml_provider,
-            deps_id = "scala_xml",
-            visibility = visibility,
-            deps = scala_xml_deps,
-        )
-    else:
-        scala_xml_provider = "@io_bazel_rules_scala//scala:scala_xml_provider"
+    if scala_xml_deps == None:
+        scala_xml_deps = default_deps("scala_xml", scala_version)
+    declare_deps_provider(
+        name = scala_xml_provider,
+        deps_id = "scala_xml",
+        visibility = visibility,
+        deps = scala_xml_deps,
+    )
 
-    if parser_combinators_deps != None:
-        declare_deps_provider(
-            name = parser_combinators_provider,
-            deps_id = "parser_combinators",
-            visibility = visibility,
-            deps = parser_combinators_deps,
-        )
-    else:
-        parser_combinators_provider = "@io_bazel_rules_scala//scala:parser_combinators_provider"
+    if parser_combinators_deps == None:
+        parser_combinators_deps = default_deps("parser_combinators", scala_version)
+    declare_deps_provider(
+        name = parser_combinators_provider,
+        deps_id = "parser_combinators",
+        visibility = visibility,
+        deps = parser_combinators_deps,
+    )
 
     dep_providers = [
         scala_xml_provider,