mirror of https://github.com/sbt/sbt.git
Rename SettingsGraph WatchTransitiveDependencies
This is a more descriptive name and differentiates the object from `SettingGraph`.
This commit is contained in:
parent
4a8e7c0734
commit
80cd0d5e6b
|
|
@ -963,6 +963,7 @@ lazy val mainProj = (project in file("main"))
|
|||
// the binary compatible version.
|
||||
exclude[IncompatibleMethTypeProblem]("sbt.internal.server.NetworkChannel.this"),
|
||||
exclude[IncompatibleSignatureProblem]("sbt.internal.DeprecatedContinuous.taskDefinitions"),
|
||||
exclude[MissingClassProblem]("sbt.internal.SettingsGraph*")
|
||||
)
|
||||
)
|
||||
.configure(
|
||||
|
|
|
|||
|
|
@ -747,7 +747,7 @@ object Defaults extends BuildCommon {
|
|||
cleanKeepGlobs ++= historyPath.value.map(_.toGlob).toVector,
|
||||
clean := Def.taskDyn(Clean.task(resolvedScoped.value.scope, full = true)).value,
|
||||
consoleProject := consoleProjectTask.value,
|
||||
transitiveDynamicInputs := SettingsGraph.task.value,
|
||||
transitiveDynamicInputs := WatchTransitiveDependencies.task.value,
|
||||
) ++ sbt.internal.DeprecatedContinuous.taskDefinitions
|
||||
|
||||
def generate(generators: SettingKey[Seq[Task[Seq[File]]]]): Initialize[Task[Seq[File]]] =
|
||||
|
|
|
|||
|
|
@ -170,9 +170,9 @@ private[sbt] object Continuous extends DeprecatedContinuous {
|
|||
// Extract all of the globs that we will monitor during the continuous build.
|
||||
val inputs = {
|
||||
val configs = scopedKey.get(internalDependencyConfigurations).getOrElse(Nil)
|
||||
val args =
|
||||
new SettingsGraph.Arguments(scopedKey, extracted, compiledMap, logger, configs, state)
|
||||
SettingsGraph.transitiveDynamicInputs(args)
|
||||
import WatchTransitiveDependencies.{ Arguments => DArguments }
|
||||
val args = new DArguments(scopedKey, extracted, compiledMap, logger, configs, state)
|
||||
WatchTransitiveDependencies.transitiveDynamicInputs(args)
|
||||
}
|
||||
|
||||
val repository = getRepository(state)
|
||||
|
|
@ -240,7 +240,7 @@ private[sbt] object Continuous extends DeprecatedContinuous {
|
|||
dynamicInputs: mutable.Set[DynamicInput],
|
||||
)(implicit extracted: Extracted, logger: Logger): Seq[Config] = {
|
||||
val commandKeys = commands.map(parseCommand(_, state))
|
||||
val compiledMap = SettingsGraph.compile(extracted.structure)
|
||||
val compiledMap = WatchTransitiveDependencies.compile(extracted.structure)
|
||||
commandKeys.flatMap(_.map(getConfig(state, _, compiledMap, dynamicInputs)))
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ import sbt.nio.file.Glob
|
|||
|
||||
import scala.annotation.tailrec
|
||||
|
||||
private[sbt] object SettingsGraph {
|
||||
private[sbt] object WatchTransitiveDependencies {
|
||||
private implicit class SourceOps(val source: Source) {
|
||||
def toGlob: Glob = {
|
||||
val filter = source.includeFilter -- source.excludeFilter
|
||||
|
|
@ -15,7 +15,7 @@ import sbt.Keys._
|
|||
import sbt.internal.Clean.ToSeqPath
|
||||
import sbt.internal.Continuous.FileStampRepository
|
||||
import sbt.internal.util.AttributeKey
|
||||
import sbt.internal.{ Clean, Continuous, DynamicInput, SettingsGraph }
|
||||
import sbt.internal.{ Clean, Continuous, DynamicInput, WatchTransitiveDependencies }
|
||||
import sbt.nio.FileStamp.Formats._
|
||||
import sbt.nio.FileStamper.{ Hash, LastModified }
|
||||
import sbt.nio.Keys._
|
||||
|
|
@ -108,7 +108,8 @@ private[sbt] object Settings {
|
|||
case transitiveDynamicInputs.key =>
|
||||
scopedKey.scope.task.toOption.toSeq.map { key =>
|
||||
val updatedKey = Def.ScopedKey(scopedKey.scope.copy(task = Zero), key)
|
||||
transitiveDynamicInputs in scopedKey.scope := SettingsGraph.task(updatedKey).value
|
||||
transitiveDynamicInputs in scopedKey.scope :=
|
||||
WatchTransitiveDependencies.task(updatedKey).value
|
||||
}
|
||||
case dynamicDependency.key => (dynamicDependency in scopedKey.scope := { () }) :: Nil
|
||||
case transitiveClasspathDependency.key =>
|
||||
|
|
|
|||
Loading…
Reference in New Issue