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

1.2.1-SNAPSHOT

This commit is contained in:
Eugene Yokota 2018-07-30 20:28:42 -04:00
parent 4bcfaee264
commit 305a8de319
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.sbt
View File

@ -2,6 +2,7 @@ import Util._
import Dependencies._ import Dependencies._
import Sxr.sxr import Sxr.sxr
import com.typesafe.tools.mima.core._, ProblemFilters._ import com.typesafe.tools.mima.core._, ProblemFilters._
import local.Scripted
// ThisBuild settings take lower precedence, // ThisBuild settings take lower precedence,
// but can be shared across the multi projects. // but can be shared across the multi projects.
@ -9,7 +10,7 @@ def buildLevelSettings: Seq[Setting[_]] =
inThisBuild( inThisBuild(
Seq( Seq(
organization := "org.scala-sbt", organization := "org.scala-sbt",
version := "1.2.0", version := "1.2.1-SNAPSHOT",
description := "sbt is an interactive build tool", description := "sbt is an interactive build tool",
bintrayOrganization := Some("sbt"), bintrayOrganization := Some("sbt"),
bintrayRepository := { bintrayRepository := {
@ -80,7 +81,8 @@ val mimaSettings = Def settings (
mimaPreviousArtifacts := { mimaPreviousArtifacts := {
Seq( Seq(
"1.0.0", "1.0.1", "1.0.2", "1.0.3", "1.0.4", "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 => ).map { v =>
organization.value % moduleName.value % v cross (if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled) organization.value % moduleName.value % v cross (if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled)
}.toSet }.toSet
@ -719,6 +721,10 @@ def allProjects =
lazy val nonRoots = allProjects.map(p => LocalProject(p.id)) lazy val nonRoots = allProjects.map(p => LocalProject(p.id))
ThisBuild / scriptedBufferLog := true
ThisBuild / scriptedPrescripted := { _ => }
def otherRootSettings = def otherRootSettings =
Seq( Seq(
scripted := scriptedTask.evaluated, scripted := scriptedTask.evaluated,

14
project/Scripted.scala
View File

@ -1,32 +1,26 @@
package local
import java.lang.reflect.InvocationTargetException import java.lang.reflect.InvocationTargetException
import sbt._ import sbt._
import sbt.internal.inc.ScalaInstance import sbt.internal.inc.ScalaInstance
import sbt.internal.inc.classpath.{ ClasspathUtilities, FilteredLoader } import sbt.internal.inc.classpath.{ ClasspathUtilities, FilteredLoader }
import sbt.ScriptedPlugin.autoImport._
object ScriptedPlugin extends AutoPlugin { object LocalScriptedPlugin extends AutoPlugin {
override def requires = plugins.JvmPlugin override def requires = plugins.JvmPlugin
object autoImport extends ScriptedKeys object autoImport extends ScriptedKeys
import autoImport._ import autoImport._
override def globalSettings = super.globalSettings ++ Seq(
scriptedBufferLog := true,
scriptedPrescripted := { _ => },
)
} }
trait ScriptedKeys { trait ScriptedKeys {
val publishAll = taskKey[Unit]("") val publishAll = taskKey[Unit]("")
val publishLocalBinAll = taskKey[Unit]("") val publishLocalBinAll = taskKey[Unit]("")
val scripted = inputKey[Unit]("")
val scriptedUnpublished = inputKey[Unit]("Execute scripted without publishing sbt first. " + val scriptedUnpublished = inputKey[Unit]("Execute scripted without publishing sbt first. " +
"Saves you some time when only your test has changed") "Saves you some time when only your test has changed")
val scriptedSource = settingKey[File]("") val scriptedSource = settingKey[File]("")
val scriptedPrescripted = taskKey[File => Unit]("") val scriptedPrescripted = taskKey[File => Unit]("")
val scriptedBufferLog = settingKey[Boolean]("")
val scriptedLaunchOpts = settingKey[Seq[String]]("options to pass to jvm launching scripted tasks")
} }
object Scripted { object Scripted {

2
project/build.properties
View File

@ -1 +1 @@
sbt.version=1.1.6 sbt.version=1.2.0