From e813b28a1c90bfcedc2d98fb57afee799e25b939 Mon Sep 17 00:00:00 2001
From: Johannes Rudolph <johannes.rudolph@gmail.com>
Date: Mon, 23 Oct 2017 16:44:15 +0200
Subject: [PATCH] Move SbtAccess to our own package below sbt to prevent
 accidental namespace clashes with other plugins / sbt

---
 .../virtualvoid/sbt/graph/util/AsciiTreeLayout.scala   |  4 +++-
 .../scala/sbt/{ => dependencygraph}/SbtAccess.scala    | 10 +++-------
 src/sbt-test/sbt-dependency-graph/build.properties     |  1 -
 3 files changed, 6 insertions(+), 9 deletions(-)
 rename src/main/scala/sbt/{ => dependencygraph}/SbtAccess.scala (82%)
 delete mode 100644 src/sbt-test/sbt-dependency-graph/build.properties

diff --git a/src/main/scala/net/virtualvoid/sbt/graph/util/AsciiTreeLayout.scala b/src/main/scala/net/virtualvoid/sbt/graph/util/AsciiTreeLayout.scala
index 24b8d6063..dc26c98c0 100644
--- a/src/main/scala/net/virtualvoid/sbt/graph/util/AsciiTreeLayout.scala
+++ b/src/main/scala/net/virtualvoid/sbt/graph/util/AsciiTreeLayout.scala
@@ -5,6 +5,8 @@
  */
 package net.virtualvoid.sbt.graph.util
 
+import sbt.dependencygraph.SbtAccess
+
 object AsciiTreeLayout {
   // [info] foo
   // [info]   +-bar
@@ -52,7 +54,7 @@ object AsciiTreeLayout {
   }
 
   def defaultColumnSize: Int = {
-    val termWidth = sbt.SbtAccess.getTerminalWidth
+    val termWidth = SbtAccess.getTerminalWidth
     if (termWidth > 20) termWidth - 8
     else 80 // ignore termWidth
   }
diff --git a/src/main/scala/sbt/SbtAccess.scala b/src/main/scala/sbt/dependencygraph/SbtAccess.scala
similarity index 82%
rename from src/main/scala/sbt/SbtAccess.scala
rename to src/main/scala/sbt/dependencygraph/SbtAccess.scala
index 6ddc71f48..558aeb1b6 100644
--- a/src/main/scala/sbt/SbtAccess.scala
+++ b/src/main/scala/sbt/dependencygraph/SbtAccess.scala
@@ -14,17 +14,13 @@
  *    limitations under the License.
  */
 
-package sbt
+package sbt.dependencygraph
 
-import internal._
-import Classpaths._
-import LibraryManagement._
-import internal.util.JLine
+import sbt.Defaults
 
 /** Accessors to private[sbt] symbols. */
 object SbtAccess {
   val unmanagedScalaInstanceOnly = Defaults.unmanagedScalaInstanceOnly
 
-  def getTerminalWidth: Int = JLine.usingTerminal(_.getWidth)
-
+  def getTerminalWidth: Int = sbt.internal.util.JLine.usingTerminal(_.getWidth)
 }
diff --git a/src/sbt-test/sbt-dependency-graph/build.properties b/src/sbt-test/sbt-dependency-graph/build.properties
deleted file mode 100644
index df58110af..000000000
--- a/src/sbt-test/sbt-dependency-graph/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-sbt.version=0.13.6
\ No newline at end of file