From 305a8de3192808971671fc76e7237a4ef1cc9c4e Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 30 Jul 2018 20:28:42 -0400
Subject: [PATCH] 1.2.1-SNAPSHOT

---
 build.sbt                | 10 ++++++++--
 project/Scripted.scala   | 14 ++++----------
 project/build.properties |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/build.sbt b/build.sbt
index 2c17e3266..9570bd29b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,6 +2,7 @@ import Util._
 import Dependencies._
 import Sxr.sxr
 import com.typesafe.tools.mima.core._, ProblemFilters._
+import local.Scripted
 
 // ThisBuild settings take lower precedence,
 // but can be shared across the multi projects.
@@ -9,7 +10,7 @@ def buildLevelSettings: Seq[Setting[_]] =
   inThisBuild(
     Seq(
       organization := "org.scala-sbt",
-      version := "1.2.0",
+      version := "1.2.1-SNAPSHOT",
       description := "sbt is an interactive build tool",
       bintrayOrganization := Some("sbt"),
       bintrayRepository := {
@@ -80,7 +81,8 @@ val mimaSettings = Def settings (
   mimaPreviousArtifacts := {
     Seq(
       "1.0.0", "1.0.1", "1.0.2", "1.0.3", "1.0.4",
-      "1.1.0", "1.1.1", "1.1.2",
+      "1.1.0", "1.1.1", "1.1.2", "1.1.3", "1.1.4", "1.1.5", "1.1.6",
+      "1.2.0"
     ).map { v =>
       organization.value % moduleName.value % v cross (if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled)
     }.toSet
@@ -719,6 +721,10 @@ def allProjects =
 
 lazy val nonRoots = allProjects.map(p => LocalProject(p.id))
 
+
+ThisBuild / scriptedBufferLog := true
+ThisBuild / scriptedPrescripted := { _ => }
+
 def otherRootSettings =
   Seq(
     scripted := scriptedTask.evaluated,
diff --git a/project/Scripted.scala b/project/Scripted.scala
index 2cd17db8b..e77749d63 100644
--- a/project/Scripted.scala
+++ b/project/Scripted.scala
@@ -1,32 +1,26 @@
+package local
+
 import java.lang.reflect.InvocationTargetException
 
 import sbt._
 import sbt.internal.inc.ScalaInstance
 import sbt.internal.inc.classpath.{ ClasspathUtilities, FilteredLoader }
+import sbt.ScriptedPlugin.autoImport._
 
-object ScriptedPlugin extends AutoPlugin {
+object LocalScriptedPlugin extends AutoPlugin {
   override def requires = plugins.JvmPlugin
 
   object autoImport extends ScriptedKeys
-
   import autoImport._
-
-  override def globalSettings = super.globalSettings ++ Seq(
-    scriptedBufferLog := true,
-    scriptedPrescripted := { _ => },
-  )
 }
 
 trait ScriptedKeys {
   val publishAll = taskKey[Unit]("")
   val publishLocalBinAll = taskKey[Unit]("")
-  val scripted = inputKey[Unit]("")
   val scriptedUnpublished = inputKey[Unit]("Execute scripted without publishing sbt first. " +
         "Saves you some time when only your test has changed")
   val scriptedSource = settingKey[File]("")
   val scriptedPrescripted = taskKey[File => Unit]("")
-  val scriptedBufferLog = settingKey[Boolean]("")
-  val scriptedLaunchOpts = settingKey[Seq[String]]("options to pass to jvm launching scripted tasks")
 }
 
 object Scripted {
diff --git a/project/build.properties b/project/build.properties
index d6e35076c..f59579fd6 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.1.6
+sbt.version=1.2.0