Merge branch 'bzlmod-fix-test_util-for-scala-2.13.9' into bzlmod

Author: mbland

scala/private/macros/scala_repositories.bzl

@@ -117,8 +117,8 @@ def dt_patched_compiler_setup(scala_version, scala_compiler_srcjar = None):
         )
 
 def rules_scala_setup(
-    scala_compiler_srcjar = None,
-    setup_compiler_sources = True):
+        scala_compiler_srcjar = None,
+        setup_compiler_sources = True):
     if not native.existing_rule("bazel_skylib"):
         http_archive(
             name = "bazel_skylib",

test_version/version_specific_tests_dir/scrooge_repositories.bzl

@@ -6,10 +6,6 @@ load(
     "@io_bazel_rules_scala//scala:scala_cross_version.bzl",
     "default_maven_server_urls",
 )
-load(
-    "@io_bazel_rules_scala//scala/private/extensions:toolchains.bzl",
-    "scala_toolchains_repo",
-)
 load(
     "@io_bazel_rules_scala//twitter_scrooge:twitter_scrooge.bzl",
     "twitter_scrooge",

third_party/utils/src/test/BUILD

@@ -14,10 +14,10 @@ scala_library(
             "io/bazel/rulesscala/utils/Scala3CompilerUtils.scala",
         ],
         before_2_13_9 = [
-            "io/bazel/rulesscala/utils/CompilerAPICompat_before_2_13_9.scala",
+            "io/bazel/rulesscala/utils/CommandLineParserAdapter_before_2_13_9.scala",
         ],
         between_2_13_9_and_3 = [
-            "io/bazel/rulesscala/utils/CompilerAPICompat_since_2_13_9.scala",
+            "io/bazel/rulesscala/utils/CommandLineParserAdapter_since_2_13_9.scala",
         ],
     ),
     visibility = ["//visibility:public"],

third_party/utils/src/test/io/bazel/rulesscala/utils/CommandLineParserAdapter_before_2_13_9.scala

@@ -0,0 +1,7 @@
+package io.bazel.rulesscala.utils
+
+import scala.tools.cmd.CommandLineParser
+
+object CommandLineParserAdapter {
+  def tokenize(cmd: String): List[String] = CommandLineParser.tokenize(cmd)
+}

third_party/utils/src/test/io/bazel/rulesscala/utils/CommandLineParserAdapter_since_2_13_9.scala

@@ -0,0 +1,15 @@
+package scala {
+  package rulesscala {
+    // proxy to private[scala] compiler API
+    object Proxy {
+      def tokenize(cmd: String): List[String] = sys.process.Parser.tokenize(cmd)
+    }
+  }
+}
+
+package io.bazel.rulesscala.utils {
+  object CommandLineParserAdapter {
+    def tokenize(cmd: String): List[String] =
+      scala.rulesscala.Proxy.tokenize(cmd)
+  }
+}

third_party/utils/src/test/io/bazel/rulesscala/utils/TestUtil.scala

@@ -115,7 +115,7 @@ object TestUtil extends CompilerAPICompat {
     output: AbstractFile
   ): List[StoreReporter#Info] = {
     // TODO: Optimize and cache global.
-    val options = tokenize(compileOptions)
+    val options = CommandLineParserAdapter.tokenize(compileOptions)
     val reporter = new StoreReporter()
     val settings = new Settings(println)
     val _ = new CompilerCommand(options, settings)