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

move to <key>.all inDefaults

This commit is contained in:
Mark Harrah 2013-03-28 16:08:24 -04:00
parent 7605818f04
commit 45155e2616
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
main/src/main/scala/sbt/Defaults.scala
View File

@ -245,6 +245,7 @@ object Defaults extends BuildCommon
def generate(generators: SettingKey[Seq[Task[Seq[File]]]]): Initialize[Task[Seq[File]]] = generators {_.join.map(_.flatten) } def generate(generators: SettingKey[Seq[Task[Seq[File]]]]): Initialize[Task[Seq[File]]] = generators {_.join.map(_.flatten) }
@deprecated("Use the new <key>.all(<ScopeFilter>) API", "0.13.0")
def inAllConfigurations[T](key: TaskKey[T]): Initialize[Task[Seq[T]]] = (state, thisProjectRef) flatMap { (state, ref) => def inAllConfigurations[T](key: TaskKey[T]): Initialize[Task[Seq[T]]] = (state, thisProjectRef) flatMap { (state, ref) =>
val structure = Project structure state val structure = Project structure state
val configurations = Project.getProject(ref, structure).toList.flatMap(_.configurations) val configurations = Project.getProject(ref, structure).toList.flatMap(_.configurations)
@ -252,11 +253,19 @@ object Defaults extends BuildCommon
key in (ref, conf) get structure.data key in (ref, conf) get structure.data
} join } join
} }
def watchTransitiveSourcesTask: Initialize[Task[Seq[File]]] = def watchTransitiveSourcesTask: Initialize[Task[Seq[File]]] = {
inDependencies[Task[Seq[File]]](watchSources.task, const(std.TaskExtra.constant(Nil)), aggregate = true, includeRoot = true) apply { _.join.map(_.flatten) } import ScopeFilter.Make.{inDependencies => inDeps, _}
val selectDeps = ScopeFilter(inAggregates(ThisProject) || inDeps(ThisProject))
val allWatched = (watchSources ?? Nil).all( selectDeps )
Def.task { allWatched.value.flatten }
}
def transitiveUpdateTask: Initialize[Task[Seq[UpdateReport]]] = def transitiveUpdateTask: Initialize[Task[Seq[UpdateReport]]] = {
forDependencies(ref => (update.task in ref).?, aggregate = false, includeRoot = false) apply( _.flatten.join) import ScopeFilter.Make.{inDependencies => inDeps, _}
val selectDeps = ScopeFilter(inDeps(ThisProject, includeRoot = false))
val allUpdates = update.?.all(selectDeps)
Def.task { allUpdates.value.flatten }
}
def watchSetting: Initialize[Watched] = (pollInterval, thisProjectRef, watchingMessage, triggeredMessage) { (interval, base, msg, trigMsg) => def watchSetting: Initialize[Watched] = (pollInterval, thisProjectRef, watchingMessage, triggeredMessage) { (interval, base, msg, trigMsg) =>
new Watched { new Watched {
@ -743,9 +752,11 @@ object Defaults extends BuildCommon
recurse ?? Nil recurse ?? Nil
} }
@deprecated("Use the new <key>.all(<ScopeFilter>) API", "0.13.0")
def inDependencies[T](key: SettingKey[T], default: ProjectRef => T, includeRoot: Boolean = true, classpath: Boolean = true, aggregate: Boolean = false): Initialize[Seq[T]] = def inDependencies[T](key: SettingKey[T], default: ProjectRef => T, includeRoot: Boolean = true, classpath: Boolean = true, aggregate: Boolean = false): Initialize[Seq[T]] =
forDependencies[T,T](ref => (key in ref) ?? default(ref), includeRoot, classpath, aggregate) forDependencies[T,T](ref => (key in ref) ?? default(ref), includeRoot, classpath, aggregate)
@deprecated("Use the new <key>.all(<ScopeFilter>) API", "0.13.0")
def forDependencies[T,V](init: ProjectRef => Initialize[V], includeRoot: Boolean = true, classpath: Boolean = true, aggregate: Boolean = false): Initialize[Seq[V]] = def forDependencies[T,V](init: ProjectRef => Initialize[V], includeRoot: Boolean = true, classpath: Boolean = true, aggregate: Boolean = false): Initialize[Seq[V]] =
Def.bind( (loadedBuild, thisProjectRef).identity ) { case (lb, base) => Def.bind( (loadedBuild, thisProjectRef).identity ) { case (lb, base) =>
transitiveDependencies(base, lb, includeRoot, classpath, aggregate) map init join ; transitiveDependencies(base, lb, includeRoot, classpath, aggregate) map init join ;

3
main/src/main/scala/sbt/ScopeFilter.scala
View File

@ -45,6 +45,7 @@ object ScopeFilter
} }
} }
private[sbt] val Make = new Make {}
trait Make trait Make
{ {
/** Selects Scopes with a global task axis. */ /** Selects Scopes with a global task axis. */
@ -132,7 +133,7 @@ object ScopeFilter
} }
private def inProjects(projects: ProjectReference*): ProjectFilter = private def inProjects(projects: ProjectReference*): ProjectFilter =
inResolvedProjects( data => projects.map(data.resolve) ) inResolvedProjects( data => projects.map(data.resolve) )
private[this] def inResolvedProjects(projects: Data => Seq[ProjectRef]): ProjectFilter = private[this] def inResolvedProjects(projects: Data => Seq[ProjectRef]): ProjectFilter =
selectAxis(data => projects(data).toSet) selectAxis(data => projects(data).toSet)