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

Merge pull request #6151 from eatkins/scripted-batch-execution 

Only set scriptedBatchExcution true for >= 1.4
This commit is contained in:
eugene yokota 2020-11-21 13:41:01 -05:00 committed by GitHub
parent 1be1f6ddcd d686bead0b
commit f4f8b6a97e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
main/src/main/scala/sbt/ScriptedPlugin.scala
View File

@ -23,6 +23,7 @@ import sbt.io.syntax._
import sbt.librarymanagement._ import sbt.librarymanagement._
import sbt.librarymanagement.syntax._ import sbt.librarymanagement.syntax._
import sbt.nio.file.{ Glob, RecursiveGlob } import sbt.nio.file.{ Glob, RecursiveGlob }
import scala.util.Try
object ScriptedPlugin extends AutoPlugin { object ScriptedPlugin extends AutoPlugin {
@ -79,7 +80,15 @@ object ScriptedPlugin extends AutoPlugin {
scriptedClasspath := getJars(ScriptedConf).value, scriptedClasspath := getJars(ScriptedConf).value,
scriptedTests := scriptedTestsTask.value, scriptedTests := scriptedTestsTask.value,
scriptedParallelInstances := 1, scriptedParallelInstances := 1,
scriptedBatchExecution := CrossVersionUtil.binarySbtVersion(scriptedSbt.value) != "0.13", scriptedBatchExecution := {
val binVersion = CrossVersionUtil.binarySbtVersion(scriptedSbt.value)
val versionParts =
binVersion.split("\\.").flatMap(p => Try(p.takeWhile(_.isDigit).toInt).toOption).take(2)
versionParts match {
case Array(major, minor) => major > 1 || (major == 1 && minor >= 4)
case _ => false
}
},
scriptedRun := scriptedRunTask.value, scriptedRun := scriptedRunTask.value,
scriptedDependencies := { scriptedDependencies := {
def use[A](@deprecated("unused", "") x: A*): Unit = () // avoid unused warnings def use[A](@deprecated("unused", "") x: A*): Unit = () // avoid unused warnings