luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3533 from razvan-panda/1.0.x 

Fix unused imports warnings
This commit is contained in:
eugene yokota 2017-09-15 22:13:06 -04:00 committed by GitHub
parent b4744486a8 45765583a6
commit 7420071f25
6 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main-command/src/main/scala/sbt/State.scala
View File

@ -16,7 +16,6 @@ import sbt.internal.util.{
} }
import sbt.internal.util.complete.HistoryCommands import sbt.internal.util.complete.HistoryCommands
import sbt.internal.inc.classpath.ClassLoaderCache import sbt.internal.inc.classpath.ClassLoaderCache
import sbt.BasicCommandStrings.Shell
/** /**
* Data structure representing all command execution information. * Data structure representing all command execution information.

4
main-settings/src/main/scala/sbt/std/TaskMacro.scala
View File

@ -54,7 +54,7 @@ object FullInstance
KeyRanks.DTask) KeyRanks.DTask)
def flatten[T](in: Initialize[Task[Initialize[Task[T]]]]): Initialize[Task[T]] = { def flatten[T](in: Initialize[Task[Initialize[Task[T]]]]): Initialize[Task[T]] = {
import Scoped._, TupleSyntax._ import TupleSyntax._
(in, settingsData, Def.capturedTransformations) { (in, settingsData, Def.capturedTransformations) {
(a: Task[Initialize[Task[T]]], data: Task[SS], f) => (a: Task[Initialize[Task[T]]], data: Task[SS], f) =>
import TaskExtra.multT2Task import TaskExtra.multT2Task
@ -63,7 +63,7 @@ object FullInstance
} }
def flattenFun[S, T](in: Initialize[Task[S => Initialize[Task[T]]]]): Initialize[S => Task[T]] = { def flattenFun[S, T](in: Initialize[Task[S => Initialize[Task[T]]]]): Initialize[S => Task[T]] = {
import Scoped._, TupleSyntax._ import TupleSyntax._
(in, settingsData, Def.capturedTransformations) { (in, settingsData, Def.capturedTransformations) {
(a: Task[S => Initialize[Task[T]]], data: Task[SS], f) => (s: S) => (a: Task[S => Initialize[Task[T]]], data: Task[SS], f) => (s: S) =>
import TaskExtra.multT2Task import TaskExtra.multT2Task

19
main/src/main/scala/sbt/Cross.scala
View File

@ -3,23 +3,16 @@
*/ */
package sbt package sbt
import Keys._
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 java.io.File
import sbt.Def.{ ScopedKey, Setting }
import sbt.Keys._
import sbt.internal.Act import sbt.internal.Act
import sbt.internal.CommandStrings._
import sbt.internal.inc.ScalaInstance 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.io.IO
import sbt.librarymanagement.CrossVersion import sbt.librarymanagement.CrossVersion

1
main/src/main/scala/sbt/Defaults.scala
View File

@ -82,7 +82,6 @@ import xsbti.compile.{
CompileOrder, CompileOrder,
CompileResult, CompileResult,
DefinesClass, DefinesClass,
IncOptionsUtil,
Inputs, Inputs,
MiniSetup, MiniSetup,
PerClasspathEntryLookup, PerClasspathEntryLookup,

3
main/src/main/scala/sbt/PluginCross.scala
View File

@ -15,9 +15,8 @@ import Def.ScopedKey
import sbt.internal.Load import sbt.internal.Load
import sbt.internal.CommandStrings._ import sbt.internal.CommandStrings._
import Cross.{ spacedFirst, requireSession } import Cross.{ spacedFirst, requireSession }
import sbt.librarymanagement.Configurations._
import sbt.librarymanagement.VersionNumber import sbt.librarymanagement.VersionNumber
import Project.{ inConfig, inScope } import Project.{ inScope }
/** /**
* Module responsible for plugin cross building. * Module responsible for plugin cross building.

2
testing/src/main/scala/sbt/internal/testing/StatusFormats.scala
View File

@ -2,7 +2,7 @@ package sbt.internal.testing
import sbt.testing.Status import sbt.testing.Status
import _root_.sjsonnew.{ deserializationError, serializationError, Builder, JsonFormat, Unbuilder } import _root_.sjsonnew.{ deserializationError, Builder, JsonFormat, Unbuilder }
trait StatusFormats { self: sjsonnew.BasicJsonProtocol => trait StatusFormats { self: sjsonnew.BasicJsonProtocol =>
implicit lazy val StatusFormat: JsonFormat[Status] = new JsonFormat[Status] { implicit lazy val StatusFormat: JsonFormat[Status] = new JsonFormat[Status] {