luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Array to talk to proper build

This commit is contained in:
Eugene Yokota 2020-03-18 16:28:51 -04:00
parent 5840532687
commit d2def1ac74
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
project/Scripted.scala
View File

@ -121,7 +121,7 @@ object Scripted {
prescripted: java.util.List[File], prescripted: java.util.List[File],
scalaVersion: String, scalaVersion: String,
sbtVersion: String, sbtVersion: String,
classpath: Seq[File], classpath: Array[File],
instances: Int instances: Int
): Unit ): Unit
} }
@ -154,7 +154,7 @@ object Scripted {
callback, callback,
scalaVersion, scalaVersion,
sbtVersion, sbtVersion,
classpath, classpath.toArray,
instances instances
) )
} catch { case ite: InvocationTargetException => throw ite.getCause } } catch { case ite: InvocationTargetException => throw ite.getCause }

6
scripted-sbt-redux/src/main/scala/sbt/scriptedtest/ScriptedTests.scala
View File

@ -392,7 +392,7 @@ object ScriptedTests extends ScriptedRunner {
new java.util.ArrayList[File], new java.util.ArrayList[File],
defScalaVersion, defScalaVersion,
sbtVersion, sbtVersion,
cp.toSeq, cp,
1 1
) )
} }
@ -413,7 +413,7 @@ class ScriptedRunner {
prescripted: java.util.List[File], prescripted: java.util.List[File],
scalaVersion: String, scalaVersion: String,
sbtVersion: String, sbtVersion: String,
classpath: Seq[File], classpath: Array[File],
instances: Int instances: Int
): Unit = { ): Unit = {
val addTestFile = (f: File) => { prescripted.add(f); () } val addTestFile = (f: File) => { prescripted.add(f); () }
@ -444,7 +444,7 @@ class ScriptedRunner {
prescripted: java.util.List[File], prescripted: java.util.List[File],
sbtVersion: String, sbtVersion: String,
scalaVersion: String, scalaVersion: String,
classpath: Seq[File], classpath: Array[File],
instances: Int instances: Int
): Unit = ): Unit =
runInParallel( runInParallel(