From 4c75d778b9e44c20767f1a01a00903c6e71a8538 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Thu, 7 Jul 2016 00:11:41 +0100 Subject: [PATCH] Group imports --- main-settings/src/main/scala/sbt/Def.scala | 1 - main-settings/src/test/scala/UsageTest.scala | 3 +-- main/src/main/scala/sbt/Defaults.scala | 14 ++++++-------- main/src/main/scala/sbt/EvaluateTask.scala | 7 +++---- main/src/main/scala/sbt/Keys.scala | 7 +++---- main/src/main/scala/sbt/LogManager.scala | 3 +-- main/src/main/scala/sbt/Main.scala | 5 +++-- main/src/main/scala/sbt/Project.scala | 4 +--- main/src/main/scala/sbt/internal/KeyIndex.scala | 4 +--- main/src/main/scala/sbt/internal/Load.scala | 8 ++++---- .../src/main/scala/sbt/std/Streams.scala | 6 +++--- 11 files changed, 26 insertions(+), 36 deletions(-) diff --git a/main-settings/src/main/scala/sbt/Def.scala b/main-settings/src/main/scala/sbt/Def.scala index 8800843da..7f08e50bb 100644 --- a/main-settings/src/main/scala/sbt/Def.scala +++ b/main-settings/src/main/scala/sbt/Def.scala @@ -95,7 +95,6 @@ object Def extends Init[Scope] with TaskMacroExtra { implicit def parserInitToInput[T](p: Initialize[Parser[T]]): ParserInput[T] = ??? implicit def parserInitStateToInput[T](p: Initialize[State => Parser[T]]): ParserInput[T] = ??? - import language.experimental.macros def settingKey[T](description: String): SettingKey[T] = macro std.KeyMacro.settingKeyImpl[T] def taskKey[T](description: String): TaskKey[T] = macro std.KeyMacro.taskKeyImpl[T] def inputKey[T](description: String): InputKey[T] = macro std.KeyMacro.inputKeyImpl[T] diff --git a/main-settings/src/test/scala/UsageTest.scala b/main-settings/src/test/scala/UsageTest.scala index c62ec9205..88c894e2a 100644 --- a/main-settings/src/test/scala/UsageTest.scala +++ b/main-settings/src/test/scala/UsageTest.scala @@ -20,8 +20,7 @@ import sbt.internal.util.complete.{ DefaultParsers, Parsers } }*/ object Assign { import java.io.File - import Def.{ inputKey, settingKey, taskKey } - import Def.{ Initialize, macroValueT, parserToInput } + import Def.{ Initialize, inputKey, macroValueT, parserToInput, settingKey, taskKey } // import UseTask.{x,y,z,a,set,plain} val ak = taskKey[Int]("a") diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index fae766bf2..f1d129a45 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -5,15 +5,12 @@ package sbt import scala.concurrent.duration.{ FiniteDuration, Duration } import sbt.internal._ -import sbt.internal.util.Attributed import sbt.internal.util.Attributed.data import Scope.{ fillTaskAxis, GlobalScope, ThisScope } import sbt.internal.librarymanagement.mavenint.{ PomExtraDependencyAttributes, SbtPomExtraProperties } import Project.{ inConfig, inScope, inTask, richInitialize, richInitializeTask, richTaskSessionVar } import Def.{ Initialize, ScopedKey, Setting, SettingsDefinition } -import sbt.internal.librarymanagement.{ CustomPomParser, DependencyFilter } import sbt.librarymanagement.Artifact.{ DocClassifier, SourceClassifier } -import sbt.librarymanagement.{ Configuration, Configurations, ConflictManager, CrossVersion, MavenRepository, Resolver, ScalaArtifacts, UpdateOptions } import sbt.librarymanagement.Configurations.{ Compile, CompilerPlugin, IntegrationTest, names, Provided, Runtime, Test } import sbt.librarymanagement.CrossVersion.{ binarySbtVersion, binaryScalaVersion, partialVersion } import sbt.internal.util.complete._ @@ -24,7 +21,7 @@ import sbt.librarymanagement.{ `package` => _, _ } import sbt.internal.librarymanagement._ import sbt.internal.librarymanagement.syntax._ import sbt.internal.util._ -import sbt.util.Level +import sbt.util.{ Level, Logger } import sys.error import scala.xml.NodeSeq @@ -36,7 +33,6 @@ import java.net.{ URI, URL, MalformedURLException } import java.util.concurrent.{ TimeUnit, Callable } import sbinary.DefaultProtocol.StringFormat import sbt.internal.util.Cache.seqFormat -import sbt.util.Logger import sbt.internal.CommandStrings.ExportStream import xsbti.{ CrossValue, Maybe } @@ -53,9 +49,11 @@ import Keys._ // incremental compiler import xsbt.api.Discovery -import xsbti.compile.{ Compilers, ClasspathOptions, CompileAnalysis, CompileOptions, CompileOrder, CompileResult, DefinesClass, IncOptions, IncOptionsUtil, Inputs, MiniSetup, PreviousResult, Setup, TransactionalManagerType } -import xsbti.compile.PerClasspathEntryLookup -import sbt.internal.inc.{ AnalyzingCompiler, Analysis, ClassfileManager, CompilerCache, FileValueCache, IncrementalCompilerImpl, Locate, LoggerReporter, MixedAnalyzingCompiler, ScalaInstance, ClasspathOptionsUtil } +import xsbti.compile.{ Compilers, ClasspathOptions, CompileAnalysis, CompileOptions, CompileOrder, + CompileResult, DefinesClass, IncOptions, IncOptionsUtil, Inputs, MiniSetup, PerClasspathEntryLookup, + PreviousResult, Setup, TransactionalManagerType } +import sbt.internal.inc.{ AnalyzingCompiler, Analysis, ClassfileManager, CompilerCache, FileValueCache, + IncrementalCompilerImpl, Locate, LoggerReporter, MixedAnalyzingCompiler, ScalaInstance, ClasspathOptionsUtil } object Defaults extends BuildCommon { final val CacheDirectoryName = "cache" diff --git a/main/src/main/scala/sbt/EvaluateTask.scala b/main/src/main/scala/sbt/EvaluateTask.scala index 871d6e919..59fd27dd9 100644 --- a/main/src/main/scala/sbt/EvaluateTask.scala +++ b/main/src/main/scala/sbt/EvaluateTask.scala @@ -4,19 +4,18 @@ package sbt import sbt.internal.{ Load, BuildStructure, TaskTimings, TaskName, GCUtil } -import sbt.internal.util.{ ErrorHandling, RMap, Show, Signals, Types } +import sbt.internal.util.{ Attributed, ErrorHandling, HList, RMap, Show, Signals, Types } import sbt.util.Logger import sbt.librarymanagement.{ Resolver, UpdateReport } import scala.concurrent.duration.Duration import java.io.File import Def.{ displayFull, dummyState, ScopedKey, Setting } -import Keys.{ streams, Streams, TaskStreams } -import Keys.{ dummyRoots, dummyStreamsManager, executionRoots, pluginData, streamsManager, taskDefinitionKey, transformState } +import Keys.{ Streams, TaskStreams, dummyRoots, dummyStreamsManager, executionRoots, pluginData, streams, + streamsManager, taskDefinitionKey, transformState } import Project.richInitializeTask import Scope.{ GlobalScope, ThisScope } import sbt.internal.util.Types.const -import sbt.internal.util.{ Attributed, HList } import scala.Console.RED import std.Transform.{ DummyTaskMap, TaskAndValue } import TaskName._ diff --git a/main/src/main/scala/sbt/Keys.scala b/main/src/main/scala/sbt/Keys.scala index d3e828085..ba97bf029 100644 --- a/main/src/main/scala/sbt/Keys.scala +++ b/main/src/main/scala/sbt/Keys.scala @@ -8,10 +8,10 @@ import java.net.URL import scala.concurrent.duration.{ FiniteDuration, Duration } import Def.ScopedKey import sbt.internal.util.complete._ -import xsbti.compile.DefinesClass import sbt.internal.inc.{ MixedAnalyzingCompiler, ScalaInstance } import std.TaskExtra._ -import xsbti.compile.{ ClasspathOptions, CompileAnalysis, CompileOptions, CompileOrder, Compilers, CompileResult, GlobalsCache, IncOptions, Inputs, PreviousResult, Setup } +import xsbti.compile.{ DefinesClass, ClasspathOptions, CompileAnalysis, CompileOptions, CompileOrder, + Compilers, CompileResult, GlobalsCache, IncOptions, Inputs, PreviousResult, Setup } import scala.xml.{ Node => XNode, NodeSeq } import org.apache.ivy.core.module.{ descriptor, id } import descriptor.ModuleDescriptor, id.ModuleRevisionId @@ -22,7 +22,7 @@ import KeyRanks._ import sbt.internal.{ BuildStructure, LoadedBuild, PluginDiscovery, BuildDependencies, SessionSettings } import sbt.io.FileFilter import sbt.internal.io.WatchState -import sbt.internal.util.AttributeKey +import sbt.internal.util.{ AttributeKey, SourcePosition } import sbt.librarymanagement.Configurations.CompilerPlugin import sbt.librarymanagement.{ @@ -64,7 +64,6 @@ import sbt.internal.librarymanagement.{ UpdateLogging } import sbt.util.{ AbstractLogger, Level, Logger } -import sbt.internal.util.SourcePosition object Keys { val TraceValues = "-1 to disable, 0 for up to the first sbt frame, or a positive number to set the maximum number of frames shown." diff --git a/main/src/main/scala/sbt/LogManager.scala b/main/src/main/scala/sbt/LogManager.scala index baf260f2e..96e47538a 100644 --- a/main/src/main/scala/sbt/LogManager.scala +++ b/main/src/main/scala/sbt/LogManager.scala @@ -3,8 +3,7 @@ */ package sbt -import java.io.PrintWriter -import java.io.File +import java.io.{ File, PrintWriter } import LogManager._ import std.Transform import Def.ScopedKey diff --git a/main/src/main/scala/sbt/Main.scala b/main/src/main/scala/sbt/Main.scala index bd5537b30..3abaeef3a 100644 --- a/main/src/main/scala/sbt/Main.scala +++ b/main/src/main/scala/sbt/Main.scala @@ -3,8 +3,9 @@ */ package sbt -import sbt.internal.{ Load, EvaluateConfigurations, LoadedBuildUnit, Aggregation, BuildStructure, Act, Inspect, BuildUnit, Output, PluginsDebug } -import sbt.internal.{ SettingCompletions, CommandStrings, IvyConsole, ProjectNavigation, Script, SessionSettings } +import sbt.internal.{ Act, Aggregation, BuildStructure, BuildUnit, CommandStrings, EvaluateConfigurations, + Inspect, IvyConsole, Load, LoadedBuildUnit, Output, PluginsDebug, ProjectNavigation, Script, SessionSettings, + SettingCompletions } import sbt.internal.util.{ AttributeKey, AttributeMap, complete, ConsoleOut, GlobalLogging, LineRange, MainLogging, SimpleReader, Types } import sbt.util.{ Level, Logger } diff --git a/main/src/main/scala/sbt/Project.scala b/main/src/main/scala/sbt/Project.scala index 456f8d407..e32ff9e72 100755 --- a/main/src/main/scala/sbt/Project.scala +++ b/main/src/main/scala/sbt/Project.scala @@ -11,13 +11,11 @@ import Keys.{ appConfiguration, stateBuildStructure, commands, configuration, hi import Scope.{ GlobalScope, ThisScope } import Def.{ Flattened, Initialize, ScopedKey, Setting } import sbt.internal.{ Load, BuildStructure, LoadedBuild, LoadedBuildUnit, SettingGraph, SettingCompletions, AddSettings, SessionSettings } -import sbt.internal.util.Eval +import sbt.internal.util.{ AttributeKey, AttributeMap, Dag, Eval, Relation, Settings, Show, ~> } import sbt.internal.util.Types.{ const, idFun } import sbt.internal.util.complete.DefaultParsers import sbt.librarymanagement.Configuration -import sbt.internal.util.{ AttributeKey, AttributeMap, Dag, Relation, Settings, Show, ~> } - import language.experimental.macros sealed trait ProjectDefinition[PR <: ProjectReference] { diff --git a/main/src/main/scala/sbt/internal/KeyIndex.scala b/main/src/main/scala/sbt/internal/KeyIndex.scala index 3a24ae49d..f9778d52e 100644 --- a/main/src/main/scala/sbt/internal/KeyIndex.scala +++ b/main/src/main/scala/sbt/internal/KeyIndex.scala @@ -4,13 +4,11 @@ package sbt package internal -import sbt.internal.util.Relation - import java.net.URI import Def.ScopedKey import sbt.internal.util.complete.DefaultParsers.validID import sbt.internal.util.Types.{ idFun, some } -import sbt.internal.util.AttributeKey +import sbt.internal.util.{ AttributeKey, Relation } object KeyIndex { def empty: ExtendableKeyIndex = new KeyIndex0(emptyBuildIndex) diff --git a/main/src/main/scala/sbt/internal/Load.scala b/main/src/main/scala/sbt/internal/Load.scala index cce1dbf31..1dc910ca3 100755 --- a/main/src/main/scala/sbt/internal/Load.scala +++ b/main/src/main/scala/sbt/internal/Load.scala @@ -4,7 +4,6 @@ package sbt package internal -import sbt.internal.util.{ Settings, Show, ~> } import sbt.librarymanagement.{ Configuration, Configurations, Resolver, UpdateOptions } import sbt.internal.librarymanagement.{ InlineIvyConfiguration, IvyPaths } @@ -17,10 +16,11 @@ import sbt.internal.inc.{ Analysis, ClasspathOptionsUtil, FileValueCache, Locate import sbt.internal.inc.classpath.ClasspathUtilities import Project.inScope import Def.{ isDummy, ScopedKey, ScopeLocal, Setting } -import Keys.{ appConfiguration, baseDirectory, configuration, fullResolvers, fullClasspath, pluginData, streams, thisProject, thisProjectRef, update } -import Keys.{ exportedProducts, loadedBuild, onLoadMessage, resolvedScoped, sbtPlugin, scalacOptions, taskDefinitionKey } +import Keys.{ appConfiguration, baseDirectory, configuration, exportedProducts, fullClasspath, fullResolvers, + loadedBuild, onLoadMessage, pluginData, resolvedScoped, sbtPlugin, scalacOptions, streams, taskDefinitionKey, + thisProject, thisProjectRef, update } import tools.nsc.reporters.ConsoleReporter -import sbt.internal.util.{ Attributed, Eval => Ev } +import sbt.internal.util.{ Attributed, Eval => Ev, Settings, Show, ~> } import sbt.internal.util.Attributed.data import Scope.{ GlobalScope, ThisScope } import sbt.internal.util.Types.const diff --git a/tasks-standard/src/main/scala/sbt/std/Streams.scala b/tasks-standard/src/main/scala/sbt/std/Streams.scala index 3246be73a..ff1feb096 100644 --- a/tasks-standard/src/main/scala/sbt/std/Streams.scala +++ b/tasks-standard/src/main/scala/sbt/std/Streams.scala @@ -4,9 +4,9 @@ package sbt package std -import java.io.{ InputStream, IOException, OutputStream, Reader, Writer } -import java.io.{ BufferedInputStream, BufferedOutputStream, BufferedReader, BufferedWriter, PrintWriter } -import java.io.{ Closeable, File, FileInputStream, FileOutputStream, InputStreamReader, OutputStreamWriter } +import java.io.{ BufferedInputStream, BufferedOutputStream, BufferedReader, BufferedWriter, Closeable, File, + FileInputStream, FileOutputStream, IOException, InputStream, InputStreamReader, OutputStream, + OutputStreamWriter, PrintWriter, Reader, Writer } import sbt.internal.io.DeferredWriter import sbt.io.IO