Merge pull request #6091 from xuwei-k/scriptedBatchExecution-0-13

set "scriptedBatchExecution := false" if sbt 0.13

main/src/main/scala/sbt/ScriptedPlugin.scala

@@ -16,6 +16,7 @@ import sbt.nio.Keys._
 import sbt.Project._
 import sbt.internal.inc.ModuleUtilities
 import sbt.internal.inc.classpath.ClasspathUtil
+import sbt.internal.librarymanagement.cross.CrossVersionUtil
 import sbt.internal.util.complete.{ DefaultParsers, Parser }
 import sbt.io._
 import sbt.io.syntax._
@@ -78,7 +79,7 @@ object ScriptedPlugin extends AutoPlugin {
     scriptedClasspath := getJars(ScriptedConf).value,
     scriptedTests := scriptedTestsTask.value,
     scriptedParallelInstances := 1,
-    scriptedBatchExecution := true,
+    scriptedBatchExecution := CrossVersionUtil.binarySbtVersion(scriptedSbt.value) != "0.13",
     scriptedRun := scriptedRunTask.value,
     scriptedDependencies := {
       def use[A](@deprecated("unused", "") x: A*): Unit = () // avoid unused warnings

sbt/src/sbt-test/project/scripted13/build.sbt

@@ -1,5 +1 @@
-lazy val root = (project in file("."))
-  .settings(
-    sbtPlugin := true,
-    resolvers += Resolver.typesafeIvyRepo("releases")
-  )
+enablePlugins(SbtPlugin)

sbt/src/sbt-test/project/scripted13/project/plugins.sbt

@@ -1,5 +1 @@
-libraryDependencies += {
-   "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value
-}
-
 offline := true

sbt/src/sbt-test/project/scripted13/test

@@ -1,7 +1,6 @@
 # This tests that this sbt scripted plugin can launch the previous one
 
-> ++2.10.6
-> ^^0.13.16-M1
+> ^^0.13.18
 
 $ copy-file changes/A.scala src/sbt-test/a/b/A.scala
 > scripted