From ee272d780ec65466c927d85d27021e216c93950e Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 6 May 2016 16:01:49 -0400 Subject: [PATCH] Reorganize directory structure --- build.sbt | 18 ++++------- .../src/main/scala/sbt/CacheIvy.scala | 0 .../src/main/scala/sbt/Compiler.scala | 0 .../src/main/scala/sbt/Console.scala | 0 .../src/main/scala/sbt/Doc.scala | 0 .../src/main/scala/sbt/DotGraph.scala | 0 .../src/main/scala/sbt/ForkTests.scala | 0 .../src/main/scala/sbt/Package.scala | 0 .../src/main/scala/sbt/RawCompileLike.scala | 0 .../src/main/scala/sbt/Sync.scala | 0 .../src/main/scala/sbt/TestResultLogger.scala | 0 .../src/main/scala/sbt/Tests.scala | 0 .../src/main/scala/sbt/compiler/Eval.scala | 0 .../src/test/scala/sbt/CacheIvyTest.scala | 0 .../test/scala/sbt/compiler/EvalTest.scala | 0 .../main/scala/sbt/BasicCommandStrings.scala | 0 .../src/main/scala/sbt/BasicCommands.scala | 0 .../src/main/scala/sbt/BasicKeys.scala | 0 .../src/main/scala/sbt/Command.scala | 0 .../src/main/scala/sbt/CommandUtil.scala | 0 .../main/scala/sbt/ExceptionCategory.scala | 0 .../src/main/scala/sbt/Highlight.scala | 0 .../src/main/scala/sbt/MainControl.scala | 0 .../src/main/scala/sbt/MainLoop.scala | 0 .../src/main/scala/sbt/State.scala | 0 .../src/main/scala/sbt/Watched.scala | 0 .../src/main/scala/xsbt/IPC.scala | 0 .../src/main/scala/sbt/Append.scala | 0 .../src/main/scala/sbt/ConfigKey.scala | 0 .../src/main/scala/sbt/Def.scala | 0 .../src/main/scala/sbt/DelegateIndex.scala | 0 .../src/main/scala/sbt/InputTask.scala | 0 .../src/main/scala/sbt/KeyRanks.scala | 0 .../src/main/scala/sbt/Previous.scala | 0 .../src/main/scala/sbt/Reference.scala | 0 .../src/main/scala/sbt/Remove.scala | 0 .../src/main/scala/sbt/Scope.scala | 0 .../src/main/scala/sbt/ScopeAxis.scala | 0 .../src/main/scala/sbt/ScopeMask.scala | 0 .../src/main/scala/sbt/Structure.scala | 0 .../src/main/scala/sbt/std/InputConvert.scala | 0 .../src/main/scala/sbt/std/InputWrapper.scala | 0 .../src/main/scala/sbt/std/KeyMacro.scala | 0 .../src/main/scala/sbt/std/SettingMacro.scala | 0 .../src/main/scala/sbt/std/TaskMacro.scala | 0 .../src/test/scala/ScopedKeySpec.scala | 0 .../src/test/scala/UsageTest.scala | 0 {sbt/notes => notes}/0.10.0.markdown | 0 {sbt/notes => notes}/0.10.1.markdown | 0 {sbt/notes => notes}/0.11.0.markdown | 0 {sbt/notes => notes}/0.11.3.markdown | 0 notes/0.13.10/internal-tracking.md | 32 ------------------- sbt/notes/about.markdown | 1 - {tasks/standard => tasks-standard}/NOTICE | 0 .../src/main/scala/sbt/Action.scala | 0 .../src/main/scala/sbt/std/Streams.scala | 0 .../src/main/scala/sbt/std/System.scala | 0 .../src/main/scala/sbt/std/TaskExtra.scala | 0 .../src/test/scala/Execute.scala | 0 .../src/test/scala/TaskGen.scala | 0 .../src/test/scala/TaskRunnerCircular.scala | 0 .../src/test/scala/TaskRunnerFork.scala | 0 .../src/test/scala/TaskSerial.scala | 0 .../src/test/scala/Test.scala | 0 .../src/test/scala/TestRunnerCall.scala | 0 .../src/test/scala/TestRunnerSort.scala | 0 .../src/test/scala/checkResult.scala | 0 67 files changed, 7 insertions(+), 44 deletions(-) rename {main/actions => main-actions}/src/main/scala/sbt/CacheIvy.scala (100%) rename {main/actions => main-actions}/src/main/scala/sbt/Compiler.scala (100%) rename {main/actions => main-actions}/src/main/scala/sbt/Console.scala (100%) rename {main/actions => main-actions}/src/main/scala/sbt/Doc.scala (100%) rename {main/actions => main-actions}/src/main/scala/sbt/DotGraph.scala (100%) rename {main/actions => main-actions}/src/main/scala/sbt/ForkTests.scala (100%) rename {main/actions => main-actions}/src/main/scala/sbt/Package.scala (100%) rename {main/actions => main-actions}/src/main/scala/sbt/RawCompileLike.scala (100%) rename {main/actions => main-actions}/src/main/scala/sbt/Sync.scala (100%) rename {main/actions => main-actions}/src/main/scala/sbt/TestResultLogger.scala (100%) rename {main/actions => main-actions}/src/main/scala/sbt/Tests.scala (100%) rename {main/actions => main-actions}/src/main/scala/sbt/compiler/Eval.scala (100%) rename {main/actions => main-actions}/src/test/scala/sbt/CacheIvyTest.scala (100%) rename {main/actions => main-actions}/src/test/scala/sbt/compiler/EvalTest.scala (100%) rename {main/command => main-command}/src/main/scala/sbt/BasicCommandStrings.scala (100%) rename {main/command => main-command}/src/main/scala/sbt/BasicCommands.scala (100%) rename {main/command => main-command}/src/main/scala/sbt/BasicKeys.scala (100%) rename {main/command => main-command}/src/main/scala/sbt/Command.scala (100%) rename {main/command => main-command}/src/main/scala/sbt/CommandUtil.scala (100%) rename {main/command => main-command}/src/main/scala/sbt/ExceptionCategory.scala (100%) rename {main/command => main-command}/src/main/scala/sbt/Highlight.scala (100%) rename {main/command => main-command}/src/main/scala/sbt/MainControl.scala (100%) rename {main/command => main-command}/src/main/scala/sbt/MainLoop.scala (100%) rename {main/command => main-command}/src/main/scala/sbt/State.scala (100%) rename {main/command => main-command}/src/main/scala/sbt/Watched.scala (100%) rename {main/command => main-command}/src/main/scala/xsbt/IPC.scala (100%) rename {main/settings => main-settings}/src/main/scala/sbt/Append.scala (100%) rename {main/settings => main-settings}/src/main/scala/sbt/ConfigKey.scala (100%) rename {main/settings => main-settings}/src/main/scala/sbt/Def.scala (100%) rename {main/settings => main-settings}/src/main/scala/sbt/DelegateIndex.scala (100%) rename {main/settings => main-settings}/src/main/scala/sbt/InputTask.scala (100%) rename {main/settings => main-settings}/src/main/scala/sbt/KeyRanks.scala (100%) rename {main/settings => main-settings}/src/main/scala/sbt/Previous.scala (100%) rename {main/settings => main-settings}/src/main/scala/sbt/Reference.scala (100%) rename {main/settings => main-settings}/src/main/scala/sbt/Remove.scala (100%) rename {main/settings => main-settings}/src/main/scala/sbt/Scope.scala (100%) rename {main/settings => main-settings}/src/main/scala/sbt/ScopeAxis.scala (100%) rename {main/settings => main-settings}/src/main/scala/sbt/ScopeMask.scala (100%) rename {main/settings => main-settings}/src/main/scala/sbt/Structure.scala (100%) rename {main/settings => main-settings}/src/main/scala/sbt/std/InputConvert.scala (100%) rename {main/settings => main-settings}/src/main/scala/sbt/std/InputWrapper.scala (100%) rename {main/settings => main-settings}/src/main/scala/sbt/std/KeyMacro.scala (100%) rename {main/settings => main-settings}/src/main/scala/sbt/std/SettingMacro.scala (100%) rename {main/settings => main-settings}/src/main/scala/sbt/std/TaskMacro.scala (100%) rename {main/settings => main-settings}/src/test/scala/ScopedKeySpec.scala (100%) rename {main/settings => main-settings}/src/test/scala/UsageTest.scala (100%) rename {sbt/notes => notes}/0.10.0.markdown (100%) rename {sbt/notes => notes}/0.10.1.markdown (100%) rename {sbt/notes => notes}/0.11.0.markdown (100%) rename {sbt/notes => notes}/0.11.3.markdown (100%) delete mode 100644 notes/0.13.10/internal-tracking.md delete mode 100644 sbt/notes/about.markdown rename {tasks/standard => tasks-standard}/NOTICE (100%) rename {tasks/standard => tasks-standard}/src/main/scala/sbt/Action.scala (100%) rename {tasks/standard => tasks-standard}/src/main/scala/sbt/std/Streams.scala (100%) rename {tasks/standard => tasks-standard}/src/main/scala/sbt/std/System.scala (100%) rename {tasks/standard => tasks-standard}/src/main/scala/sbt/std/TaskExtra.scala (100%) rename {tasks/standard => tasks-standard}/src/test/scala/Execute.scala (100%) rename {tasks/standard => tasks-standard}/src/test/scala/TaskGen.scala (100%) rename {tasks/standard => tasks-standard}/src/test/scala/TaskRunnerCircular.scala (100%) rename {tasks/standard => tasks-standard}/src/test/scala/TaskRunnerFork.scala (100%) rename {tasks/standard => tasks-standard}/src/test/scala/TaskSerial.scala (100%) rename {tasks/standard => tasks-standard}/src/test/scala/Test.scala (100%) rename {tasks/standard => tasks-standard}/src/test/scala/TestRunnerCall.scala (100%) rename {tasks/standard => tasks-standard}/src/test/scala/TestRunnerSort.scala (100%) rename {tasks/standard => tasks-standard}/src/test/scala/checkResult.scala (100%) diff --git a/build.sbt b/build.sbt index 55266ed69..36379001b 100644 --- a/build.sbt +++ b/build.sbt @@ -109,7 +109,7 @@ lazy val testAgentProj = (project in file("testing") / "agent"). ) // Basic task engine -lazy val taskProj = (project in tasksPath). +lazy val taskProj = (project in file("tasks")). settings( testedBaseSettings, name := "Tasks", @@ -117,7 +117,7 @@ lazy val taskProj = (project in tasksPath). ) // Standard task system. This provides map, flatMap, join, and more on top of the basic task model. -lazy val stdTaskProj = (project in tasksPath / "standard"). +lazy val stdTaskProj = (project in file("tasks-standard")). dependsOn (taskProj % "compile;test->test"). settings( testedBaseSettings, @@ -153,7 +153,7 @@ lazy val scriptedPluginProj = (project in scriptedPath / "plugin"). ) // Implementation and support code for defining actions. -lazy val actionsProj = (project in mainPath / "actions"). +lazy val actionsProj = (project in file("main-actions")). dependsOn(runProj, stdTaskProj, taskProj, testingProj). settings( testedBaseSettings, @@ -164,7 +164,7 @@ lazy val actionsProj = (project in mainPath / "actions"). ) // General command support and core commands not specific to a build system -lazy val commandProj = (project in mainPath / "command"). +lazy val commandProj = (project in file("main-command")). settings( testedBaseSettings, name := "Command", @@ -173,7 +173,7 @@ lazy val commandProj = (project in mainPath / "command"). ) // Fixes scope=Scope for Setting (core defined in collectionProj) to define the settings system used in build definitions -lazy val mainSettingsProj = (project in mainPath / "settings"). +lazy val mainSettingsProj = (project in file("main-settings")). dependsOn(commandProj, stdTaskProj). settings( testedBaseSettings, @@ -183,7 +183,7 @@ lazy val mainSettingsProj = (project in mainPath / "settings"). ) // The main integration project for sbt. It brings all of the Projsystems together, configures them, and provides for overriding conventions. -lazy val mainProj = (project in mainPath). +lazy val mainProj = (project in file("main")). dependsOn(actionsProj, mainSettingsProj, runProj, commandProj). settings( testedBaseSettings, @@ -195,7 +195,7 @@ lazy val mainProj = (project in mainPath). // Strictly for bringing implicits and aliases from subsystems into the top-level sbt namespace through a single package object // technically, we need a dependency on all of mainProj's dependencies, but we don't do that since this is strictly an integration project // with the sole purpose of providing certain identifiers without qualification (with a package object) -lazy val sbtProj = (project in sbtPath). +lazy val sbtProj = (project in file("sbt")). dependsOn(mainProj, scriptedSbtProj % "test->test"). settings( baseSettings, @@ -298,10 +298,6 @@ def fullDocSettings = Util.baseScalacOptions ++ Docs.settings ++ Sxr.settings ++ ) /* Nested Projproject paths */ -def sbtPath = file("sbt") -def tasksPath = file("tasks") -def launchPath = file("launch") -def mainPath = file("main") lazy val safeUnitTests = taskKey[Unit]("Known working tests (for both 2.10 and 2.11)") lazy val safeProjects: ScopeFilter = ScopeFilter( diff --git a/main/actions/src/main/scala/sbt/CacheIvy.scala b/main-actions/src/main/scala/sbt/CacheIvy.scala similarity index 100% rename from main/actions/src/main/scala/sbt/CacheIvy.scala rename to main-actions/src/main/scala/sbt/CacheIvy.scala diff --git a/main/actions/src/main/scala/sbt/Compiler.scala b/main-actions/src/main/scala/sbt/Compiler.scala similarity index 100% rename from main/actions/src/main/scala/sbt/Compiler.scala rename to main-actions/src/main/scala/sbt/Compiler.scala diff --git a/main/actions/src/main/scala/sbt/Console.scala b/main-actions/src/main/scala/sbt/Console.scala similarity index 100% rename from main/actions/src/main/scala/sbt/Console.scala rename to main-actions/src/main/scala/sbt/Console.scala diff --git a/main/actions/src/main/scala/sbt/Doc.scala b/main-actions/src/main/scala/sbt/Doc.scala similarity index 100% rename from main/actions/src/main/scala/sbt/Doc.scala rename to main-actions/src/main/scala/sbt/Doc.scala diff --git a/main/actions/src/main/scala/sbt/DotGraph.scala b/main-actions/src/main/scala/sbt/DotGraph.scala similarity index 100% rename from main/actions/src/main/scala/sbt/DotGraph.scala rename to main-actions/src/main/scala/sbt/DotGraph.scala diff --git a/main/actions/src/main/scala/sbt/ForkTests.scala b/main-actions/src/main/scala/sbt/ForkTests.scala similarity index 100% rename from main/actions/src/main/scala/sbt/ForkTests.scala rename to main-actions/src/main/scala/sbt/ForkTests.scala diff --git a/main/actions/src/main/scala/sbt/Package.scala b/main-actions/src/main/scala/sbt/Package.scala similarity index 100% rename from main/actions/src/main/scala/sbt/Package.scala rename to main-actions/src/main/scala/sbt/Package.scala diff --git a/main/actions/src/main/scala/sbt/RawCompileLike.scala b/main-actions/src/main/scala/sbt/RawCompileLike.scala similarity index 100% rename from main/actions/src/main/scala/sbt/RawCompileLike.scala rename to main-actions/src/main/scala/sbt/RawCompileLike.scala diff --git a/main/actions/src/main/scala/sbt/Sync.scala b/main-actions/src/main/scala/sbt/Sync.scala similarity index 100% rename from main/actions/src/main/scala/sbt/Sync.scala rename to main-actions/src/main/scala/sbt/Sync.scala diff --git a/main/actions/src/main/scala/sbt/TestResultLogger.scala b/main-actions/src/main/scala/sbt/TestResultLogger.scala similarity index 100% rename from main/actions/src/main/scala/sbt/TestResultLogger.scala rename to main-actions/src/main/scala/sbt/TestResultLogger.scala diff --git a/main/actions/src/main/scala/sbt/Tests.scala b/main-actions/src/main/scala/sbt/Tests.scala similarity index 100% rename from main/actions/src/main/scala/sbt/Tests.scala rename to main-actions/src/main/scala/sbt/Tests.scala diff --git a/main/actions/src/main/scala/sbt/compiler/Eval.scala b/main-actions/src/main/scala/sbt/compiler/Eval.scala similarity index 100% rename from main/actions/src/main/scala/sbt/compiler/Eval.scala rename to main-actions/src/main/scala/sbt/compiler/Eval.scala diff --git a/main/actions/src/test/scala/sbt/CacheIvyTest.scala b/main-actions/src/test/scala/sbt/CacheIvyTest.scala similarity index 100% rename from main/actions/src/test/scala/sbt/CacheIvyTest.scala rename to main-actions/src/test/scala/sbt/CacheIvyTest.scala diff --git a/main/actions/src/test/scala/sbt/compiler/EvalTest.scala b/main-actions/src/test/scala/sbt/compiler/EvalTest.scala similarity index 100% rename from main/actions/src/test/scala/sbt/compiler/EvalTest.scala rename to main-actions/src/test/scala/sbt/compiler/EvalTest.scala diff --git a/main/command/src/main/scala/sbt/BasicCommandStrings.scala b/main-command/src/main/scala/sbt/BasicCommandStrings.scala similarity index 100% rename from main/command/src/main/scala/sbt/BasicCommandStrings.scala rename to main-command/src/main/scala/sbt/BasicCommandStrings.scala diff --git a/main/command/src/main/scala/sbt/BasicCommands.scala b/main-command/src/main/scala/sbt/BasicCommands.scala similarity index 100% rename from main/command/src/main/scala/sbt/BasicCommands.scala rename to main-command/src/main/scala/sbt/BasicCommands.scala diff --git a/main/command/src/main/scala/sbt/BasicKeys.scala b/main-command/src/main/scala/sbt/BasicKeys.scala similarity index 100% rename from main/command/src/main/scala/sbt/BasicKeys.scala rename to main-command/src/main/scala/sbt/BasicKeys.scala diff --git a/main/command/src/main/scala/sbt/Command.scala b/main-command/src/main/scala/sbt/Command.scala similarity index 100% rename from main/command/src/main/scala/sbt/Command.scala rename to main-command/src/main/scala/sbt/Command.scala diff --git a/main/command/src/main/scala/sbt/CommandUtil.scala b/main-command/src/main/scala/sbt/CommandUtil.scala similarity index 100% rename from main/command/src/main/scala/sbt/CommandUtil.scala rename to main-command/src/main/scala/sbt/CommandUtil.scala diff --git a/main/command/src/main/scala/sbt/ExceptionCategory.scala b/main-command/src/main/scala/sbt/ExceptionCategory.scala similarity index 100% rename from main/command/src/main/scala/sbt/ExceptionCategory.scala rename to main-command/src/main/scala/sbt/ExceptionCategory.scala diff --git a/main/command/src/main/scala/sbt/Highlight.scala b/main-command/src/main/scala/sbt/Highlight.scala similarity index 100% rename from main/command/src/main/scala/sbt/Highlight.scala rename to main-command/src/main/scala/sbt/Highlight.scala diff --git a/main/command/src/main/scala/sbt/MainControl.scala b/main-command/src/main/scala/sbt/MainControl.scala similarity index 100% rename from main/command/src/main/scala/sbt/MainControl.scala rename to main-command/src/main/scala/sbt/MainControl.scala diff --git a/main/command/src/main/scala/sbt/MainLoop.scala b/main-command/src/main/scala/sbt/MainLoop.scala similarity index 100% rename from main/command/src/main/scala/sbt/MainLoop.scala rename to main-command/src/main/scala/sbt/MainLoop.scala diff --git a/main/command/src/main/scala/sbt/State.scala b/main-command/src/main/scala/sbt/State.scala similarity index 100% rename from main/command/src/main/scala/sbt/State.scala rename to main-command/src/main/scala/sbt/State.scala diff --git a/main/command/src/main/scala/sbt/Watched.scala b/main-command/src/main/scala/sbt/Watched.scala similarity index 100% rename from main/command/src/main/scala/sbt/Watched.scala rename to main-command/src/main/scala/sbt/Watched.scala diff --git a/main/command/src/main/scala/xsbt/IPC.scala b/main-command/src/main/scala/xsbt/IPC.scala similarity index 100% rename from main/command/src/main/scala/xsbt/IPC.scala rename to main-command/src/main/scala/xsbt/IPC.scala diff --git a/main/settings/src/main/scala/sbt/Append.scala b/main-settings/src/main/scala/sbt/Append.scala similarity index 100% rename from main/settings/src/main/scala/sbt/Append.scala rename to main-settings/src/main/scala/sbt/Append.scala diff --git a/main/settings/src/main/scala/sbt/ConfigKey.scala b/main-settings/src/main/scala/sbt/ConfigKey.scala similarity index 100% rename from main/settings/src/main/scala/sbt/ConfigKey.scala rename to main-settings/src/main/scala/sbt/ConfigKey.scala diff --git a/main/settings/src/main/scala/sbt/Def.scala b/main-settings/src/main/scala/sbt/Def.scala similarity index 100% rename from main/settings/src/main/scala/sbt/Def.scala rename to main-settings/src/main/scala/sbt/Def.scala diff --git a/main/settings/src/main/scala/sbt/DelegateIndex.scala b/main-settings/src/main/scala/sbt/DelegateIndex.scala similarity index 100% rename from main/settings/src/main/scala/sbt/DelegateIndex.scala rename to main-settings/src/main/scala/sbt/DelegateIndex.scala diff --git a/main/settings/src/main/scala/sbt/InputTask.scala b/main-settings/src/main/scala/sbt/InputTask.scala similarity index 100% rename from main/settings/src/main/scala/sbt/InputTask.scala rename to main-settings/src/main/scala/sbt/InputTask.scala diff --git a/main/settings/src/main/scala/sbt/KeyRanks.scala b/main-settings/src/main/scala/sbt/KeyRanks.scala similarity index 100% rename from main/settings/src/main/scala/sbt/KeyRanks.scala rename to main-settings/src/main/scala/sbt/KeyRanks.scala diff --git a/main/settings/src/main/scala/sbt/Previous.scala b/main-settings/src/main/scala/sbt/Previous.scala similarity index 100% rename from main/settings/src/main/scala/sbt/Previous.scala rename to main-settings/src/main/scala/sbt/Previous.scala diff --git a/main/settings/src/main/scala/sbt/Reference.scala b/main-settings/src/main/scala/sbt/Reference.scala similarity index 100% rename from main/settings/src/main/scala/sbt/Reference.scala rename to main-settings/src/main/scala/sbt/Reference.scala diff --git a/main/settings/src/main/scala/sbt/Remove.scala b/main-settings/src/main/scala/sbt/Remove.scala similarity index 100% rename from main/settings/src/main/scala/sbt/Remove.scala rename to main-settings/src/main/scala/sbt/Remove.scala diff --git a/main/settings/src/main/scala/sbt/Scope.scala b/main-settings/src/main/scala/sbt/Scope.scala similarity index 100% rename from main/settings/src/main/scala/sbt/Scope.scala rename to main-settings/src/main/scala/sbt/Scope.scala diff --git a/main/settings/src/main/scala/sbt/ScopeAxis.scala b/main-settings/src/main/scala/sbt/ScopeAxis.scala similarity index 100% rename from main/settings/src/main/scala/sbt/ScopeAxis.scala rename to main-settings/src/main/scala/sbt/ScopeAxis.scala diff --git a/main/settings/src/main/scala/sbt/ScopeMask.scala b/main-settings/src/main/scala/sbt/ScopeMask.scala similarity index 100% rename from main/settings/src/main/scala/sbt/ScopeMask.scala rename to main-settings/src/main/scala/sbt/ScopeMask.scala diff --git a/main/settings/src/main/scala/sbt/Structure.scala b/main-settings/src/main/scala/sbt/Structure.scala similarity index 100% rename from main/settings/src/main/scala/sbt/Structure.scala rename to main-settings/src/main/scala/sbt/Structure.scala diff --git a/main/settings/src/main/scala/sbt/std/InputConvert.scala b/main-settings/src/main/scala/sbt/std/InputConvert.scala similarity index 100% rename from main/settings/src/main/scala/sbt/std/InputConvert.scala rename to main-settings/src/main/scala/sbt/std/InputConvert.scala diff --git a/main/settings/src/main/scala/sbt/std/InputWrapper.scala b/main-settings/src/main/scala/sbt/std/InputWrapper.scala similarity index 100% rename from main/settings/src/main/scala/sbt/std/InputWrapper.scala rename to main-settings/src/main/scala/sbt/std/InputWrapper.scala diff --git a/main/settings/src/main/scala/sbt/std/KeyMacro.scala b/main-settings/src/main/scala/sbt/std/KeyMacro.scala similarity index 100% rename from main/settings/src/main/scala/sbt/std/KeyMacro.scala rename to main-settings/src/main/scala/sbt/std/KeyMacro.scala diff --git a/main/settings/src/main/scala/sbt/std/SettingMacro.scala b/main-settings/src/main/scala/sbt/std/SettingMacro.scala similarity index 100% rename from main/settings/src/main/scala/sbt/std/SettingMacro.scala rename to main-settings/src/main/scala/sbt/std/SettingMacro.scala diff --git a/main/settings/src/main/scala/sbt/std/TaskMacro.scala b/main-settings/src/main/scala/sbt/std/TaskMacro.scala similarity index 100% rename from main/settings/src/main/scala/sbt/std/TaskMacro.scala rename to main-settings/src/main/scala/sbt/std/TaskMacro.scala diff --git a/main/settings/src/test/scala/ScopedKeySpec.scala b/main-settings/src/test/scala/ScopedKeySpec.scala similarity index 100% rename from main/settings/src/test/scala/ScopedKeySpec.scala rename to main-settings/src/test/scala/ScopedKeySpec.scala diff --git a/main/settings/src/test/scala/UsageTest.scala b/main-settings/src/test/scala/UsageTest.scala similarity index 100% rename from main/settings/src/test/scala/UsageTest.scala rename to main-settings/src/test/scala/UsageTest.scala diff --git a/sbt/notes/0.10.0.markdown b/notes/0.10.0.markdown similarity index 100% rename from sbt/notes/0.10.0.markdown rename to notes/0.10.0.markdown diff --git a/sbt/notes/0.10.1.markdown b/notes/0.10.1.markdown similarity index 100% rename from sbt/notes/0.10.1.markdown rename to notes/0.10.1.markdown diff --git a/sbt/notes/0.11.0.markdown b/notes/0.11.0.markdown similarity index 100% rename from sbt/notes/0.11.0.markdown rename to notes/0.11.0.markdown diff --git a/sbt/notes/0.11.3.markdown b/notes/0.11.3.markdown similarity index 100% rename from sbt/notes/0.11.3.markdown rename to notes/0.11.3.markdown diff --git a/notes/0.13.10/internal-tracking.md b/notes/0.13.10/internal-tracking.md deleted file mode 100644 index eacdd2dec..000000000 --- a/notes/0.13.10/internal-tracking.md +++ /dev/null @@ -1,32 +0,0 @@ - - [@eed3si9n]: https://github.com/eed3si9n - [2266]: https://github.com/sbt/sbt/issues/2266 - [2354]: https://github.com/sbt/sbt/pull/2354 - -### Improvements - -- Adds `trackInternalDependencies` and `exportToInternal` keys. See below. - -### Inter-project dependency tracking - -sbt 0.13.10 adds `trackInternalDependencies` and `exportToInternal` settings. These can be used to control whether to trigger compilation of a dependent subprojects when you call `compile`. Both keys will take one of three values: `TrackLevel.NoTracking`, `TrackLevel.TrackIfMissing`, and `TrackLevel.TrackAlways`. By default they are both set to `TrackLevel.TrackAlways`. - -When `trackInternalDependencies` is set to `TrackLevel.TrackIfMissing`, sbt will no longer try to compile internal (inter-project) dependencies automatically, unless there are no `*.class` files (or JAR file when `exportJars` is `true`) in the output directory. When the setting is set to `TrackLevel.NoTracking`, the compilation of internal dependencies will be skipped. Note that the classpath will still be appended, and dependency graph will still show them as dependencies. The motivation is to save the I/O overhead of checking for the changes on a build with many subprojects during development. Here's how to set all subprojects to `TrackIfMissing`. - - lazy val root = (project in file(".")). - aggregate(....). - settings( - inThisBuild(Seq( - trackInternalDependencies := TrackLevel.TrackIfMissing, - exportJars := true - )) - ) - -The `exportToInternal` setting allows the dependee subprojects to opt out of the internal tracking, which might be useful if you want to track most subprojects except for a few. The intersection of the `trackInternalDependencies` and `exportToInternal` settings will be used to determine the actual track level. Here's an example to opt-out one project: - - lazy val dontTrackMe = (project in file("dontTrackMe")). - settings( - exportToInternal := TrackLevel.NoTracking - ) - -[#2266][2266]/[#2354][2354] by [@eed3si9n][@eed3si9n] diff --git a/sbt/notes/about.markdown b/sbt/notes/about.markdown deleted file mode 100644 index 29124d5ee..000000000 --- a/sbt/notes/about.markdown +++ /dev/null @@ -1 +0,0 @@ -[sbt](http://scala-sbt.org) is a Scala build tool. \ No newline at end of file diff --git a/tasks/standard/NOTICE b/tasks-standard/NOTICE similarity index 100% rename from tasks/standard/NOTICE rename to tasks-standard/NOTICE diff --git a/tasks/standard/src/main/scala/sbt/Action.scala b/tasks-standard/src/main/scala/sbt/Action.scala similarity index 100% rename from tasks/standard/src/main/scala/sbt/Action.scala rename to tasks-standard/src/main/scala/sbt/Action.scala diff --git a/tasks/standard/src/main/scala/sbt/std/Streams.scala b/tasks-standard/src/main/scala/sbt/std/Streams.scala similarity index 100% rename from tasks/standard/src/main/scala/sbt/std/Streams.scala rename to tasks-standard/src/main/scala/sbt/std/Streams.scala diff --git a/tasks/standard/src/main/scala/sbt/std/System.scala b/tasks-standard/src/main/scala/sbt/std/System.scala similarity index 100% rename from tasks/standard/src/main/scala/sbt/std/System.scala rename to tasks-standard/src/main/scala/sbt/std/System.scala diff --git a/tasks/standard/src/main/scala/sbt/std/TaskExtra.scala b/tasks-standard/src/main/scala/sbt/std/TaskExtra.scala similarity index 100% rename from tasks/standard/src/main/scala/sbt/std/TaskExtra.scala rename to tasks-standard/src/main/scala/sbt/std/TaskExtra.scala diff --git a/tasks/standard/src/test/scala/Execute.scala b/tasks-standard/src/test/scala/Execute.scala similarity index 100% rename from tasks/standard/src/test/scala/Execute.scala rename to tasks-standard/src/test/scala/Execute.scala diff --git a/tasks/standard/src/test/scala/TaskGen.scala b/tasks-standard/src/test/scala/TaskGen.scala similarity index 100% rename from tasks/standard/src/test/scala/TaskGen.scala rename to tasks-standard/src/test/scala/TaskGen.scala diff --git a/tasks/standard/src/test/scala/TaskRunnerCircular.scala b/tasks-standard/src/test/scala/TaskRunnerCircular.scala similarity index 100% rename from tasks/standard/src/test/scala/TaskRunnerCircular.scala rename to tasks-standard/src/test/scala/TaskRunnerCircular.scala diff --git a/tasks/standard/src/test/scala/TaskRunnerFork.scala b/tasks-standard/src/test/scala/TaskRunnerFork.scala similarity index 100% rename from tasks/standard/src/test/scala/TaskRunnerFork.scala rename to tasks-standard/src/test/scala/TaskRunnerFork.scala diff --git a/tasks/standard/src/test/scala/TaskSerial.scala b/tasks-standard/src/test/scala/TaskSerial.scala similarity index 100% rename from tasks/standard/src/test/scala/TaskSerial.scala rename to tasks-standard/src/test/scala/TaskSerial.scala diff --git a/tasks/standard/src/test/scala/Test.scala b/tasks-standard/src/test/scala/Test.scala similarity index 100% rename from tasks/standard/src/test/scala/Test.scala rename to tasks-standard/src/test/scala/Test.scala diff --git a/tasks/standard/src/test/scala/TestRunnerCall.scala b/tasks-standard/src/test/scala/TestRunnerCall.scala similarity index 100% rename from tasks/standard/src/test/scala/TestRunnerCall.scala rename to tasks-standard/src/test/scala/TestRunnerCall.scala diff --git a/tasks/standard/src/test/scala/TestRunnerSort.scala b/tasks-standard/src/test/scala/TestRunnerSort.scala similarity index 100% rename from tasks/standard/src/test/scala/TestRunnerSort.scala rename to tasks-standard/src/test/scala/TestRunnerSort.scala diff --git a/tasks/standard/src/test/scala/checkResult.scala b/tasks-standard/src/test/scala/checkResult.scala similarity index 100% rename from tasks/standard/src/test/scala/checkResult.scala rename to tasks-standard/src/test/scala/checkResult.scala