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

Merge pull request #11 from sbt/wip/packagenames 

Move util into sbt.util.internal package
This commit is contained in:
eugene yokota 2015-09-04 14:24:02 -04:00 committed by Dale Wijnand
parent 9d2abb3cac 53e719656f
commit dd6286044b
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
43 changed files with 60 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/util-collection/src/main/scala/sbt/AList.scala → internal/util-collection/src/main/scala/sbt/util/internal/AList.scala
View File

@ -1,4 +1,4 @@
package sbt
package sbt.util.internal
import Classes.Applicative
import Types._

2
internal/util-collection/src/main/scala/sbt/Attributes.scala → internal/util-collection/src/main/scala/sbt/util/internal/Attributes.scala
View File

@ -1,7 +1,7 @@
/* sbt -- Simple Build Tool
* Copyright 2010 Mark Harrah
*/
package sbt
package sbt.util.internal
import Types._
import scala.reflect.Manifest

2
internal/util-collection/src/main/scala/sbt/Classes.scala → internal/util-collection/src/main/scala/sbt/util/internal/Classes.scala
View File

@ -1,4 +1,4 @@
package sbt
package sbt.util.internal
object Classes {
trait Applicative[M[_]] {

2
internal/util-collection/src/main/scala/sbt/Dag.scala → internal/util-collection/src/main/scala/sbt/util/internal/Dag.scala
View File

@ -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 =>

2
internal/util-collection/src/main/scala/sbt/HList.scala → internal/util-collection/src/main/scala/sbt/util/internal/HList.scala
View File

@ -1,7 +1,7 @@
/* sbt -- Simple Build Tool
* Copyright 2010 Mark Harrah
*/
package sbt
package sbt.util.internal
import Types._

2
internal/util-collection/src/main/scala/sbt/IDSet.scala → internal/util-collection/src/main/scala/sbt/util/internal/IDSet.scala
View File

@ -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] {

2
internal/util-collection/src/main/scala/sbt/INode.scala → internal/util-collection/src/main/scala/sbt/util/internal/INode.scala
View File

@ -1,4 +1,4 @@
package sbt
package sbt.util.internal
import java.lang.Runnable
import java.util.concurrent.{ atomic, Executor, LinkedBlockingQueue }

2
internal/util-collection/src/main/scala/sbt/KList.scala → internal/util-collection/src/main/scala/sbt/util/internal/KList.scala
View File

@ -1,4 +1,4 @@
package sbt
package sbt.util.internal
import Types._
import Classes.Applicative

2
internal/util-collection/src/main/scala/sbt/PMap.scala → internal/util-collection/src/main/scala/sbt/util/internal/PMap.scala
View File

@ -1,7 +1,7 @@
/* sbt -- Simple Build Tool
* Copyright 2010 Mark Harrah
*/
package sbt
package sbt.util.internal
import collection.mutable

2
internal/util-collection/src/main/scala/sbt/Param.scala → internal/util-collection/src/main/scala/sbt/util/internal/Param.scala
View File

@ -1,7 +1,7 @@
/* sbt -- Simple Build Tool
* Copyright 2010 Mark Harrah
*/
package sbt
package sbt.util.internal
import Types._

2
internal/util-collection/src/main/scala/sbt/Positions.scala → internal/util-collection/src/main/scala/sbt/util/internal/Positions.scala
View File

@ -1,4 +1,4 @@
package sbt
package sbt.util.internal
sealed trait SourcePosition

2
internal/util-collection/src/main/scala/sbt/Settings.scala → internal/util-collection/src/main/scala/sbt/util/internal/Settings.scala
View File

@ -1,7 +1,7 @@
/* sbt -- Simple Build Tool
* Copyright 2011 Mark Harrah
*/
package sbt
package sbt.util.internal
import Types._

2
internal/util-collection/src/main/scala/sbt/Show.scala → internal/util-collection/src/main/scala/sbt/util/internal/Show.scala
View File

@ -1,4 +1,4 @@
package sbt
package sbt.util.internal
trait Show[T] {
def apply(t: T): String

2
internal/util-collection/src/main/scala/sbt/ShowLines.scala → internal/util-collection/src/main/scala/sbt/util/internal/ShowLines.scala
View File

@ -1,4 +1,4 @@
package sbt
package sbt.util.internal
trait ShowLines[A] {
def showLines(a: A): Seq[String]

2
internal/util-collection/src/main/scala/sbt/Signal.scala → internal/util-collection/src/main/scala/sbt/util/internal/Signal.scala
View File

@ -1,4 +1,4 @@
package sbt
package sbt.util.internal
object Signals {
val CONT = "CONT"

2
internal/util-collection/src/main/scala/sbt/TypeFunctions.scala → internal/util-collection/src/main/scala/sbt/util/internal/TypeFunctions.scala
View File

@ -1,7 +1,7 @@
/* sbt -- Simple Build Tool
* Copyright 2010 Mark Harrah
*/
package sbt
package sbt.util.internal
trait TypeFunctions {
type Id[X] = X

2
internal/util-collection/src/main/scala/sbt/Types.scala → internal/util-collection/src/main/scala/sbt/util/internal/Types.scala
View File

@ -1,7 +1,7 @@
/* sbt -- Simple Build Tool
* Copyright 2010 Mark Harrah
*/
package sbt
package sbt.util.internal
object Types extends Types

2
internal/util-collection/src/main/scala/sbt/Util.scala → internal/util-collection/src/main/scala/sbt/util/internal/Util.scala
View File

@ -1,7 +1,7 @@
/* sbt -- Simple Build Tool
* Copyright 2011 Mark Harrah
*/
package sbt
package sbt.util.internal
import java.util.Locale

2
internal/util-collection/src/test/scala/DagSpecification.scala
View File

@ -1,7 +1,7 @@
/* sbt -- Simple Build Tool
* Copyright 2008 Mark Harrah */
package sbt
package sbt.util.internal
import org.scalacheck._
import Prop._

2
internal/util-collection/src/test/scala/KeyTest.scala
View File

@ -1,4 +1,4 @@
package sbt
package sbt.util.internal
import org.scalacheck._
import Prop._

2
internal/util-collection/src/test/scala/LiteralTest.scala
View File

@ -1,7 +1,7 @@
/* sbt -- Simple Build Tool
* Copyright 2010 Mark Harrah
*/
package sbt
package sbt.util.internal
import Types._

2
internal/util-collection/src/test/scala/PMapTest.scala
View File

@ -1,7 +1,7 @@
/* sbt -- Simple Build Tool
* Copyright 2010 Mark Harrah
*/
package sbt
package sbt.util.internal
import Types._

2
internal/util-collection/src/test/scala/SettingsExample.scala
View File

@ -1,4 +1,4 @@
package sbt
package sbt.util.internal
/** Define our settings system */

2
internal/util-collection/src/test/scala/SettingsTest.scala
View File

@ -1,4 +1,4 @@
package sbt
package sbt.util.internal
import org.scalacheck._
import Prop._

4
internal/util-complete/src/main/scala/sbt/LineReader.scala → internal/util-complete/src/main/scala/sbt/util/internal/LineReader.scala
View File

@ -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
}
}

3
internal/util-complete/src/main/scala/sbt/complete/Completions.scala → internal/util-complete/src/main/scala/sbt/util/internal/complete/Completions.scala
View File

@ -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.

3
internal/util-complete/src/main/scala/sbt/complete/EditDistance.scala → internal/util-complete/src/main/scala/sbt/util/internal/complete/EditDistance.scala
View File

@ -1,4 +1,5 @@
package sbt.complete
package sbt.util.internal
package complete
import java.lang.Character.{ toLowerCase => lower }

3
internal/util-complete/src/main/scala/sbt/complete/ExampleSource.scala → internal/util-complete/src/main/scala/sbt/util/internal/complete/ExampleSource.scala
View File

@ -1,4 +1,5 @@
package sbt.complete
package sbt.util.internal
package complete
import java.io.File
import sbt.io.IO

2
internal/util-complete/src/main/scala/sbt/complete/History.scala → internal/util-complete/src/main/scala/sbt/util/internal/complete/History.scala
View File

@ -1,7 +1,7 @@
/* sbt -- Simple Build Tool
* Copyright 2010 Mark Harrah
*/
package sbt
package sbt.util.internal
package complete
import History.number

2
internal/util-complete/src/main/scala/sbt/complete/HistoryCommands.scala → internal/util-complete/src/main/scala/sbt/util/internal/complete/HistoryCommands.scala
View File

@ -1,7 +1,7 @@
/* sbt -- Simple Build Tool
* Copyright 2010 Mark Harrah
*/
package sbt
package sbt.util.internal
package complete
import java.io.File

3
internal/util-complete/src/main/scala/sbt/complete/JLineCompletion.scala → internal/util-complete/src/main/scala/sbt/util/internal/complete/JLineCompletion.scala
View File

@ -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 }

7
internal/util-complete/src/main/scala/sbt/complete/Parser.scala → internal/util-complete/src/main/scala/sbt/util/internal/complete/Parser.scala
View File

@ -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.

3
internal/util-complete/src/main/scala/sbt/complete/Parsers.scala → internal/util-complete/src/main/scala/sbt/util/internal/complete/Parsers.scala
View File

@ -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

3
internal/util-complete/src/main/scala/sbt/complete/ProcessError.scala → internal/util-complete/src/main/scala/sbt/util/internal/complete/ProcessError.scala
View File

@ -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 =

3
internal/util-complete/src/main/scala/sbt/complete/TokenCompletions.scala → internal/util-complete/src/main/scala/sbt/util/internal/complete/TokenCompletions.scala
View File

@ -1,4 +1,5 @@
package sbt.complete
package sbt.util.internal
package complete
import Completion.{ token => ctoken, tokenDisplay }

3
internal/util-complete/src/main/scala/sbt/complete/TypeString.scala → internal/util-complete/src/main/scala/sbt/util/internal/complete/TypeString.scala
View File

@ -1,4 +1,5 @@
package sbt.complete
package sbt.util.internal
package complete
import DefaultParsers._
import TypeString._

3
internal/util-complete/src/main/scala/sbt/complete/UpperBound.scala → internal/util-complete/src/main/scala/sbt/util/internal/complete/UpperBound.scala
View File

@ -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.*/

3
internal/util-complete/src/test/scala/ParserTest.scala
View File

@ -1,4 +1,5 @@
package sbt.complete
package sbt.util.internal
package complete
object JLineTest {
import DefaultParsers._

3
internal/util-complete/src/test/scala/sbt/complete/FileExamplesTest.scala
View File

@ -1,4 +1,5 @@
package sbt.complete
package sbt.util.internal
package complete
import org.specs2.mutable.Specification
import org.specs2.specification.Scope

3
internal/util-complete/src/test/scala/sbt/complete/FixedSetExamplesTest.scala
View File

@ -1,4 +1,5 @@
package sbt.complete
package sbt.util.internal
package complete
import org.specs2.mutable.Specification
import org.specs2.specification.Scope

3
internal/util-complete/src/test/scala/sbt/complete/ParserWithExamplesTest.scala
View File

@ -1,4 +1,5 @@
package sbt.complete
package sbt.util.internal
package complete
import org.specs2.mutable.Specification
import org.specs2.specification.Scope

2
internal/util-logic/src/main/scala/sbt/logic/Logic.scala → internal/util-logic/src/main/scala/sbt/util/internal/logic/Logic.scala
View File

@ -1,4 +1,4 @@
package sbt
package sbt.util.internal
package logic
import scala.annotation.tailrec

2
internal/util-logic/src/test/scala/sbt/logic/Test.scala
View File

@ -1,4 +1,4 @@
package sbt
package sbt.util.internal
package logic
import org.scalacheck._