From 53e719656ff328301506890106fdcd02b99dfa66 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 4 Sep 2015 12:54:09 -0400 Subject: [PATCH] Move util into sbt.util.internal package --- .../src/main/scala/sbt/{ => util/internal}/AList.scala | 2 +- .../main/scala/sbt/{ => util/internal}/Attributes.scala | 2 +- .../src/main/scala/sbt/{ => util/internal}/Classes.scala | 2 +- .../src/main/scala/sbt/{ => util/internal}/Dag.scala | 2 +- .../src/main/scala/sbt/{ => util/internal}/HList.scala | 2 +- .../src/main/scala/sbt/{ => util/internal}/IDSet.scala | 2 +- .../src/main/scala/sbt/{ => util/internal}/INode.scala | 2 +- .../src/main/scala/sbt/{ => util/internal}/KList.scala | 2 +- .../src/main/scala/sbt/{ => util/internal}/PMap.scala | 2 +- .../src/main/scala/sbt/{ => util/internal}/Param.scala | 2 +- .../src/main/scala/sbt/{ => util/internal}/Positions.scala | 2 +- .../src/main/scala/sbt/{ => util/internal}/Settings.scala | 2 +- .../src/main/scala/sbt/{ => util/internal}/Show.scala | 2 +- .../src/main/scala/sbt/{ => util/internal}/ShowLines.scala | 2 +- .../src/main/scala/sbt/{ => util/internal}/Signal.scala | 2 +- .../main/scala/sbt/{ => util/internal}/TypeFunctions.scala | 2 +- .../src/main/scala/sbt/{ => util/internal}/Types.scala | 2 +- .../src/main/scala/sbt/{ => util/internal}/Util.scala | 2 +- .../util-collection/src/test/scala/DagSpecification.scala | 2 +- internal/util-collection/src/test/scala/KeyTest.scala | 2 +- internal/util-collection/src/test/scala/LiteralTest.scala | 2 +- internal/util-collection/src/test/scala/PMapTest.scala | 2 +- .../util-collection/src/test/scala/SettingsExample.scala | 2 +- internal/util-collection/src/test/scala/SettingsTest.scala | 2 +- .../main/scala/sbt/{ => util/internal}/LineReader.scala | 4 ++-- .../sbt/{ => util/internal}/complete/Completions.scala | 3 ++- .../sbt/{ => util/internal}/complete/EditDistance.scala | 3 ++- .../sbt/{ => util/internal}/complete/ExampleSource.scala | 3 ++- .../scala/sbt/{ => util/internal}/complete/History.scala | 2 +- .../sbt/{ => util/internal}/complete/HistoryCommands.scala | 2 +- .../sbt/{ => util/internal}/complete/JLineCompletion.scala | 3 ++- .../scala/sbt/{ => util/internal}/complete/Parser.scala | 7 ++++--- .../scala/sbt/{ => util/internal}/complete/Parsers.scala | 3 ++- .../sbt/{ => util/internal}/complete/ProcessError.scala | 3 ++- .../{ => util/internal}/complete/TokenCompletions.scala | 3 ++- .../sbt/{ => util/internal}/complete/TypeString.scala | 3 ++- .../sbt/{ => util/internal}/complete/UpperBound.scala | 3 ++- internal/util-complete/src/test/scala/ParserTest.scala | 3 ++- .../src/test/scala/sbt/complete/FileExamplesTest.scala | 3 ++- .../src/test/scala/sbt/complete/FixedSetExamplesTest.scala | 3 ++- .../test/scala/sbt/complete/ParserWithExamplesTest.scala | 3 ++- .../main/scala/sbt/{ => util/internal}/logic/Logic.scala | 2 +- internal/util-logic/src/test/scala/sbt/logic/Test.scala | 2 +- 43 files changed, 60 insertions(+), 46 deletions(-) rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/AList.scala (99%) rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/Attributes.scala (99%) rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/Classes.scala (97%) rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/Dag.scala (99%) rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/HList.scala (96%) rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/IDSet.scala (98%) rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/INode.scala (99%) rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/KList.scala (98%) rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/PMap.scala (99%) rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/Param.scala (95%) rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/Positions.scala (94%) rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/Settings.scala (99%) rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/Show.scala (84%) rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/ShowLines.scala (92%) rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/Signal.scala (99%) rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/TypeFunctions.scala (98%) rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/Types.scala (88%) rename internal/util-collection/src/main/scala/sbt/{ => util/internal}/Util.scala (98%) rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/LineReader.scala (97%) rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/Completions.scala (99%) rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/EditDistance.scala (96%) rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/ExampleSource.scala (98%) rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/History.scala (98%) rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/HistoryCommands.scala (98%) rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/JLineCompletion.scala (99%) rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/Parser.scala (99%) rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/Parsers.scala (99%) rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/ProcessError.scala (95%) rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/TokenCompletions.scala (97%) rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/TypeString.scala (98%) rename internal/util-complete/src/main/scala/sbt/{ => util/internal}/complete/UpperBound.scala (97%) rename internal/util-logic/src/main/scala/sbt/{ => util/internal}/logic/Logic.scala (99%) diff --git a/internal/util-collection/src/main/scala/sbt/AList.scala b/internal/util-collection/src/main/scala/sbt/util/internal/AList.scala similarity index 99% rename from internal/util-collection/src/main/scala/sbt/AList.scala rename to internal/util-collection/src/main/scala/sbt/util/internal/AList.scala index 24368219b..e825b385c 100644 --- a/internal/util-collection/src/main/scala/sbt/AList.scala +++ b/internal/util-collection/src/main/scala/sbt/util/internal/AList.scala @@ -1,4 +1,4 @@ -package sbt +package sbt.util.internal import Classes.Applicative import Types._ diff --git a/internal/util-collection/src/main/scala/sbt/Attributes.scala b/internal/util-collection/src/main/scala/sbt/util/internal/Attributes.scala similarity index 99% rename from internal/util-collection/src/main/scala/sbt/Attributes.scala rename to internal/util-collection/src/main/scala/sbt/util/internal/Attributes.scala index 64f379012..fb4bb8eaa 100644 --- a/internal/util-collection/src/main/scala/sbt/Attributes.scala +++ b/internal/util-collection/src/main/scala/sbt/util/internal/Attributes.scala @@ -1,7 +1,7 @@ /* sbt -- Simple Build Tool * Copyright 2010 Mark Harrah */ -package sbt +package sbt.util.internal import Types._ import scala.reflect.Manifest diff --git a/internal/util-collection/src/main/scala/sbt/Classes.scala b/internal/util-collection/src/main/scala/sbt/util/internal/Classes.scala similarity index 97% rename from internal/util-collection/src/main/scala/sbt/Classes.scala rename to internal/util-collection/src/main/scala/sbt/util/internal/Classes.scala index 1db644f96..678eb0651 100644 --- a/internal/util-collection/src/main/scala/sbt/Classes.scala +++ b/internal/util-collection/src/main/scala/sbt/util/internal/Classes.scala @@ -1,4 +1,4 @@ -package sbt +package sbt.util.internal object Classes { trait Applicative[M[_]] { diff --git a/internal/util-collection/src/main/scala/sbt/Dag.scala b/internal/util-collection/src/main/scala/sbt/util/internal/Dag.scala similarity index 99% rename from internal/util-collection/src/main/scala/sbt/Dag.scala rename to internal/util-collection/src/main/scala/sbt/util/internal/Dag.scala index 3eb3d8ccb..d41730e88 100644 --- a/internal/util-collection/src/main/scala/sbt/Dag.scala +++ b/internal/util-collection/src/main/scala/sbt/util/internal/Dag.scala @@ -1,7 +1,7 @@ /* sbt -- Simple Build Tool * Copyright 2008, 2009, 2010 David MacIver, Mark Harrah */ -package sbt; +package sbt.util.internal trait Dag[Node <: Dag[Node]] { self: Node => diff --git a/internal/util-collection/src/main/scala/sbt/HList.scala b/internal/util-collection/src/main/scala/sbt/util/internal/HList.scala similarity index 96% rename from internal/util-collection/src/main/scala/sbt/HList.scala rename to internal/util-collection/src/main/scala/sbt/util/internal/HList.scala index 23f5488c6..01cded498 100644 --- a/internal/util-collection/src/main/scala/sbt/HList.scala +++ b/internal/util-collection/src/main/scala/sbt/util/internal/HList.scala @@ -1,7 +1,7 @@ /* sbt -- Simple Build Tool * Copyright 2010 Mark Harrah */ -package sbt +package sbt.util.internal import Types._ diff --git a/internal/util-collection/src/main/scala/sbt/IDSet.scala b/internal/util-collection/src/main/scala/sbt/util/internal/IDSet.scala similarity index 98% rename from internal/util-collection/src/main/scala/sbt/IDSet.scala rename to internal/util-collection/src/main/scala/sbt/util/internal/IDSet.scala index 7c21c48a7..cefe13186 100644 --- a/internal/util-collection/src/main/scala/sbt/IDSet.scala +++ b/internal/util-collection/src/main/scala/sbt/util/internal/IDSet.scala @@ -1,7 +1,7 @@ /* sbt -- Simple Build Tool * Copyright 2010 Mark Harrah */ -package sbt +package sbt.util.internal /** A mutable set interface that uses object identity to test for set membership.*/ trait IDSet[T] { diff --git a/internal/util-collection/src/main/scala/sbt/INode.scala b/internal/util-collection/src/main/scala/sbt/util/internal/INode.scala similarity index 99% rename from internal/util-collection/src/main/scala/sbt/INode.scala rename to internal/util-collection/src/main/scala/sbt/util/internal/INode.scala index 53f45e9f1..3e2310f2f 100644 --- a/internal/util-collection/src/main/scala/sbt/INode.scala +++ b/internal/util-collection/src/main/scala/sbt/util/internal/INode.scala @@ -1,4 +1,4 @@ -package sbt +package sbt.util.internal import java.lang.Runnable import java.util.concurrent.{ atomic, Executor, LinkedBlockingQueue } diff --git a/internal/util-collection/src/main/scala/sbt/KList.scala b/internal/util-collection/src/main/scala/sbt/util/internal/KList.scala similarity index 98% rename from internal/util-collection/src/main/scala/sbt/KList.scala rename to internal/util-collection/src/main/scala/sbt/util/internal/KList.scala index 0b09ac9b1..1df8c4df5 100644 --- a/internal/util-collection/src/main/scala/sbt/KList.scala +++ b/internal/util-collection/src/main/scala/sbt/util/internal/KList.scala @@ -1,4 +1,4 @@ -package sbt +package sbt.util.internal import Types._ import Classes.Applicative diff --git a/internal/util-collection/src/main/scala/sbt/PMap.scala b/internal/util-collection/src/main/scala/sbt/util/internal/PMap.scala similarity index 99% rename from internal/util-collection/src/main/scala/sbt/PMap.scala rename to internal/util-collection/src/main/scala/sbt/util/internal/PMap.scala index 979e776fa..f9ac4b0a0 100644 --- a/internal/util-collection/src/main/scala/sbt/PMap.scala +++ b/internal/util-collection/src/main/scala/sbt/util/internal/PMap.scala @@ -1,7 +1,7 @@ /* sbt -- Simple Build Tool * Copyright 2010 Mark Harrah */ -package sbt +package sbt.util.internal import collection.mutable diff --git a/internal/util-collection/src/main/scala/sbt/Param.scala b/internal/util-collection/src/main/scala/sbt/util/internal/Param.scala similarity index 95% rename from internal/util-collection/src/main/scala/sbt/Param.scala rename to internal/util-collection/src/main/scala/sbt/util/internal/Param.scala index 19d12798a..16bd17e49 100644 --- a/internal/util-collection/src/main/scala/sbt/Param.scala +++ b/internal/util-collection/src/main/scala/sbt/util/internal/Param.scala @@ -1,7 +1,7 @@ /* sbt -- Simple Build Tool * Copyright 2010 Mark Harrah */ -package sbt +package sbt.util.internal import Types._ diff --git a/internal/util-collection/src/main/scala/sbt/Positions.scala b/internal/util-collection/src/main/scala/sbt/util/internal/Positions.scala similarity index 94% rename from internal/util-collection/src/main/scala/sbt/Positions.scala rename to internal/util-collection/src/main/scala/sbt/util/internal/Positions.scala index 5d7e1915d..fd64e4538 100755 --- a/internal/util-collection/src/main/scala/sbt/Positions.scala +++ b/internal/util-collection/src/main/scala/sbt/util/internal/Positions.scala @@ -1,4 +1,4 @@ -package sbt +package sbt.util.internal sealed trait SourcePosition diff --git a/internal/util-collection/src/main/scala/sbt/Settings.scala b/internal/util-collection/src/main/scala/sbt/util/internal/Settings.scala similarity index 99% rename from internal/util-collection/src/main/scala/sbt/Settings.scala rename to internal/util-collection/src/main/scala/sbt/util/internal/Settings.scala index 018d5dfc0..9e6cdf95e 100644 --- a/internal/util-collection/src/main/scala/sbt/Settings.scala +++ b/internal/util-collection/src/main/scala/sbt/util/internal/Settings.scala @@ -1,7 +1,7 @@ /* sbt -- Simple Build Tool * Copyright 2011 Mark Harrah */ -package sbt +package sbt.util.internal import Types._ diff --git a/internal/util-collection/src/main/scala/sbt/Show.scala b/internal/util-collection/src/main/scala/sbt/util/internal/Show.scala similarity index 84% rename from internal/util-collection/src/main/scala/sbt/Show.scala rename to internal/util-collection/src/main/scala/sbt/util/internal/Show.scala index 1f8e9703b..930431e13 100644 --- a/internal/util-collection/src/main/scala/sbt/Show.scala +++ b/internal/util-collection/src/main/scala/sbt/util/internal/Show.scala @@ -1,4 +1,4 @@ -package sbt +package sbt.util.internal trait Show[T] { def apply(t: T): String diff --git a/internal/util-collection/src/main/scala/sbt/ShowLines.scala b/internal/util-collection/src/main/scala/sbt/util/internal/ShowLines.scala similarity index 92% rename from internal/util-collection/src/main/scala/sbt/ShowLines.scala rename to internal/util-collection/src/main/scala/sbt/util/internal/ShowLines.scala index 126b6360e..794f3d5cb 100644 --- a/internal/util-collection/src/main/scala/sbt/ShowLines.scala +++ b/internal/util-collection/src/main/scala/sbt/util/internal/ShowLines.scala @@ -1,4 +1,4 @@ -package sbt +package sbt.util.internal trait ShowLines[A] { def showLines(a: A): Seq[String] diff --git a/internal/util-collection/src/main/scala/sbt/Signal.scala b/internal/util-collection/src/main/scala/sbt/util/internal/Signal.scala similarity index 99% rename from internal/util-collection/src/main/scala/sbt/Signal.scala rename to internal/util-collection/src/main/scala/sbt/util/internal/Signal.scala index 5aa5fc86e..f8e3ed17d 100644 --- a/internal/util-collection/src/main/scala/sbt/Signal.scala +++ b/internal/util-collection/src/main/scala/sbt/util/internal/Signal.scala @@ -1,4 +1,4 @@ -package sbt +package sbt.util.internal object Signals { val CONT = "CONT" diff --git a/internal/util-collection/src/main/scala/sbt/TypeFunctions.scala b/internal/util-collection/src/main/scala/sbt/util/internal/TypeFunctions.scala similarity index 98% rename from internal/util-collection/src/main/scala/sbt/TypeFunctions.scala rename to internal/util-collection/src/main/scala/sbt/util/internal/TypeFunctions.scala index 74f0a7d99..ed1669f35 100644 --- a/internal/util-collection/src/main/scala/sbt/TypeFunctions.scala +++ b/internal/util-collection/src/main/scala/sbt/util/internal/TypeFunctions.scala @@ -1,7 +1,7 @@ /* sbt -- Simple Build Tool * Copyright 2010 Mark Harrah */ -package sbt +package sbt.util.internal trait TypeFunctions { type Id[X] = X diff --git a/internal/util-collection/src/main/scala/sbt/Types.scala b/internal/util-collection/src/main/scala/sbt/util/internal/Types.scala similarity index 88% rename from internal/util-collection/src/main/scala/sbt/Types.scala rename to internal/util-collection/src/main/scala/sbt/util/internal/Types.scala index 29994f3d1..972f12769 100644 --- a/internal/util-collection/src/main/scala/sbt/Types.scala +++ b/internal/util-collection/src/main/scala/sbt/util/internal/Types.scala @@ -1,7 +1,7 @@ /* sbt -- Simple Build Tool * Copyright 2010 Mark Harrah */ -package sbt +package sbt.util.internal object Types extends Types diff --git a/internal/util-collection/src/main/scala/sbt/Util.scala b/internal/util-collection/src/main/scala/sbt/util/internal/Util.scala similarity index 98% rename from internal/util-collection/src/main/scala/sbt/Util.scala rename to internal/util-collection/src/main/scala/sbt/util/internal/Util.scala index befc7b5a9..ba158ae57 100644 --- a/internal/util-collection/src/main/scala/sbt/Util.scala +++ b/internal/util-collection/src/main/scala/sbt/util/internal/Util.scala @@ -1,7 +1,7 @@ /* sbt -- Simple Build Tool * Copyright 2011 Mark Harrah */ -package sbt +package sbt.util.internal import java.util.Locale diff --git a/internal/util-collection/src/test/scala/DagSpecification.scala b/internal/util-collection/src/test/scala/DagSpecification.scala index abf9ddf28..47c1b802b 100644 --- a/internal/util-collection/src/test/scala/DagSpecification.scala +++ b/internal/util-collection/src/test/scala/DagSpecification.scala @@ -1,7 +1,7 @@ /* sbt -- Simple Build Tool * Copyright 2008 Mark Harrah */ -package sbt +package sbt.util.internal import org.scalacheck._ import Prop._ diff --git a/internal/util-collection/src/test/scala/KeyTest.scala b/internal/util-collection/src/test/scala/KeyTest.scala index f48e3742a..8bdcd76bf 100644 --- a/internal/util-collection/src/test/scala/KeyTest.scala +++ b/internal/util-collection/src/test/scala/KeyTest.scala @@ -1,4 +1,4 @@ -package sbt +package sbt.util.internal import org.scalacheck._ import Prop._ diff --git a/internal/util-collection/src/test/scala/LiteralTest.scala b/internal/util-collection/src/test/scala/LiteralTest.scala index 35ef373ca..32da58a7b 100644 --- a/internal/util-collection/src/test/scala/LiteralTest.scala +++ b/internal/util-collection/src/test/scala/LiteralTest.scala @@ -1,7 +1,7 @@ /* sbt -- Simple Build Tool * Copyright 2010 Mark Harrah */ -package sbt +package sbt.util.internal import Types._ diff --git a/internal/util-collection/src/test/scala/PMapTest.scala b/internal/util-collection/src/test/scala/PMapTest.scala index 6a6c558c1..e8aa2c6fa 100644 --- a/internal/util-collection/src/test/scala/PMapTest.scala +++ b/internal/util-collection/src/test/scala/PMapTest.scala @@ -1,7 +1,7 @@ /* sbt -- Simple Build Tool * Copyright 2010 Mark Harrah */ -package sbt +package sbt.util.internal import Types._ diff --git a/internal/util-collection/src/test/scala/SettingsExample.scala b/internal/util-collection/src/test/scala/SettingsExample.scala index 3a6bc3853..96a8e01f6 100644 --- a/internal/util-collection/src/test/scala/SettingsExample.scala +++ b/internal/util-collection/src/test/scala/SettingsExample.scala @@ -1,4 +1,4 @@ -package sbt +package sbt.util.internal /** Define our settings system */ diff --git a/internal/util-collection/src/test/scala/SettingsTest.scala b/internal/util-collection/src/test/scala/SettingsTest.scala index ab92332db..3321c644b 100644 --- a/internal/util-collection/src/test/scala/SettingsTest.scala +++ b/internal/util-collection/src/test/scala/SettingsTest.scala @@ -1,4 +1,4 @@ -package sbt +package sbt.util.internal import org.scalacheck._ import Prop._ diff --git a/internal/util-complete/src/main/scala/sbt/LineReader.scala b/internal/util-complete/src/main/scala/sbt/util/internal/LineReader.scala similarity index 97% rename from internal/util-complete/src/main/scala/sbt/LineReader.scala rename to internal/util-complete/src/main/scala/sbt/util/internal/LineReader.scala index 41679ab6e..c01986a0f 100644 --- a/internal/util-complete/src/main/scala/sbt/LineReader.scala +++ b/internal/util-complete/src/main/scala/sbt/util/internal/LineReader.scala @@ -1,7 +1,7 @@ /* sbt -- Simple Build Tool * Copyright 2008, 2009 Mark Harrah */ -package sbt +package sbt.util.internal import jline.console.ConsoleReader import jline.console.history.{ FileHistory, MemoryHistory } @@ -128,7 +128,7 @@ final class FullReader(historyPath: Option[File], complete: Parser[_], val handl protected[this] val reader = { val cr = JLine.createReader(historyPath) - sbt.complete.JLineCompletion.installCustomCompletor(cr, complete) + sbt.util.internal.complete.JLineCompletion.installCustomCompletor(cr, complete) cr } } diff --git a/internal/util-complete/src/main/scala/sbt/complete/Completions.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/Completions.scala similarity index 99% rename from internal/util-complete/src/main/scala/sbt/complete/Completions.scala rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/Completions.scala index 5237ad26d..b3a562dc7 100644 --- a/internal/util-complete/src/main/scala/sbt/complete/Completions.scala +++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/Completions.scala @@ -1,7 +1,8 @@ /* sbt -- Simple Build Tool * Copyright 2010 Mark Harrah */ -package sbt.complete +package sbt.util.internal +package complete /** * Represents a set of completions. diff --git a/internal/util-complete/src/main/scala/sbt/complete/EditDistance.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/EditDistance.scala similarity index 96% rename from internal/util-complete/src/main/scala/sbt/complete/EditDistance.scala rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/EditDistance.scala index 95ed0c91f..873d9035c 100644 --- a/internal/util-complete/src/main/scala/sbt/complete/EditDistance.scala +++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/EditDistance.scala @@ -1,4 +1,5 @@ -package sbt.complete +package sbt.util.internal +package complete import java.lang.Character.{ toLowerCase => lower } diff --git a/internal/util-complete/src/main/scala/sbt/complete/ExampleSource.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/ExampleSource.scala similarity index 98% rename from internal/util-complete/src/main/scala/sbt/complete/ExampleSource.scala rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/ExampleSource.scala index ab2d39b4c..932951e34 100644 --- a/internal/util-complete/src/main/scala/sbt/complete/ExampleSource.scala +++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/ExampleSource.scala @@ -1,4 +1,5 @@ -package sbt.complete +package sbt.util.internal +package complete import java.io.File import sbt.io.IO diff --git a/internal/util-complete/src/main/scala/sbt/complete/History.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/History.scala similarity index 98% rename from internal/util-complete/src/main/scala/sbt/complete/History.scala rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/History.scala index 614244b9e..bd925cd17 100644 --- a/internal/util-complete/src/main/scala/sbt/complete/History.scala +++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/History.scala @@ -1,7 +1,7 @@ /* sbt -- Simple Build Tool * Copyright 2010 Mark Harrah */ -package sbt +package sbt.util.internal package complete import History.number diff --git a/internal/util-complete/src/main/scala/sbt/complete/HistoryCommands.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/HistoryCommands.scala similarity index 98% rename from internal/util-complete/src/main/scala/sbt/complete/HistoryCommands.scala rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/HistoryCommands.scala index b66d3272e..662b914c0 100644 --- a/internal/util-complete/src/main/scala/sbt/complete/HistoryCommands.scala +++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/HistoryCommands.scala @@ -1,7 +1,7 @@ /* sbt -- Simple Build Tool * Copyright 2010 Mark Harrah */ -package sbt +package sbt.util.internal package complete import java.io.File diff --git a/internal/util-complete/src/main/scala/sbt/complete/JLineCompletion.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/JLineCompletion.scala similarity index 99% rename from internal/util-complete/src/main/scala/sbt/complete/JLineCompletion.scala rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/JLineCompletion.scala index 2445fd111..c674e21db 100644 --- a/internal/util-complete/src/main/scala/sbt/complete/JLineCompletion.scala +++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/JLineCompletion.scala @@ -1,7 +1,8 @@ /* sbt -- Simple Build Tool * Copyright 2011 Mark Harrah */ -package sbt.complete +package sbt.util.internal +package complete import jline.console.ConsoleReader import jline.console.completer.{ CandidateListCompletionHandler, Completer, CompletionHandler } diff --git a/internal/util-complete/src/main/scala/sbt/complete/Parser.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/Parser.scala similarity index 99% rename from internal/util-complete/src/main/scala/sbt/complete/Parser.scala rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/Parser.scala index 7ae7ea0fd..659f20e7b 100644 --- a/internal/util-complete/src/main/scala/sbt/complete/Parser.scala +++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/Parser.scala @@ -1,11 +1,12 @@ /* sbt -- Simple Build Tool * Copyright 2008, 2010, 2011 Mark Harrah */ -package sbt.complete +package sbt.util.internal +package complete import Parser._ -import sbt.Types.{ left, right, some } -import sbt.Util.{ makeList, separate } +import sbt.util.internal.Types.{ left, right, some } +import sbt.util.internal.Util.{ makeList, separate } /** * A String parser that provides semi-automatic tab completion. diff --git a/internal/util-complete/src/main/scala/sbt/complete/Parsers.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/Parsers.scala similarity index 99% rename from internal/util-complete/src/main/scala/sbt/complete/Parsers.scala rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/Parsers.scala index af5849870..e0b81884f 100644 --- a/internal/util-complete/src/main/scala/sbt/complete/Parsers.scala +++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/Parsers.scala @@ -1,7 +1,8 @@ /* sbt -- Simple Build Tool * Copyright 2011 Mark Harrah */ -package sbt.complete +package sbt.util.internal +package complete import Parser._ import java.io.File diff --git a/internal/util-complete/src/main/scala/sbt/complete/ProcessError.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/ProcessError.scala similarity index 95% rename from internal/util-complete/src/main/scala/sbt/complete/ProcessError.scala rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/ProcessError.scala index d85e523c9..2faa17634 100644 --- a/internal/util-complete/src/main/scala/sbt/complete/ProcessError.scala +++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/ProcessError.scala @@ -1,4 +1,5 @@ -package sbt.complete +package sbt.util.internal +package complete object ProcessError { def apply(command: String, msgs: Seq[String], index: Int): String = diff --git a/internal/util-complete/src/main/scala/sbt/complete/TokenCompletions.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/TokenCompletions.scala similarity index 97% rename from internal/util-complete/src/main/scala/sbt/complete/TokenCompletions.scala rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/TokenCompletions.scala index 1285507cc..6d3e5100f 100644 --- a/internal/util-complete/src/main/scala/sbt/complete/TokenCompletions.scala +++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/TokenCompletions.scala @@ -1,4 +1,5 @@ -package sbt.complete +package sbt.util.internal +package complete import Completion.{ token => ctoken, tokenDisplay } diff --git a/internal/util-complete/src/main/scala/sbt/complete/TypeString.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/TypeString.scala similarity index 98% rename from internal/util-complete/src/main/scala/sbt/complete/TypeString.scala rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/TypeString.scala index bd5f84f43..1ac092023 100644 --- a/internal/util-complete/src/main/scala/sbt/complete/TypeString.scala +++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/TypeString.scala @@ -1,4 +1,5 @@ -package sbt.complete +package sbt.util.internal +package complete import DefaultParsers._ import TypeString._ diff --git a/internal/util-complete/src/main/scala/sbt/complete/UpperBound.scala b/internal/util-complete/src/main/scala/sbt/util/internal/complete/UpperBound.scala similarity index 97% rename from internal/util-complete/src/main/scala/sbt/complete/UpperBound.scala rename to internal/util-complete/src/main/scala/sbt/util/internal/complete/UpperBound.scala index 2d954d4c5..cd42e688b 100644 --- a/internal/util-complete/src/main/scala/sbt/complete/UpperBound.scala +++ b/internal/util-complete/src/main/scala/sbt/util/internal/complete/UpperBound.scala @@ -1,7 +1,8 @@ /* sbt -- Simple Build Tool * Copyright 2008,2010 Mark Harrah */ -package sbt.complete +package sbt.util.internal +package complete sealed trait UpperBound { /** True if and only if the given value meets this bound.*/ diff --git a/internal/util-complete/src/test/scala/ParserTest.scala b/internal/util-complete/src/test/scala/ParserTest.scala index c70c6207b..c1bd8c45c 100644 --- a/internal/util-complete/src/test/scala/ParserTest.scala +++ b/internal/util-complete/src/test/scala/ParserTest.scala @@ -1,4 +1,5 @@ -package sbt.complete +package sbt.util.internal +package complete object JLineTest { import DefaultParsers._ diff --git a/internal/util-complete/src/test/scala/sbt/complete/FileExamplesTest.scala b/internal/util-complete/src/test/scala/sbt/complete/FileExamplesTest.scala index f9cc77038..a0db3d777 100644 --- a/internal/util-complete/src/test/scala/sbt/complete/FileExamplesTest.scala +++ b/internal/util-complete/src/test/scala/sbt/complete/FileExamplesTest.scala @@ -1,4 +1,5 @@ -package sbt.complete +package sbt.util.internal +package complete import org.specs2.mutable.Specification import org.specs2.specification.Scope diff --git a/internal/util-complete/src/test/scala/sbt/complete/FixedSetExamplesTest.scala b/internal/util-complete/src/test/scala/sbt/complete/FixedSetExamplesTest.scala index b5aa14250..4323b8e24 100644 --- a/internal/util-complete/src/test/scala/sbt/complete/FixedSetExamplesTest.scala +++ b/internal/util-complete/src/test/scala/sbt/complete/FixedSetExamplesTest.scala @@ -1,4 +1,5 @@ -package sbt.complete +package sbt.util.internal +package complete import org.specs2.mutable.Specification import org.specs2.specification.Scope diff --git a/internal/util-complete/src/test/scala/sbt/complete/ParserWithExamplesTest.scala b/internal/util-complete/src/test/scala/sbt/complete/ParserWithExamplesTest.scala index 3bcc55dd2..854569e88 100644 --- a/internal/util-complete/src/test/scala/sbt/complete/ParserWithExamplesTest.scala +++ b/internal/util-complete/src/test/scala/sbt/complete/ParserWithExamplesTest.scala @@ -1,4 +1,5 @@ -package sbt.complete +package sbt.util.internal +package complete import org.specs2.mutable.Specification import org.specs2.specification.Scope diff --git a/internal/util-logic/src/main/scala/sbt/logic/Logic.scala b/internal/util-logic/src/main/scala/sbt/util/internal/logic/Logic.scala similarity index 99% rename from internal/util-logic/src/main/scala/sbt/logic/Logic.scala rename to internal/util-logic/src/main/scala/sbt/util/internal/logic/Logic.scala index 0fbbe3f98..3e6f8ba8c 100644 --- a/internal/util-logic/src/main/scala/sbt/logic/Logic.scala +++ b/internal/util-logic/src/main/scala/sbt/util/internal/logic/Logic.scala @@ -1,4 +1,4 @@ -package sbt +package sbt.util.internal package logic import scala.annotation.tailrec diff --git a/internal/util-logic/src/test/scala/sbt/logic/Test.scala b/internal/util-logic/src/test/scala/sbt/logic/Test.scala index f9957414b..f6170f1e3 100644 --- a/internal/util-logic/src/test/scala/sbt/logic/Test.scala +++ b/internal/util-logic/src/test/scala/sbt/logic/Test.scala @@ -1,4 +1,4 @@ -package sbt +package sbt.util.internal package logic import org.scalacheck._