diff --git a/third_party/utils/src/test/BUILD b/third_party/utils/src/test/BUILD index ff59918d5..c00df5edd 100644 --- a/third_party/utils/src/test/BUILD +++ b/third_party/utils/src/test/BUILD @@ -13,6 +13,12 @@ scala_library( any_3 = [ "io/bazel/rulesscala/utils/Scala3CompilerUtils.scala", ], + before_2_13_9 = [ + "io/bazel/rulesscala/utils/CommandLineParserAdapter_before_2_13_9.scala", + ], + between_2_13_9_and_3 = [ + "io/bazel/rulesscala/utils/CommandLineParserAdapter_since_2_13_9.scala", + ], ), visibility = ["//visibility:public"], deps = [ diff --git a/third_party/utils/src/test/io/bazel/rulesscala/utils/CommandLineParserAdapter_before_2_13_9.scala b/third_party/utils/src/test/io/bazel/rulesscala/utils/CommandLineParserAdapter_before_2_13_9.scala new file mode 100644 index 000000000..ab05c19f2 --- /dev/null +++ b/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) +} diff --git a/third_party/utils/src/test/io/bazel/rulesscala/utils/CommandLineParserAdapter_since_2_13_9.scala b/third_party/utils/src/test/io/bazel/rulesscala/utils/CommandLineParserAdapter_since_2_13_9.scala new file mode 100644 index 000000000..6b09bdf08 --- /dev/null +++ b/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) + } +} diff --git a/third_party/utils/src/test/io/bazel/rulesscala/utils/TestUtil.scala b/third_party/utils/src/test/io/bazel/rulesscala/utils/TestUtil.scala index 8f16951e2..11e8e26f7 100644 --- a/third_party/utils/src/test/io/bazel/rulesscala/utils/TestUtil.scala +++ b/third_party/utils/src/test/io/bazel/rulesscala/utils/TestUtil.scala @@ -7,7 +7,6 @@ import scala.reflect.io.AbstractFile import scala.reflect.io.Directory import scala.reflect.io.PlainDirectory import scala.reflect.io.VirtualDirectory -import scala.tools.cmd.CommandLineParser import scala.tools.nsc.CompilerCommand import scala.tools.nsc.Global import scala.tools.nsc.Settings @@ -116,7 +115,7 @@ object TestUtil { output: AbstractFile ): List[StoreReporter#Info] = { // TODO: Optimize and cache global. - val options = CommandLineParser.tokenize(compileOptions) + val options = CommandLineParserAdapter.tokenize(compileOptions) val reporter = new StoreReporter() val settings = new Settings(println) val _ = new CompilerCommand(options, settings)