From fd967d1215ebb1af7ac0a2bc8ac2b2cb80e6cde4 Mon Sep 17 00:00:00 2001
From: xuwei-k <6b656e6a69@gmail.com>
Date: Mon, 16 Nov 2020 14:46:53 +0900
Subject: [PATCH] set "scriptedBatchExecution := false" if sbt 0.13

---
 main/src/main/scala/sbt/ScriptedPlugin.scala           | 10 +++++++++-
 sbt/src/sbt-test/project/scripted13/build.sbt          |  6 +-----
 .../sbt-test/project/scripted13/project/plugins.sbt    |  4 ----
 sbt/src/sbt-test/project/scripted13/{disabled => test} |  3 +--
 4 files changed, 11 insertions(+), 12 deletions(-)
 rename sbt/src/sbt-test/project/scripted13/{disabled => test} (88%)

diff --git a/main/src/main/scala/sbt/ScriptedPlugin.scala b/main/src/main/scala/sbt/ScriptedPlugin.scala
index 2d79de76b..6e3b44c85 100644
--- a/main/src/main/scala/sbt/ScriptedPlugin.scala
+++ b/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,14 @@ object ScriptedPlugin extends AutoPlugin {
     scriptedClasspath := getJars(ScriptedConf).value,
     scriptedTests := scriptedTestsTask.value,
     scriptedParallelInstances := 1,
-    scriptedBatchExecution := true,
+    scriptedBatchExecution := {
+      CrossVersionUtil.binarySbtVersion(scriptedSbt.value) match {
+        case "0.13" =>
+          false
+        case _ =>
+          true
+      }
+    },
     scriptedRun := scriptedRunTask.value,
     scriptedDependencies := {
       def use[A](@deprecated("unused", "") x: A*): Unit = () // avoid unused warnings
diff --git a/sbt/src/sbt-test/project/scripted13/build.sbt b/sbt/src/sbt-test/project/scripted13/build.sbt
index 8a7182a4c..fd2fa6ebe 100644
--- a/sbt/src/sbt-test/project/scripted13/build.sbt
+++ b/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)
diff --git a/sbt/src/sbt-test/project/scripted13/project/plugins.sbt b/sbt/src/sbt-test/project/scripted13/project/plugins.sbt
index a2a45d929..217d3d1a5 100644
--- a/sbt/src/sbt-test/project/scripted13/project/plugins.sbt
+++ b/sbt/src/sbt-test/project/scripted13/project/plugins.sbt
@@ -1,5 +1 @@
-libraryDependencies += {
-   "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value
-}
-
 offline := true
diff --git a/sbt/src/sbt-test/project/scripted13/disabled b/sbt/src/sbt-test/project/scripted13/test
similarity index 88%
rename from sbt/src/sbt-test/project/scripted13/disabled
rename to sbt/src/sbt-test/project/scripted13/test
index 7cf13e886..1617a03a4 100644
--- a/sbt/src/sbt-test/project/scripted13/disabled
+++ b/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