Merge pull request #1946 from dwijnand/rename-root-project-to-sbtRoot

Rename root project to sbtRoot.
This commit is contained in:
eugene yokota 2015-04-07 14:50:27 -07:00
commit 6b89a134e7
1 changed files with 2 additions and 2 deletions

View File

@ -39,7 +39,7 @@ def baseSettings: Seq[Setting[_]] =
def testedBaseSettings: Seq[Setting[_]] =
baseSettings ++ testDependencies
lazy val root: Project = (project in file(".")).
lazy val sbtRoot: Project = (project in file(".")).
configs(Sxr.sxrConf).
aggregate(nonRoots: _*).
settings(
@ -501,7 +501,7 @@ def otherRootSettings = Seq(
}
))
lazy val docProjects: ScopeFilter = ScopeFilter(
inAnyProject -- inProjects(root, sbtProj, scriptedBaseProj, scriptedSbtProj, scriptedPluginProj, precompiled282, precompiled292, precompiled293, mavenResolverPluginProj),
inAnyProject -- inProjects(sbtRoot, sbtProj, scriptedBaseProj, scriptedSbtProj, scriptedPluginProj, precompiled282, precompiled292, precompiled293, mavenResolverPluginProj),
inConfigurations(Compile)
)
def fullDocSettings = Util.baseScalacOptions ++ Docs.settings ++ Sxr.settings ++ Seq(