From 0433440c59c735d2ce908aaa300461759f5d914d Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Tue, 13 Mar 2018 23:42:19 +0900
Subject: [PATCH] move ServerHandler to internal per review

---
 main-command/src/main/scala/sbt/BasicKeys.scala            | 1 +
 .../scala/sbt/{ => internal/server}/ServerHandler.scala    | 2 ++
 main/src/main/scala/sbt/Defaults.scala                     | 7 ++++++-
 main/src/main/scala/sbt/Keys.scala                         | 1 +
 main/src/main/scala/sbt/Project.scala                      | 1 +
 sbt/src/server-test/handshake/build.sbt                    | 2 ++
 6 files changed, 13 insertions(+), 1 deletion(-)
 rename main-command/src/main/scala/sbt/{ => internal/server}/ServerHandler.scala (98%)

diff --git a/main-command/src/main/scala/sbt/BasicKeys.scala b/main-command/src/main/scala/sbt/BasicKeys.scala
index 393397f3f..5ceeec21b 100644
--- a/main-command/src/main/scala/sbt/BasicKeys.scala
+++ b/main-command/src/main/scala/sbt/BasicKeys.scala
@@ -10,6 +10,7 @@ package sbt
 import java.io.File
 import sbt.internal.util.AttributeKey
 import sbt.internal.inc.classpath.ClassLoaderCache
+import sbt.internal.server.ServerHandler
 import sbt.librarymanagement.ModuleID
 import sbt.util.Level
 
diff --git a/main-command/src/main/scala/sbt/ServerHandler.scala b/main-command/src/main/scala/sbt/internal/server/ServerHandler.scala
similarity index 98%
rename from main-command/src/main/scala/sbt/ServerHandler.scala
rename to main-command/src/main/scala/sbt/internal/server/ServerHandler.scala
index ce9429c33..47b4f4fbf 100644
--- a/main-command/src/main/scala/sbt/ServerHandler.scala
+++ b/main-command/src/main/scala/sbt/internal/server/ServerHandler.scala
@@ -6,6 +6,8 @@
  */
 
 package sbt
+package internal
+package server
 
 import sjsonnew.JsonFormat
 import sbt.internal.protocol._
diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 1bdee43ff..36299ac25 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -26,7 +26,12 @@ import sbt.internal.librarymanagement.mavenint.{
   PomExtraDependencyAttributes,
   SbtPomExtraProperties
 }
-import sbt.internal.server.{ LanguageServerReporter, Definition, LanguageServerProtocol }
+import sbt.internal.server.{
+  LanguageServerReporter,
+  Definition,
+  LanguageServerProtocol,
+  ServerHandler
+}
 import sbt.internal.testing.TestLogger
 import sbt.internal.util._
 import sbt.internal.util.Attributed.data
diff --git a/main/src/main/scala/sbt/Keys.scala b/main/src/main/scala/sbt/Keys.scala
index df551cdd7..82191f556 100644
--- a/main/src/main/scala/sbt/Keys.scala
+++ b/main/src/main/scala/sbt/Keys.scala
@@ -42,6 +42,7 @@ import sbt.internal.{
 }
 import sbt.io.{ FileFilter, WatchService }
 import sbt.internal.io.WatchState
+import sbt.internal.server.ServerHandler
 import sbt.internal.util.{ AttributeKey, SourcePosition }
 
 import sbt.librarymanagement.Configurations.CompilerPlugin
diff --git a/main/src/main/scala/sbt/Project.scala b/main/src/main/scala/sbt/Project.scala
index 38124e5a5..ea3a6b942 100755
--- a/main/src/main/scala/sbt/Project.scala
+++ b/main/src/main/scala/sbt/Project.scala
@@ -45,6 +45,7 @@ import sbt.internal.{
 import sbt.internal.util.{ AttributeKey, AttributeMap, Dag, Relation, Settings, ~> }
 import sbt.internal.util.Types.{ const, idFun }
 import sbt.internal.util.complete.DefaultParsers
+import sbt.internal.server.ServerHandler
 import sbt.librarymanagement.Configuration
 import sbt.util.{ Show, Level }
 import sjsonnew.JsonFormat
diff --git a/sbt/src/server-test/handshake/build.sbt b/sbt/src/server-test/handshake/build.sbt
index 1267ea46b..fcfe026ac 100644
--- a/sbt/src/server-test/handshake/build.sbt
+++ b/sbt/src/server-test/handshake/build.sbt
@@ -1,3 +1,5 @@
+import sbt.internal.ServerHandler
+
 lazy val root = (project in file("."))
   .settings(
     Global / serverLog / logLevel := Level.Debug,