From 871b4f4eefbf228a8a6f6e148a92819a4987210b Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 20 Aug 2015 00:43:22 -0400 Subject: [PATCH] move modules around. --- build.sbt | 22 +++++++++---------- {util => internal}/process/NOTICE | 0 .../src/main/scala/sbt/InheritInput.scala | 0 .../process/src/main/scala/sbt/Process.scala | 0 .../src/main/scala/sbt/ProcessImpl.scala | 0 .../process/src/main/scala/sbt/SyncVar.scala | 0 .../src/test/scala/ProcessSpecification.scala | 0 .../src/test/scala/TestedProcess.scala | 0 .../main/scala/sbt/appmacro/ContextUtil.scala | 0 .../src/main/scala/sbt/appmacro/Convert.scala | 0 .../main/scala/sbt/appmacro/Instance.scala | 0 .../scala/sbt/appmacro/KListBuilder.scala | 0 .../scala/sbt/appmacro/MixedBuilder.scala | 0 .../scala/sbt/appmacro/TupleBuilder.scala | 0 .../scala/sbt/appmacro/TupleNBuilder.scala | 0 {cache => internal/util-cache}/NOTICE | 0 .../src/main/scala/sbt/Cache.scala | 0 .../src/main/scala/sbt/CacheIO.scala | 0 .../src/main/scala/sbt/FileInfo.scala | 0 .../src/main/scala/sbt/SeparatedCache.scala | 0 .../src/test/scala/CacheTest.scala | 0 .../util-collection}/NOTICE | 0 .../src/main/scala/sbt/AList.scala | 0 .../src/main/scala/sbt/Attributes.scala | 0 .../src/main/scala/sbt/Classes.scala | 0 .../src/main/scala/sbt/Dag.scala | 0 .../src/main/scala/sbt/HList.scala | 0 .../src/main/scala/sbt/IDSet.scala | 0 .../src/main/scala/sbt/INode.scala | 0 .../src/main/scala/sbt/KList.scala | 0 .../src/main/scala/sbt/PMap.scala | 0 .../src/main/scala/sbt/Param.scala | 0 .../src/main/scala/sbt/Positions.scala | 0 .../src/main/scala/sbt/Settings.scala | 0 .../src/main/scala/sbt/Show.scala | 0 .../src/main/scala/sbt/ShowLines.scala | 0 .../src/main/scala/sbt/Signal.scala | 0 .../src/main/scala/sbt/TypeFunctions.scala | 0 .../src/main/scala/sbt/Types.scala | 0 .../src/main/scala/sbt/Util.scala | 0 .../src/test/scala/DagSpecification.scala | 0 .../src/test/scala/KeyTest.scala | 0 .../src/test/scala/LiteralTest.scala | 0 .../src/test/scala/PMapTest.scala | 0 .../src/test/scala/SettingsExample.scala | 0 .../src/test/scala/SettingsTest.scala | 0 .../util-complete}/NOTICE | 0 .../src/main/scala/sbt/LineReader.scala | 0 .../main/scala/sbt/complete/Completions.scala | 0 .../scala/sbt/complete/EditDistance.scala | 0 .../scala/sbt/complete/ExampleSource.scala | 0 .../src/main/scala/sbt/complete/History.scala | 0 .../scala/sbt/complete/HistoryCommands.scala | 0 .../scala/sbt/complete/JLineCompletion.scala | 0 .../src/main/scala/sbt/complete/Parser.scala | 0 .../src/main/scala/sbt/complete/Parsers.scala | 0 .../scala/sbt/complete/ProcessError.scala | 0 .../scala/sbt/complete/TokenCompletions.scala | 0 .../main/scala/sbt/complete/TypeString.scala | 0 .../main/scala/sbt/complete/UpperBound.scala | 0 .../src/test/scala/ParserTest.scala | 0 .../scala/sbt/complete/FileExamplesTest.scala | 0 .../sbt/complete/FixedSetExamplesTest.scala | 0 .../sbt/complete/ParserWithExamplesTest.scala | 0 .../control => internal/util-control}/NOTICE | 0 .../src/main/scala/sbt/ErrorHandling.scala | 0 .../src/main/scala/sbt/ExitHook.scala | 0 .../main/scala/sbt/MessageOnlyException.scala | 0 .../src/main/java/xsbti/F0.java | 0 .../src/main/java/xsbti/Logger.java | 0 .../src/main/java/xsbti/Maybe.java | 0 .../src/main/java/xsbti/Position.java | 0 .../src/main/java/xsbti/Problem.java | 0 .../src/main/java/xsbti/Severity.java | 0 {util/log => internal/util-logging}/NOTICE | 0 .../src/main/scala/sbt/BasicLogger.scala | 0 .../src/main/scala/sbt/BufferedLogger.scala | 0 .../src/main/scala/sbt/ConsoleLogger.scala | 0 .../src/main/scala/sbt/ConsoleOut.scala | 0 .../src/main/scala/sbt/FilterLogger.scala | 0 .../src/main/scala/sbt/FullLogger.scala | 0 .../src/main/scala/sbt/GlobalLogging.scala | 0 .../src/main/scala/sbt/Level.scala | 0 .../src/main/scala/sbt/LogEvent.scala | 0 .../src/main/scala/sbt/Logger.scala | 0 .../src/main/scala/sbt/LoggerWriter.scala | 0 .../src/main/scala/sbt/MainLogging.scala | 0 .../src/main/scala/sbt/MultiLogger.scala | 0 .../src/main/scala/sbt/StackTrace.scala | 0 .../src/test/scala/Escapes.scala | 0 .../src/test/scala/LogWriterTest.scala | 0 .../src/test/scala/TestLogger.scala | 0 .../src/main/scala/sbt/logic/Logic.scala | 0 .../src/test/scala/sbt/logic/Test.scala | 0 .../src/main/scala/sbt/Relation.scala | 0 .../src/test/scala/RelationTest.scala | 0 .../util-tracking}/NOTICE | 0 .../src/main/scala/sbt/ChangeReport.scala | 0 .../src/main/scala/sbt/Tracked.scala | 0 99 files changed, 10 insertions(+), 12 deletions(-) rename {util => internal}/process/NOTICE (100%) rename {util => internal}/process/src/main/scala/sbt/InheritInput.scala (100%) rename {util => internal}/process/src/main/scala/sbt/Process.scala (100%) rename {util => internal}/process/src/main/scala/sbt/ProcessImpl.scala (100%) rename {util => internal}/process/src/main/scala/sbt/SyncVar.scala (100%) rename {util => internal}/process/src/test/scala/ProcessSpecification.scala (100%) rename {util => internal}/process/src/test/scala/TestedProcess.scala (100%) rename {util/appmacro => internal/util-appmacro}/src/main/scala/sbt/appmacro/ContextUtil.scala (100%) rename {util/appmacro => internal/util-appmacro}/src/main/scala/sbt/appmacro/Convert.scala (100%) rename {util/appmacro => internal/util-appmacro}/src/main/scala/sbt/appmacro/Instance.scala (100%) rename {util/appmacro => internal/util-appmacro}/src/main/scala/sbt/appmacro/KListBuilder.scala (100%) rename {util/appmacro => internal/util-appmacro}/src/main/scala/sbt/appmacro/MixedBuilder.scala (100%) rename {util/appmacro => internal/util-appmacro}/src/main/scala/sbt/appmacro/TupleBuilder.scala (100%) rename {util/appmacro => internal/util-appmacro}/src/main/scala/sbt/appmacro/TupleNBuilder.scala (100%) rename {cache => internal/util-cache}/NOTICE (100%) rename {cache => internal/util-cache}/src/main/scala/sbt/Cache.scala (100%) rename {cache => internal/util-cache}/src/main/scala/sbt/CacheIO.scala (100%) rename {cache => internal/util-cache}/src/main/scala/sbt/FileInfo.scala (100%) rename {cache => internal/util-cache}/src/main/scala/sbt/SeparatedCache.scala (100%) rename {cache => internal/util-cache}/src/test/scala/CacheTest.scala (100%) rename {util/collection => internal/util-collection}/NOTICE (100%) rename {util/collection => internal/util-collection}/src/main/scala/sbt/AList.scala (100%) rename {util/collection => internal/util-collection}/src/main/scala/sbt/Attributes.scala (100%) rename {util/collection => internal/util-collection}/src/main/scala/sbt/Classes.scala (100%) rename {util/collection => internal/util-collection}/src/main/scala/sbt/Dag.scala (100%) rename {util/collection => internal/util-collection}/src/main/scala/sbt/HList.scala (100%) rename {util/collection => internal/util-collection}/src/main/scala/sbt/IDSet.scala (100%) rename {util/collection => internal/util-collection}/src/main/scala/sbt/INode.scala (100%) rename {util/collection => internal/util-collection}/src/main/scala/sbt/KList.scala (100%) rename {util/collection => internal/util-collection}/src/main/scala/sbt/PMap.scala (100%) rename {util/collection => internal/util-collection}/src/main/scala/sbt/Param.scala (100%) rename {util/collection => internal/util-collection}/src/main/scala/sbt/Positions.scala (100%) rename {util/collection => internal/util-collection}/src/main/scala/sbt/Settings.scala (100%) rename {util/collection => internal/util-collection}/src/main/scala/sbt/Show.scala (100%) rename {util/collection => internal/util-collection}/src/main/scala/sbt/ShowLines.scala (100%) rename {util/collection => internal/util-collection}/src/main/scala/sbt/Signal.scala (100%) rename {util/collection => internal/util-collection}/src/main/scala/sbt/TypeFunctions.scala (100%) rename {util/collection => internal/util-collection}/src/main/scala/sbt/Types.scala (100%) rename {util/collection => internal/util-collection}/src/main/scala/sbt/Util.scala (100%) rename {util/collection => internal/util-collection}/src/test/scala/DagSpecification.scala (100%) rename {util/collection => internal/util-collection}/src/test/scala/KeyTest.scala (100%) rename {util/collection => internal/util-collection}/src/test/scala/LiteralTest.scala (100%) rename {util/collection => internal/util-collection}/src/test/scala/PMapTest.scala (100%) rename {util/collection => internal/util-collection}/src/test/scala/SettingsExample.scala (100%) rename {util/collection => internal/util-collection}/src/test/scala/SettingsTest.scala (100%) rename {util/complete => internal/util-complete}/NOTICE (100%) rename {util/complete => internal/util-complete}/src/main/scala/sbt/LineReader.scala (100%) rename {util/complete => internal/util-complete}/src/main/scala/sbt/complete/Completions.scala (100%) rename {util/complete => internal/util-complete}/src/main/scala/sbt/complete/EditDistance.scala (100%) rename {util/complete => internal/util-complete}/src/main/scala/sbt/complete/ExampleSource.scala (100%) rename {util/complete => internal/util-complete}/src/main/scala/sbt/complete/History.scala (100%) rename {util/complete => internal/util-complete}/src/main/scala/sbt/complete/HistoryCommands.scala (100%) rename {util/complete => internal/util-complete}/src/main/scala/sbt/complete/JLineCompletion.scala (100%) rename {util/complete => internal/util-complete}/src/main/scala/sbt/complete/Parser.scala (100%) rename {util/complete => internal/util-complete}/src/main/scala/sbt/complete/Parsers.scala (100%) rename {util/complete => internal/util-complete}/src/main/scala/sbt/complete/ProcessError.scala (100%) rename {util/complete => internal/util-complete}/src/main/scala/sbt/complete/TokenCompletions.scala (100%) rename {util/complete => internal/util-complete}/src/main/scala/sbt/complete/TypeString.scala (100%) rename {util/complete => internal/util-complete}/src/main/scala/sbt/complete/UpperBound.scala (100%) rename {util/complete => internal/util-complete}/src/test/scala/ParserTest.scala (100%) rename {util/complete => internal/util-complete}/src/test/scala/sbt/complete/FileExamplesTest.scala (100%) rename {util/complete => internal/util-complete}/src/test/scala/sbt/complete/FixedSetExamplesTest.scala (100%) rename {util/complete => internal/util-complete}/src/test/scala/sbt/complete/ParserWithExamplesTest.scala (100%) rename {util/control => internal/util-control}/NOTICE (100%) rename {util/control => internal/util-control}/src/main/scala/sbt/ErrorHandling.scala (100%) rename {util/control => internal/util-control}/src/main/scala/sbt/ExitHook.scala (100%) rename {util/control => internal/util-control}/src/main/scala/sbt/MessageOnlyException.scala (100%) rename {interface => internal/util-interface}/src/main/java/xsbti/F0.java (100%) rename {interface => internal/util-interface}/src/main/java/xsbti/Logger.java (100%) rename {interface => internal/util-interface}/src/main/java/xsbti/Maybe.java (100%) rename {interface => internal/util-interface}/src/main/java/xsbti/Position.java (100%) rename {interface => internal/util-interface}/src/main/java/xsbti/Problem.java (100%) rename {interface => internal/util-interface}/src/main/java/xsbti/Severity.java (100%) rename {util/log => internal/util-logging}/NOTICE (100%) rename {util/log => internal/util-logging}/src/main/scala/sbt/BasicLogger.scala (100%) rename {util/log => internal/util-logging}/src/main/scala/sbt/BufferedLogger.scala (100%) rename {util/log => internal/util-logging}/src/main/scala/sbt/ConsoleLogger.scala (100%) rename {util/log => internal/util-logging}/src/main/scala/sbt/ConsoleOut.scala (100%) rename {util/log => internal/util-logging}/src/main/scala/sbt/FilterLogger.scala (100%) rename {util/log => internal/util-logging}/src/main/scala/sbt/FullLogger.scala (100%) rename {util/log => internal/util-logging}/src/main/scala/sbt/GlobalLogging.scala (100%) rename {util/log => internal/util-logging}/src/main/scala/sbt/Level.scala (100%) rename {util/log => internal/util-logging}/src/main/scala/sbt/LogEvent.scala (100%) rename {util/log => internal/util-logging}/src/main/scala/sbt/Logger.scala (100%) rename {util/log => internal/util-logging}/src/main/scala/sbt/LoggerWriter.scala (100%) rename {util/log => internal/util-logging}/src/main/scala/sbt/MainLogging.scala (100%) rename {util/log => internal/util-logging}/src/main/scala/sbt/MultiLogger.scala (100%) rename {util/log => internal/util-logging}/src/main/scala/sbt/StackTrace.scala (100%) rename {util/log => internal/util-logging}/src/test/scala/Escapes.scala (100%) rename {util/log => internal/util-logging}/src/test/scala/LogWriterTest.scala (100%) rename {util/log => internal/util-logging}/src/test/scala/TestLogger.scala (100%) rename {util/logic => internal/util-logic}/src/main/scala/sbt/logic/Logic.scala (100%) rename {util/logic => internal/util-logic}/src/test/scala/sbt/logic/Test.scala (100%) rename {util/relation => internal/util-relation}/src/main/scala/sbt/Relation.scala (100%) rename {util/relation => internal/util-relation}/src/test/scala/RelationTest.scala (100%) rename {cache/tracking => internal/util-tracking}/NOTICE (100%) rename {cache/tracking => internal/util-tracking}/src/main/scala/sbt/ChangeReport.scala (100%) rename {cache/tracking => internal/util-tracking}/src/main/scala/sbt/Tracked.scala (100%) diff --git a/build.sbt b/build.sbt index fcc99e21b..13061c241 100644 --- a/build.sbt +++ b/build.sbt @@ -2,8 +2,6 @@ import Dependencies._ import Util._ def internalPath = file("internal") -def utilPath = file("util") -def cachePath = file("cache") // ThisBuild settings take lower precedence, // but can be shared across the multi projects. @@ -54,7 +52,7 @@ lazy val utilRoot: Project = (project in file(".")). // defines Java structures used across Scala versions, such as the API structures and relationships extracted by // the analysis compiler phases and passed back to sbt. The API structures are defined in a simple // format from which Java sources are generated by the datatype generator Projproject -lazy val utilInterface = (project in file("interface")). +lazy val utilInterface = (project in internalPath / "util-interface"). settings( commonSettings, javaOnlySettings, @@ -71,7 +69,7 @@ lazy val utilInterface = (project in file("interface")). // streams) map generateAPICached ) -lazy val utilControl = (project in utilPath / "control"). +lazy val utilControl = (project in internalPath / "util-control"). settings( commonSettings, // Util.crossBuild, @@ -79,7 +77,7 @@ lazy val utilControl = (project in utilPath / "control"). crossScalaVersions := Seq(scala210, scala211) ) -lazy val utilCollection = (project in utilPath / "collection"). +lazy val utilCollection = (project in internalPath / "util-collection"). settings( testedBaseSettings, Util.keywordsSettings, @@ -88,7 +86,7 @@ lazy val utilCollection = (project in utilPath / "collection"). crossScalaVersions := Seq(scala210, scala211) ) -lazy val utilApplyMacro = (project in utilPath / "appmacro"). +lazy val utilApplyMacro = (project in internalPath / "util-appmacro"). dependsOn(utilCollection). settings( testedBaseSettings, @@ -97,7 +95,7 @@ lazy val utilApplyMacro = (project in utilPath / "appmacro"). ) // Command line-related utilities. -lazy val utilComplete = (project in utilPath / "complete"). +lazy val utilComplete = (project in internalPath / "util-complete"). dependsOn(utilCollection, utilControl). settings( testedBaseSettings, @@ -108,7 +106,7 @@ lazy val utilComplete = (project in utilPath / "complete"). ) // logging -lazy val utilLogging = (project in utilPath / "log"). +lazy val utilLogging = (project in internalPath / "util-logging"). dependsOn(utilInterface). settings( testedBaseSettings, @@ -117,14 +115,14 @@ lazy val utilLogging = (project in utilPath / "log"). ) // Relation -lazy val utilRelation = (project in utilPath / "relation"). +lazy val utilRelation = (project in internalPath / "util-relation"). settings( testedBaseSettings, name := "Util Relation" ) // A logic with restricted negation as failure for a unique, stable model -lazy val utilLogic = (project in utilPath / "logic"). +lazy val utilLogic = (project in internalPath / "util-logic"). dependsOn(utilCollection, utilRelation). settings( testedBaseSettings, @@ -132,7 +130,7 @@ lazy val utilLogic = (project in utilPath / "logic"). ) // Persisted caching based on SBinary -lazy val utilCache = (project in cachePath). +lazy val utilCache = (project in internalPath / "util-cache"). dependsOn(utilCollection). settings( commonSettings, @@ -141,7 +139,7 @@ lazy val utilCache = (project in cachePath). ) // Builds on cache to provide caching for filesystem-related operations -lazy val utilTracking = (project in cachePath / "tracking"). +lazy val utilTracking = (project in internalPath / "util-tracking"). dependsOn(utilCache). settings( commonSettings, diff --git a/util/process/NOTICE b/internal/process/NOTICE similarity index 100% rename from util/process/NOTICE rename to internal/process/NOTICE diff --git a/util/process/src/main/scala/sbt/InheritInput.scala b/internal/process/src/main/scala/sbt/InheritInput.scala similarity index 100% rename from util/process/src/main/scala/sbt/InheritInput.scala rename to internal/process/src/main/scala/sbt/InheritInput.scala diff --git a/util/process/src/main/scala/sbt/Process.scala b/internal/process/src/main/scala/sbt/Process.scala similarity index 100% rename from util/process/src/main/scala/sbt/Process.scala rename to internal/process/src/main/scala/sbt/Process.scala diff --git a/util/process/src/main/scala/sbt/ProcessImpl.scala b/internal/process/src/main/scala/sbt/ProcessImpl.scala similarity index 100% rename from util/process/src/main/scala/sbt/ProcessImpl.scala rename to internal/process/src/main/scala/sbt/ProcessImpl.scala diff --git a/util/process/src/main/scala/sbt/SyncVar.scala b/internal/process/src/main/scala/sbt/SyncVar.scala similarity index 100% rename from util/process/src/main/scala/sbt/SyncVar.scala rename to internal/process/src/main/scala/sbt/SyncVar.scala diff --git a/util/process/src/test/scala/ProcessSpecification.scala b/internal/process/src/test/scala/ProcessSpecification.scala similarity index 100% rename from util/process/src/test/scala/ProcessSpecification.scala rename to internal/process/src/test/scala/ProcessSpecification.scala diff --git a/util/process/src/test/scala/TestedProcess.scala b/internal/process/src/test/scala/TestedProcess.scala similarity index 100% rename from util/process/src/test/scala/TestedProcess.scala rename to internal/process/src/test/scala/TestedProcess.scala diff --git a/util/appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala b/internal/util-appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala similarity index 100% rename from util/appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala rename to internal/util-appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala diff --git a/util/appmacro/src/main/scala/sbt/appmacro/Convert.scala b/internal/util-appmacro/src/main/scala/sbt/appmacro/Convert.scala similarity index 100% rename from util/appmacro/src/main/scala/sbt/appmacro/Convert.scala rename to internal/util-appmacro/src/main/scala/sbt/appmacro/Convert.scala diff --git a/util/appmacro/src/main/scala/sbt/appmacro/Instance.scala b/internal/util-appmacro/src/main/scala/sbt/appmacro/Instance.scala similarity index 100% rename from util/appmacro/src/main/scala/sbt/appmacro/Instance.scala rename to internal/util-appmacro/src/main/scala/sbt/appmacro/Instance.scala diff --git a/util/appmacro/src/main/scala/sbt/appmacro/KListBuilder.scala b/internal/util-appmacro/src/main/scala/sbt/appmacro/KListBuilder.scala similarity index 100% rename from util/appmacro/src/main/scala/sbt/appmacro/KListBuilder.scala rename to internal/util-appmacro/src/main/scala/sbt/appmacro/KListBuilder.scala diff --git a/util/appmacro/src/main/scala/sbt/appmacro/MixedBuilder.scala b/internal/util-appmacro/src/main/scala/sbt/appmacro/MixedBuilder.scala similarity index 100% rename from util/appmacro/src/main/scala/sbt/appmacro/MixedBuilder.scala rename to internal/util-appmacro/src/main/scala/sbt/appmacro/MixedBuilder.scala diff --git a/util/appmacro/src/main/scala/sbt/appmacro/TupleBuilder.scala b/internal/util-appmacro/src/main/scala/sbt/appmacro/TupleBuilder.scala similarity index 100% rename from util/appmacro/src/main/scala/sbt/appmacro/TupleBuilder.scala rename to internal/util-appmacro/src/main/scala/sbt/appmacro/TupleBuilder.scala diff --git a/util/appmacro/src/main/scala/sbt/appmacro/TupleNBuilder.scala b/internal/util-appmacro/src/main/scala/sbt/appmacro/TupleNBuilder.scala similarity index 100% rename from util/appmacro/src/main/scala/sbt/appmacro/TupleNBuilder.scala rename to internal/util-appmacro/src/main/scala/sbt/appmacro/TupleNBuilder.scala diff --git a/cache/NOTICE b/internal/util-cache/NOTICE similarity index 100% rename from cache/NOTICE rename to internal/util-cache/NOTICE diff --git a/cache/src/main/scala/sbt/Cache.scala b/internal/util-cache/src/main/scala/sbt/Cache.scala similarity index 100% rename from cache/src/main/scala/sbt/Cache.scala rename to internal/util-cache/src/main/scala/sbt/Cache.scala diff --git a/cache/src/main/scala/sbt/CacheIO.scala b/internal/util-cache/src/main/scala/sbt/CacheIO.scala similarity index 100% rename from cache/src/main/scala/sbt/CacheIO.scala rename to internal/util-cache/src/main/scala/sbt/CacheIO.scala diff --git a/cache/src/main/scala/sbt/FileInfo.scala b/internal/util-cache/src/main/scala/sbt/FileInfo.scala similarity index 100% rename from cache/src/main/scala/sbt/FileInfo.scala rename to internal/util-cache/src/main/scala/sbt/FileInfo.scala diff --git a/cache/src/main/scala/sbt/SeparatedCache.scala b/internal/util-cache/src/main/scala/sbt/SeparatedCache.scala similarity index 100% rename from cache/src/main/scala/sbt/SeparatedCache.scala rename to internal/util-cache/src/main/scala/sbt/SeparatedCache.scala diff --git a/cache/src/test/scala/CacheTest.scala b/internal/util-cache/src/test/scala/CacheTest.scala similarity index 100% rename from cache/src/test/scala/CacheTest.scala rename to internal/util-cache/src/test/scala/CacheTest.scala diff --git a/util/collection/NOTICE b/internal/util-collection/NOTICE similarity index 100% rename from util/collection/NOTICE rename to internal/util-collection/NOTICE diff --git a/util/collection/src/main/scala/sbt/AList.scala b/internal/util-collection/src/main/scala/sbt/AList.scala similarity index 100% rename from util/collection/src/main/scala/sbt/AList.scala rename to internal/util-collection/src/main/scala/sbt/AList.scala diff --git a/util/collection/src/main/scala/sbt/Attributes.scala b/internal/util-collection/src/main/scala/sbt/Attributes.scala similarity index 100% rename from util/collection/src/main/scala/sbt/Attributes.scala rename to internal/util-collection/src/main/scala/sbt/Attributes.scala diff --git a/util/collection/src/main/scala/sbt/Classes.scala b/internal/util-collection/src/main/scala/sbt/Classes.scala similarity index 100% rename from util/collection/src/main/scala/sbt/Classes.scala rename to internal/util-collection/src/main/scala/sbt/Classes.scala diff --git a/util/collection/src/main/scala/sbt/Dag.scala b/internal/util-collection/src/main/scala/sbt/Dag.scala similarity index 100% rename from util/collection/src/main/scala/sbt/Dag.scala rename to internal/util-collection/src/main/scala/sbt/Dag.scala diff --git a/util/collection/src/main/scala/sbt/HList.scala b/internal/util-collection/src/main/scala/sbt/HList.scala similarity index 100% rename from util/collection/src/main/scala/sbt/HList.scala rename to internal/util-collection/src/main/scala/sbt/HList.scala diff --git a/util/collection/src/main/scala/sbt/IDSet.scala b/internal/util-collection/src/main/scala/sbt/IDSet.scala similarity index 100% rename from util/collection/src/main/scala/sbt/IDSet.scala rename to internal/util-collection/src/main/scala/sbt/IDSet.scala diff --git a/util/collection/src/main/scala/sbt/INode.scala b/internal/util-collection/src/main/scala/sbt/INode.scala similarity index 100% rename from util/collection/src/main/scala/sbt/INode.scala rename to internal/util-collection/src/main/scala/sbt/INode.scala diff --git a/util/collection/src/main/scala/sbt/KList.scala b/internal/util-collection/src/main/scala/sbt/KList.scala similarity index 100% rename from util/collection/src/main/scala/sbt/KList.scala rename to internal/util-collection/src/main/scala/sbt/KList.scala diff --git a/util/collection/src/main/scala/sbt/PMap.scala b/internal/util-collection/src/main/scala/sbt/PMap.scala similarity index 100% rename from util/collection/src/main/scala/sbt/PMap.scala rename to internal/util-collection/src/main/scala/sbt/PMap.scala diff --git a/util/collection/src/main/scala/sbt/Param.scala b/internal/util-collection/src/main/scala/sbt/Param.scala similarity index 100% rename from util/collection/src/main/scala/sbt/Param.scala rename to internal/util-collection/src/main/scala/sbt/Param.scala diff --git a/util/collection/src/main/scala/sbt/Positions.scala b/internal/util-collection/src/main/scala/sbt/Positions.scala similarity index 100% rename from util/collection/src/main/scala/sbt/Positions.scala rename to internal/util-collection/src/main/scala/sbt/Positions.scala diff --git a/util/collection/src/main/scala/sbt/Settings.scala b/internal/util-collection/src/main/scala/sbt/Settings.scala similarity index 100% rename from util/collection/src/main/scala/sbt/Settings.scala rename to internal/util-collection/src/main/scala/sbt/Settings.scala diff --git a/util/collection/src/main/scala/sbt/Show.scala b/internal/util-collection/src/main/scala/sbt/Show.scala similarity index 100% rename from util/collection/src/main/scala/sbt/Show.scala rename to internal/util-collection/src/main/scala/sbt/Show.scala diff --git a/util/collection/src/main/scala/sbt/ShowLines.scala b/internal/util-collection/src/main/scala/sbt/ShowLines.scala similarity index 100% rename from util/collection/src/main/scala/sbt/ShowLines.scala rename to internal/util-collection/src/main/scala/sbt/ShowLines.scala diff --git a/util/collection/src/main/scala/sbt/Signal.scala b/internal/util-collection/src/main/scala/sbt/Signal.scala similarity index 100% rename from util/collection/src/main/scala/sbt/Signal.scala rename to internal/util-collection/src/main/scala/sbt/Signal.scala diff --git a/util/collection/src/main/scala/sbt/TypeFunctions.scala b/internal/util-collection/src/main/scala/sbt/TypeFunctions.scala similarity index 100% rename from util/collection/src/main/scala/sbt/TypeFunctions.scala rename to internal/util-collection/src/main/scala/sbt/TypeFunctions.scala diff --git a/util/collection/src/main/scala/sbt/Types.scala b/internal/util-collection/src/main/scala/sbt/Types.scala similarity index 100% rename from util/collection/src/main/scala/sbt/Types.scala rename to internal/util-collection/src/main/scala/sbt/Types.scala diff --git a/util/collection/src/main/scala/sbt/Util.scala b/internal/util-collection/src/main/scala/sbt/Util.scala similarity index 100% rename from util/collection/src/main/scala/sbt/Util.scala rename to internal/util-collection/src/main/scala/sbt/Util.scala diff --git a/util/collection/src/test/scala/DagSpecification.scala b/internal/util-collection/src/test/scala/DagSpecification.scala similarity index 100% rename from util/collection/src/test/scala/DagSpecification.scala rename to internal/util-collection/src/test/scala/DagSpecification.scala diff --git a/util/collection/src/test/scala/KeyTest.scala b/internal/util-collection/src/test/scala/KeyTest.scala similarity index 100% rename from util/collection/src/test/scala/KeyTest.scala rename to internal/util-collection/src/test/scala/KeyTest.scala diff --git a/util/collection/src/test/scala/LiteralTest.scala b/internal/util-collection/src/test/scala/LiteralTest.scala similarity index 100% rename from util/collection/src/test/scala/LiteralTest.scala rename to internal/util-collection/src/test/scala/LiteralTest.scala diff --git a/util/collection/src/test/scala/PMapTest.scala b/internal/util-collection/src/test/scala/PMapTest.scala similarity index 100% rename from util/collection/src/test/scala/PMapTest.scala rename to internal/util-collection/src/test/scala/PMapTest.scala diff --git a/util/collection/src/test/scala/SettingsExample.scala b/internal/util-collection/src/test/scala/SettingsExample.scala similarity index 100% rename from util/collection/src/test/scala/SettingsExample.scala rename to internal/util-collection/src/test/scala/SettingsExample.scala diff --git a/util/collection/src/test/scala/SettingsTest.scala b/internal/util-collection/src/test/scala/SettingsTest.scala similarity index 100% rename from util/collection/src/test/scala/SettingsTest.scala rename to internal/util-collection/src/test/scala/SettingsTest.scala diff --git a/util/complete/NOTICE b/internal/util-complete/NOTICE similarity index 100% rename from util/complete/NOTICE rename to internal/util-complete/NOTICE diff --git a/util/complete/src/main/scala/sbt/LineReader.scala b/internal/util-complete/src/main/scala/sbt/LineReader.scala similarity index 100% rename from util/complete/src/main/scala/sbt/LineReader.scala rename to internal/util-complete/src/main/scala/sbt/LineReader.scala diff --git a/util/complete/src/main/scala/sbt/complete/Completions.scala b/internal/util-complete/src/main/scala/sbt/complete/Completions.scala similarity index 100% rename from util/complete/src/main/scala/sbt/complete/Completions.scala rename to internal/util-complete/src/main/scala/sbt/complete/Completions.scala diff --git a/util/complete/src/main/scala/sbt/complete/EditDistance.scala b/internal/util-complete/src/main/scala/sbt/complete/EditDistance.scala similarity index 100% rename from util/complete/src/main/scala/sbt/complete/EditDistance.scala rename to internal/util-complete/src/main/scala/sbt/complete/EditDistance.scala diff --git a/util/complete/src/main/scala/sbt/complete/ExampleSource.scala b/internal/util-complete/src/main/scala/sbt/complete/ExampleSource.scala similarity index 100% rename from util/complete/src/main/scala/sbt/complete/ExampleSource.scala rename to internal/util-complete/src/main/scala/sbt/complete/ExampleSource.scala diff --git a/util/complete/src/main/scala/sbt/complete/History.scala b/internal/util-complete/src/main/scala/sbt/complete/History.scala similarity index 100% rename from util/complete/src/main/scala/sbt/complete/History.scala rename to internal/util-complete/src/main/scala/sbt/complete/History.scala diff --git a/util/complete/src/main/scala/sbt/complete/HistoryCommands.scala b/internal/util-complete/src/main/scala/sbt/complete/HistoryCommands.scala similarity index 100% rename from util/complete/src/main/scala/sbt/complete/HistoryCommands.scala rename to internal/util-complete/src/main/scala/sbt/complete/HistoryCommands.scala diff --git a/util/complete/src/main/scala/sbt/complete/JLineCompletion.scala b/internal/util-complete/src/main/scala/sbt/complete/JLineCompletion.scala similarity index 100% rename from util/complete/src/main/scala/sbt/complete/JLineCompletion.scala rename to internal/util-complete/src/main/scala/sbt/complete/JLineCompletion.scala diff --git a/util/complete/src/main/scala/sbt/complete/Parser.scala b/internal/util-complete/src/main/scala/sbt/complete/Parser.scala similarity index 100% rename from util/complete/src/main/scala/sbt/complete/Parser.scala rename to internal/util-complete/src/main/scala/sbt/complete/Parser.scala diff --git a/util/complete/src/main/scala/sbt/complete/Parsers.scala b/internal/util-complete/src/main/scala/sbt/complete/Parsers.scala similarity index 100% rename from util/complete/src/main/scala/sbt/complete/Parsers.scala rename to internal/util-complete/src/main/scala/sbt/complete/Parsers.scala diff --git a/util/complete/src/main/scala/sbt/complete/ProcessError.scala b/internal/util-complete/src/main/scala/sbt/complete/ProcessError.scala similarity index 100% rename from util/complete/src/main/scala/sbt/complete/ProcessError.scala rename to internal/util-complete/src/main/scala/sbt/complete/ProcessError.scala diff --git a/util/complete/src/main/scala/sbt/complete/TokenCompletions.scala b/internal/util-complete/src/main/scala/sbt/complete/TokenCompletions.scala similarity index 100% rename from util/complete/src/main/scala/sbt/complete/TokenCompletions.scala rename to internal/util-complete/src/main/scala/sbt/complete/TokenCompletions.scala diff --git a/util/complete/src/main/scala/sbt/complete/TypeString.scala b/internal/util-complete/src/main/scala/sbt/complete/TypeString.scala similarity index 100% rename from util/complete/src/main/scala/sbt/complete/TypeString.scala rename to internal/util-complete/src/main/scala/sbt/complete/TypeString.scala diff --git a/util/complete/src/main/scala/sbt/complete/UpperBound.scala b/internal/util-complete/src/main/scala/sbt/complete/UpperBound.scala similarity index 100% rename from util/complete/src/main/scala/sbt/complete/UpperBound.scala rename to internal/util-complete/src/main/scala/sbt/complete/UpperBound.scala diff --git a/util/complete/src/test/scala/ParserTest.scala b/internal/util-complete/src/test/scala/ParserTest.scala similarity index 100% rename from util/complete/src/test/scala/ParserTest.scala rename to internal/util-complete/src/test/scala/ParserTest.scala diff --git a/util/complete/src/test/scala/sbt/complete/FileExamplesTest.scala b/internal/util-complete/src/test/scala/sbt/complete/FileExamplesTest.scala similarity index 100% rename from util/complete/src/test/scala/sbt/complete/FileExamplesTest.scala rename to internal/util-complete/src/test/scala/sbt/complete/FileExamplesTest.scala diff --git a/util/complete/src/test/scala/sbt/complete/FixedSetExamplesTest.scala b/internal/util-complete/src/test/scala/sbt/complete/FixedSetExamplesTest.scala similarity index 100% rename from util/complete/src/test/scala/sbt/complete/FixedSetExamplesTest.scala rename to internal/util-complete/src/test/scala/sbt/complete/FixedSetExamplesTest.scala diff --git a/util/complete/src/test/scala/sbt/complete/ParserWithExamplesTest.scala b/internal/util-complete/src/test/scala/sbt/complete/ParserWithExamplesTest.scala similarity index 100% rename from util/complete/src/test/scala/sbt/complete/ParserWithExamplesTest.scala rename to internal/util-complete/src/test/scala/sbt/complete/ParserWithExamplesTest.scala diff --git a/util/control/NOTICE b/internal/util-control/NOTICE similarity index 100% rename from util/control/NOTICE rename to internal/util-control/NOTICE diff --git a/util/control/src/main/scala/sbt/ErrorHandling.scala b/internal/util-control/src/main/scala/sbt/ErrorHandling.scala similarity index 100% rename from util/control/src/main/scala/sbt/ErrorHandling.scala rename to internal/util-control/src/main/scala/sbt/ErrorHandling.scala diff --git a/util/control/src/main/scala/sbt/ExitHook.scala b/internal/util-control/src/main/scala/sbt/ExitHook.scala similarity index 100% rename from util/control/src/main/scala/sbt/ExitHook.scala rename to internal/util-control/src/main/scala/sbt/ExitHook.scala diff --git a/util/control/src/main/scala/sbt/MessageOnlyException.scala b/internal/util-control/src/main/scala/sbt/MessageOnlyException.scala similarity index 100% rename from util/control/src/main/scala/sbt/MessageOnlyException.scala rename to internal/util-control/src/main/scala/sbt/MessageOnlyException.scala diff --git a/interface/src/main/java/xsbti/F0.java b/internal/util-interface/src/main/java/xsbti/F0.java similarity index 100% rename from interface/src/main/java/xsbti/F0.java rename to internal/util-interface/src/main/java/xsbti/F0.java diff --git a/interface/src/main/java/xsbti/Logger.java b/internal/util-interface/src/main/java/xsbti/Logger.java similarity index 100% rename from interface/src/main/java/xsbti/Logger.java rename to internal/util-interface/src/main/java/xsbti/Logger.java diff --git a/interface/src/main/java/xsbti/Maybe.java b/internal/util-interface/src/main/java/xsbti/Maybe.java similarity index 100% rename from interface/src/main/java/xsbti/Maybe.java rename to internal/util-interface/src/main/java/xsbti/Maybe.java diff --git a/interface/src/main/java/xsbti/Position.java b/internal/util-interface/src/main/java/xsbti/Position.java similarity index 100% rename from interface/src/main/java/xsbti/Position.java rename to internal/util-interface/src/main/java/xsbti/Position.java diff --git a/interface/src/main/java/xsbti/Problem.java b/internal/util-interface/src/main/java/xsbti/Problem.java similarity index 100% rename from interface/src/main/java/xsbti/Problem.java rename to internal/util-interface/src/main/java/xsbti/Problem.java diff --git a/interface/src/main/java/xsbti/Severity.java b/internal/util-interface/src/main/java/xsbti/Severity.java similarity index 100% rename from interface/src/main/java/xsbti/Severity.java rename to internal/util-interface/src/main/java/xsbti/Severity.java diff --git a/util/log/NOTICE b/internal/util-logging/NOTICE similarity index 100% rename from util/log/NOTICE rename to internal/util-logging/NOTICE diff --git a/util/log/src/main/scala/sbt/BasicLogger.scala b/internal/util-logging/src/main/scala/sbt/BasicLogger.scala similarity index 100% rename from util/log/src/main/scala/sbt/BasicLogger.scala rename to internal/util-logging/src/main/scala/sbt/BasicLogger.scala diff --git a/util/log/src/main/scala/sbt/BufferedLogger.scala b/internal/util-logging/src/main/scala/sbt/BufferedLogger.scala similarity index 100% rename from util/log/src/main/scala/sbt/BufferedLogger.scala rename to internal/util-logging/src/main/scala/sbt/BufferedLogger.scala diff --git a/util/log/src/main/scala/sbt/ConsoleLogger.scala b/internal/util-logging/src/main/scala/sbt/ConsoleLogger.scala similarity index 100% rename from util/log/src/main/scala/sbt/ConsoleLogger.scala rename to internal/util-logging/src/main/scala/sbt/ConsoleLogger.scala diff --git a/util/log/src/main/scala/sbt/ConsoleOut.scala b/internal/util-logging/src/main/scala/sbt/ConsoleOut.scala similarity index 100% rename from util/log/src/main/scala/sbt/ConsoleOut.scala rename to internal/util-logging/src/main/scala/sbt/ConsoleOut.scala diff --git a/util/log/src/main/scala/sbt/FilterLogger.scala b/internal/util-logging/src/main/scala/sbt/FilterLogger.scala similarity index 100% rename from util/log/src/main/scala/sbt/FilterLogger.scala rename to internal/util-logging/src/main/scala/sbt/FilterLogger.scala diff --git a/util/log/src/main/scala/sbt/FullLogger.scala b/internal/util-logging/src/main/scala/sbt/FullLogger.scala similarity index 100% rename from util/log/src/main/scala/sbt/FullLogger.scala rename to internal/util-logging/src/main/scala/sbt/FullLogger.scala diff --git a/util/log/src/main/scala/sbt/GlobalLogging.scala b/internal/util-logging/src/main/scala/sbt/GlobalLogging.scala similarity index 100% rename from util/log/src/main/scala/sbt/GlobalLogging.scala rename to internal/util-logging/src/main/scala/sbt/GlobalLogging.scala diff --git a/util/log/src/main/scala/sbt/Level.scala b/internal/util-logging/src/main/scala/sbt/Level.scala similarity index 100% rename from util/log/src/main/scala/sbt/Level.scala rename to internal/util-logging/src/main/scala/sbt/Level.scala diff --git a/util/log/src/main/scala/sbt/LogEvent.scala b/internal/util-logging/src/main/scala/sbt/LogEvent.scala similarity index 100% rename from util/log/src/main/scala/sbt/LogEvent.scala rename to internal/util-logging/src/main/scala/sbt/LogEvent.scala diff --git a/util/log/src/main/scala/sbt/Logger.scala b/internal/util-logging/src/main/scala/sbt/Logger.scala similarity index 100% rename from util/log/src/main/scala/sbt/Logger.scala rename to internal/util-logging/src/main/scala/sbt/Logger.scala diff --git a/util/log/src/main/scala/sbt/LoggerWriter.scala b/internal/util-logging/src/main/scala/sbt/LoggerWriter.scala similarity index 100% rename from util/log/src/main/scala/sbt/LoggerWriter.scala rename to internal/util-logging/src/main/scala/sbt/LoggerWriter.scala diff --git a/util/log/src/main/scala/sbt/MainLogging.scala b/internal/util-logging/src/main/scala/sbt/MainLogging.scala similarity index 100% rename from util/log/src/main/scala/sbt/MainLogging.scala rename to internal/util-logging/src/main/scala/sbt/MainLogging.scala diff --git a/util/log/src/main/scala/sbt/MultiLogger.scala b/internal/util-logging/src/main/scala/sbt/MultiLogger.scala similarity index 100% rename from util/log/src/main/scala/sbt/MultiLogger.scala rename to internal/util-logging/src/main/scala/sbt/MultiLogger.scala diff --git a/util/log/src/main/scala/sbt/StackTrace.scala b/internal/util-logging/src/main/scala/sbt/StackTrace.scala similarity index 100% rename from util/log/src/main/scala/sbt/StackTrace.scala rename to internal/util-logging/src/main/scala/sbt/StackTrace.scala diff --git a/util/log/src/test/scala/Escapes.scala b/internal/util-logging/src/test/scala/Escapes.scala similarity index 100% rename from util/log/src/test/scala/Escapes.scala rename to internal/util-logging/src/test/scala/Escapes.scala diff --git a/util/log/src/test/scala/LogWriterTest.scala b/internal/util-logging/src/test/scala/LogWriterTest.scala similarity index 100% rename from util/log/src/test/scala/LogWriterTest.scala rename to internal/util-logging/src/test/scala/LogWriterTest.scala diff --git a/util/log/src/test/scala/TestLogger.scala b/internal/util-logging/src/test/scala/TestLogger.scala similarity index 100% rename from util/log/src/test/scala/TestLogger.scala rename to internal/util-logging/src/test/scala/TestLogger.scala diff --git a/util/logic/src/main/scala/sbt/logic/Logic.scala b/internal/util-logic/src/main/scala/sbt/logic/Logic.scala similarity index 100% rename from util/logic/src/main/scala/sbt/logic/Logic.scala rename to internal/util-logic/src/main/scala/sbt/logic/Logic.scala diff --git a/util/logic/src/test/scala/sbt/logic/Test.scala b/internal/util-logic/src/test/scala/sbt/logic/Test.scala similarity index 100% rename from util/logic/src/test/scala/sbt/logic/Test.scala rename to internal/util-logic/src/test/scala/sbt/logic/Test.scala diff --git a/util/relation/src/main/scala/sbt/Relation.scala b/internal/util-relation/src/main/scala/sbt/Relation.scala similarity index 100% rename from util/relation/src/main/scala/sbt/Relation.scala rename to internal/util-relation/src/main/scala/sbt/Relation.scala diff --git a/util/relation/src/test/scala/RelationTest.scala b/internal/util-relation/src/test/scala/RelationTest.scala similarity index 100% rename from util/relation/src/test/scala/RelationTest.scala rename to internal/util-relation/src/test/scala/RelationTest.scala diff --git a/cache/tracking/NOTICE b/internal/util-tracking/NOTICE similarity index 100% rename from cache/tracking/NOTICE rename to internal/util-tracking/NOTICE diff --git a/cache/tracking/src/main/scala/sbt/ChangeReport.scala b/internal/util-tracking/src/main/scala/sbt/ChangeReport.scala similarity index 100% rename from cache/tracking/src/main/scala/sbt/ChangeReport.scala rename to internal/util-tracking/src/main/scala/sbt/ChangeReport.scala diff --git a/cache/tracking/src/main/scala/sbt/Tracked.scala b/internal/util-tracking/src/main/scala/sbt/Tracked.scala similarity index 100% rename from cache/tracking/src/main/scala/sbt/Tracked.scala rename to internal/util-tracking/src/main/scala/sbt/Tracked.scala