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

Revert "Switch inThisBuild (+friends) to use varargs SettingsDefinition" 

This reverts commit f459b218c4.
This commit is contained in:
Eugene Yokota 2018-08-05 16:00:33 -04:00
parent eac7eef947
commit 26c180e768
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
main/src/main/scala/sbt/Project.scala
View File

@ -32,7 +32,7 @@ import Keys.{
watch watch
} }
import Scope.{ Global, ThisScope } import Scope.{ Global, ThisScope }
import Def.{ Flattened, Initialize, ScopedKey, Setting, SettingsDefinition } import Def.{ Flattened, Initialize, ScopedKey, Setting }
import sbt.internal.{ import sbt.internal.{
Load, Load,
BuildStructure, BuildStructure,
@ -892,19 +892,17 @@ trait ProjectExtra {
implicit def richTaskSessionVar[T](init: Initialize[Task[T]]): Project.RichTaskSessionVar[T] = implicit def richTaskSessionVar[T](init: Initialize[Task[T]]): Project.RichTaskSessionVar[T] =
new Project.RichTaskSessionVar(init) new Project.RichTaskSessionVar(init)
def inThisBuild(ss: SettingsDefinition*): Seq[Setting[_]] = def inThisBuild(ss: Seq[Setting[_]]): Seq[Setting[_]] =
inScope(ThisScope.copy(project = Select(ThisBuild)))(ss flatMap (_.settings)) inScope(ThisScope.copy(project = Select(ThisBuild)))(ss)
def inConfig(conf: Configuration)(ss: SettingsDefinition*): Seq[Setting[_]] = def inConfig(conf: Configuration)(ss: Seq[Setting[_]]): Seq[Setting[_]] =
inScope(ThisScope.copy(config = Select(conf)))( inScope(ThisScope.copy(config = Select(conf)))((configuration :== conf) +: ss)
(configuration :== conf) +: (ss flatMap (_.settings))
)
def inTask(t: Scoped)(ss: SettingsDefinition*): Seq[Setting[_]] = def inTask(t: Scoped)(ss: Seq[Setting[_]]): Seq[Setting[_]] =
inScope(ThisScope.copy(task = Select(t.key)))(ss flatMap (_.settings)) inScope(ThisScope.copy(task = Select(t.key)))(ss)
def inScope(scope: Scope)(ss: SettingsDefinition*): Seq[Setting[_]] = def inScope(scope: Scope)(ss: Seq[Setting[_]]): Seq[Setting[_]] =
Project.transform(Scope.replaceThis(scope), ss flatMap (_.settings)) Project.transform(Scope.replaceThis(scope), ss)
private[sbt] def inThisBuild[T](i: Initialize[T]): Initialize[T] = private[sbt] def inThisBuild[T](i: Initialize[T]): Initialize[T] =
inScope(ThisScope.copy(project = Select(ThisBuild)), i) inScope(ThisScope.copy(project = Select(ThisBuild)), i)