Skip to content
This repository was archived by the owner on Sep 8, 2022. It is now read-only.

Commit 574ec27

Browse files
authored
Merge pull request #101 from lrytz/newCollections
Implicit conversions from Array to Seq is deprecated in 2.13
2 parents b44ccb0 + 4809d1e commit 574ec27

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/main/scala/scala/tools/partest/nest/AntRunner.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ abstract class AntRunner(srcDir: String, testClassLoader: URLClassLoader, javaCm
2020
nestUI = nestUI,
2121
javaCmdPath = Option(javaCmd).map(_.getAbsolutePath) getOrElse PartestDefaults.javaCmd,
2222
javacCmdPath = Option(javacCmd).map(_.getAbsolutePath) getOrElse PartestDefaults.javacCmd,
23-
scalacExtraArgs = scalacArgs,
23+
scalacExtraArgs = scalacArgs.toIndexedSeq,
2424
javaOpts = javaOpts.map(_.mkString(" ")).getOrElse(PartestDefaults.javaOpts)) {
2525

2626
def error(msg: String): Nothing = sys.error(msg)

src/main/scala/scala/tools/partest/nest/Runner.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ class Runner(val testFile: File, val suiteRunner: SuiteRunner, val nestUI: NestU
607607
) ++ antOptions ++ args
608608
)
609609

610-
runCommand(cmd, output)
610+
runCommand(cmd.toIndexedSeq, output)
611611
}
612612

613613
def runAntTest(): (Boolean, LogContext) = {
@@ -619,7 +619,7 @@ class Runner(val testFile: File, val suiteRunner: SuiteRunner, val nestUI: NestU
619619
nestUI.verbose("ant "+args.mkString(" "))
620620

621621
pushTranscript(s"ant ${args.mkString(" ")}")
622-
nextTestActionExpectTrue("ant failed", ant(args, logFile)) && diffIsOk
622+
nextTestActionExpectTrue("ant failed", ant(args.toIndexedSeq, logFile)) && diffIsOk
623623
}
624624
catch { // *catch-all*
625625
case e: Exception =>

src/main/scala/scala/tools/partest/sbt/SBTRunner.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class SBTRunner(val config: RunnerSpec.Config,
6464
nestUI = nestUI,
6565
javaCmdPath = Option(javaCmd).map(_.getAbsolutePath) getOrElse PartestDefaults.javaCmd,
6666
javacCmdPath = Option(javacCmd).map(_.getAbsolutePath) getOrElse PartestDefaults.javacCmd,
67-
scalacExtraArgs = scalacArgs,
67+
scalacExtraArgs = scalacArgs.toIndexedSeq,
6868
javaOpts = javaOpts,
6969
scalacOpts = scalacOpts) { self =>
7070

0 commit comments

Comments
 (0)