WIP

Author: scoquelin

dt_patches/dt_patch_test.sh

@@ -121,4 +121,7 @@ run_test_local test_compiler_srcjar 2.12.14
 run_test_local test_compiler_srcjar 2.12.15
 run_test_local test_compiler_srcjar 2.12.16
 run_test_local test_compiler_srcjar_nonhermetic 2.12.17
-run_test_local test_compiler_srcjar_nonhermetic 2.12.18
+run_test_local test_compiler_srcjar_nonhermetic 2.12.18
+
+run_test_local test_compiler_srcjar_nonhermetic 2.13.11
+run_test_local test_compiler_srcjar_nonhermetic 2.13.12

dt_patches/test_dt_patches_user_srcjar/WORKSPACE

@@ -91,6 +91,12 @@ srcjars_by_version = {
     "2.12.18": {
         "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.18/scala-compiler-2.12.18-sources.jar?foo",
     },
+    "2.13.11": {
+        "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.11/scala-compiler-2.13.11-sources.jar?foo",
+    },
+    "2.13.12": {
+        "url": "https://repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.12/scala-compiler-2.13.12-sources.jar?foo",
+    },
 }
 
 rules_scala_setup(scala_compiler_srcjar = srcjars_by_version[SCALA_VERSION])

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

@@ -7,10 +7,10 @@ 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
+import scala.tools.nsc.settings.MutableSettings
 import scala.tools.nsc.reporters.StoreReporter
 import io.bazel.rulesscala.dependencyanalyzer.DependencyTrackingMethod
 
@@ -108,7 +108,7 @@ object TestUtil {
     output: AbstractFile
   ): List[StoreReporter#Info] = {
     // TODO: Optimize and cache global.
-    val options = CommandLineParser.tokenize(compileOptions)
+    val options = new MutableSettings(_ => ()).splitParams(compileOptions)
     val reporter = new StoreReporter()
     val settings = new Settings(println)
     val _ = new CompilerCommand(options, settings)