From 0124a8ad0e2cf01121220dfc96c5a3dc0fd831e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C4=83zvan=20Flavius=20Panda?= <razvan.panda@gmail.com>
Date: Fri, 15 Sep 2017 16:07:26 +0100
Subject: [PATCH] Fix unused imports warnings

---
 main-command/src/main/scala/sbt/State.scala   |  1 -
 .../src/main/scala/sbt/std/TaskMacro.scala    |  4 ++--
 main/src/main/scala/sbt/Cross.scala           | 19 ++++++-------------
 main/src/main/scala/sbt/Defaults.scala        |  1 -
 main/src/main/scala/sbt/PluginCross.scala     |  3 +--
 .../sbt/internal/testing/StatusFormats.scala  |  2 +-
 6 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/main-command/src/main/scala/sbt/State.scala b/main-command/src/main/scala/sbt/State.scala
index e73be3034..16608986b 100644
--- a/main-command/src/main/scala/sbt/State.scala
+++ b/main-command/src/main/scala/sbt/State.scala
@@ -16,7 +16,6 @@ import sbt.internal.util.{
 }
 import sbt.internal.util.complete.HistoryCommands
 import sbt.internal.inc.classpath.ClassLoaderCache
-import sbt.BasicCommandStrings.Shell
 
 /**
  * Data structure representing all command execution information.
diff --git a/main-settings/src/main/scala/sbt/std/TaskMacro.scala b/main-settings/src/main/scala/sbt/std/TaskMacro.scala
index 338484e87..9639a20ea 100644
--- a/main-settings/src/main/scala/sbt/std/TaskMacro.scala
+++ b/main-settings/src/main/scala/sbt/std/TaskMacro.scala
@@ -54,7 +54,7 @@ object FullInstance
                                  KeyRanks.DTask)
 
   def flatten[T](in: Initialize[Task[Initialize[Task[T]]]]): Initialize[Task[T]] = {
-    import Scoped._, TupleSyntax._
+    import TupleSyntax._
     (in, settingsData, Def.capturedTransformations) {
       (a: Task[Initialize[Task[T]]], data: Task[SS], f) =>
         import TaskExtra.multT2Task
@@ -63,7 +63,7 @@ object FullInstance
   }
 
   def flattenFun[S, T](in: Initialize[Task[S => Initialize[Task[T]]]]): Initialize[S => Task[T]] = {
-    import Scoped._, TupleSyntax._
+    import TupleSyntax._
     (in, settingsData, Def.capturedTransformations) {
       (a: Task[S => Initialize[Task[T]]], data: Task[SS], f) => (s: S) =>
         import TaskExtra.multT2Task
diff --git a/main/src/main/scala/sbt/Cross.scala b/main/src/main/scala/sbt/Cross.scala
index 8cd7720b7..b5383ce88 100644
--- a/main/src/main/scala/sbt/Cross.scala
+++ b/main/src/main/scala/sbt/Cross.scala
@@ -3,23 +3,16 @@
  */
 package sbt
 
-import Keys.{ version, _ }
-import sbt.internal.util.complete.{ DefaultParsers, Parser }
-import sbt.internal.util.AttributeKey
-import DefaultParsers._
-import Def.{ ScopedKey, Setting }
-import sbt.internal.CommandStrings.{
-  CrossCommand,
-  CrossRestoreSessionCommand,
-  SwitchCommand,
-  crossHelp,
-  crossRestoreSessionHelp,
-  switchHelp
-}
 import java.io.File
 
+import sbt.Def.{ ScopedKey, Setting }
+import sbt.Keys._
 import sbt.internal.Act
+import sbt.internal.CommandStrings._
 import sbt.internal.inc.ScalaInstance
+import sbt.internal.util.AttributeKey
+import sbt.internal.util.complete.DefaultParsers._
+import sbt.internal.util.complete.{ DefaultParsers, Parser }
 import sbt.io.IO
 import sbt.librarymanagement.CrossVersion
 
diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 927f984bd..1936641bf 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -82,7 +82,6 @@ import xsbti.compile.{
   CompileOrder,
   CompileResult,
   DefinesClass,
-  IncOptionsUtil,
   Inputs,
   MiniSetup,
   PerClasspathEntryLookup,
diff --git a/main/src/main/scala/sbt/PluginCross.scala b/main/src/main/scala/sbt/PluginCross.scala
index 8ecfca99b..93b788c3d 100644
--- a/main/src/main/scala/sbt/PluginCross.scala
+++ b/main/src/main/scala/sbt/PluginCross.scala
@@ -15,9 +15,8 @@ import Def.ScopedKey
 import sbt.internal.Load
 import sbt.internal.CommandStrings._
 import Cross.{ spacedFirst, requireSession }
-import sbt.librarymanagement.Configurations._
 import sbt.librarymanagement.VersionNumber
-import Project.{ inConfig, inScope }
+import Project.{ inScope }
 
 /**
  * Module responsible for plugin cross building.
diff --git a/testing/src/main/scala/sbt/internal/testing/StatusFormats.scala b/testing/src/main/scala/sbt/internal/testing/StatusFormats.scala
index 862204488..d5ecfdaff 100644
--- a/testing/src/main/scala/sbt/internal/testing/StatusFormats.scala
+++ b/testing/src/main/scala/sbt/internal/testing/StatusFormats.scala
@@ -2,7 +2,7 @@ package sbt.internal.testing
 
 import sbt.testing.Status
 
-import _root_.sjsonnew.{ deserializationError, serializationError, Builder, JsonFormat, Unbuilder }
+import _root_.sjsonnew.{ deserializationError, Builder, JsonFormat, Unbuilder }
 
 trait StatusFormats { self: sjsonnew.BasicJsonProtocol =>
   implicit lazy val StatusFormat: JsonFormat[Status] = new JsonFormat[Status] {