From 80cd0d5e6b7082b03f371b7f2d00ca44008229f9 Mon Sep 17 00:00:00 2001
From: Ethan Atkins <contact@ethanatkins.com>
Date: Fri, 3 Jul 2020 12:02:38 -0700
Subject: [PATCH] Rename SettingsGraph WatchTransitiveDependencies

This is a more descriptive name and differentiates the object from
`SettingGraph`.
---
 build.sbt                                                 | 1 +
 main/src/main/scala/sbt/Defaults.scala                    | 2 +-
 main/src/main/scala/sbt/internal/Continuous.scala         | 8 ++++----
 ...tingsGraph.scala => WatchTransitiveDependencies.scala} | 2 +-
 main/src/main/scala/sbt/nio/Settings.scala                | 5 +++--
 5 files changed, 10 insertions(+), 8 deletions(-)
 rename main/src/main/scala/sbt/internal/{SettingsGraph.scala => WatchTransitiveDependencies.scala} (99%)

diff --git a/build.sbt b/build.sbt
index 3cf295a74..7faaeef45 100644
--- a/build.sbt
+++ b/build.sbt
@@ -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(
diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 2e6622174..2b3dd1e8a 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -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]]] =
diff --git a/main/src/main/scala/sbt/internal/Continuous.scala b/main/src/main/scala/sbt/internal/Continuous.scala
index f66c0c47d..f41c2d858 100644
--- a/main/src/main/scala/sbt/internal/Continuous.scala
+++ b/main/src/main/scala/sbt/internal/Continuous.scala
@@ -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)))
   }
 
diff --git a/main/src/main/scala/sbt/internal/SettingsGraph.scala b/main/src/main/scala/sbt/internal/WatchTransitiveDependencies.scala
similarity index 99%
rename from main/src/main/scala/sbt/internal/SettingsGraph.scala
rename to main/src/main/scala/sbt/internal/WatchTransitiveDependencies.scala
index ba1ce3a4b..44fb45f3a 100644
--- a/main/src/main/scala/sbt/internal/SettingsGraph.scala
+++ b/main/src/main/scala/sbt/internal/WatchTransitiveDependencies.scala
@@ -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
diff --git a/main/src/main/scala/sbt/nio/Settings.scala b/main/src/main/scala/sbt/nio/Settings.scala
index 5934f2cb1..49731d6e1 100644
--- a/main/src/main/scala/sbt/nio/Settings.scala
+++ b/main/src/main/scala/sbt/nio/Settings.scala
@@ -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 =>