From 4bcfaee264c05f5566d2ea12304033a33eb3e811 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 30 Jul 2018 00:56:36 -0400 Subject: [PATCH 1/2] 1.2.0 --- build.sbt | 2 +- src/main/conscript/scalas/launchconfig | 3 ++- src/main/conscript/screpl/launchconfig | 3 ++- src/main/conscript/xsbt/launchconfig | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 52f284f75..2c17e3266 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,7 @@ def buildLevelSettings: Seq[Setting[_]] = inThisBuild( Seq( organization := "org.scala-sbt", - version := "1.2.0-SNAPSHOT", + version := "1.2.0", description := "sbt is an interactive build tool", bintrayOrganization := Some("sbt"), bintrayRepository := { diff --git a/src/main/conscript/scalas/launchconfig b/src/main/conscript/scalas/launchconfig index 61b9b5108..ff9e8dae5 100644 --- a/src/main/conscript/scalas/launchconfig +++ b/src/main/conscript/scalas/launchconfig @@ -4,7 +4,7 @@ [app] org: ${sbt.organization-org.scala-sbt} name: sbt - version: ${sbt.version-read(sbt.version)[1.1.1]} + version: ${sbt.version-read(sbt.version)[1.2.0]} class: sbt.ScriptMain components: xsbti,extra cross-versioned: ${sbt.cross.versioned-false} @@ -22,6 +22,7 @@ [boot] directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} + lock: ${sbt.boot.lock-true} [ivy] ivy-home: ${sbt.ivy.home-${user.home}/.ivy2/} diff --git a/src/main/conscript/screpl/launchconfig b/src/main/conscript/screpl/launchconfig index 23a9a6a39..ff6e22916 100644 --- a/src/main/conscript/screpl/launchconfig +++ b/src/main/conscript/screpl/launchconfig @@ -4,7 +4,7 @@ [app] org: ${sbt.organization-org.scala-sbt} name: sbt - version: ${sbt.version-read(sbt.version)[1.1.1]} + version: ${sbt.version-read(sbt.version)[1.2.0]} class: sbt.ConsoleMain components: xsbti,extra cross-versioned: ${sbt.cross.versioned-false} @@ -22,6 +22,7 @@ [boot] directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} + lock: ${sbt.boot.lock-true} [ivy] ivy-home: ${sbt.ivy.home-${user.home}/.ivy2/} diff --git a/src/main/conscript/xsbt/launchconfig b/src/main/conscript/xsbt/launchconfig index ff2abceab..f65ff3ced 100644 --- a/src/main/conscript/xsbt/launchconfig +++ b/src/main/conscript/xsbt/launchconfig @@ -4,7 +4,7 @@ [app] org: ${sbt.organization-org.scala-sbt} name: sbt - version: ${sbt.version-read(sbt.version)[1.1.1]} + version: ${sbt.version-read(sbt.version)[1.2.0]} class: sbt.xMain components: xsbti,extra cross-versioned: ${sbt.cross.versioned-false} @@ -22,6 +22,7 @@ [boot] directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} + lock: ${sbt.boot.lock-true} [ivy] ivy-home: ${sbt.ivy.home-${user.home}/.ivy2/} From 305a8de3192808971671fc76e7237a4ef1cc9c4e Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 30 Jul 2018 20:28:42 -0400 Subject: [PATCH 2/2] 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