Merge pull request #5338 from eed3si9n/wip/aggregate

add aggregate projects for lower utils and upper modules
This commit is contained in:
eugene yokota 2019-12-27 01:45:28 -05:00 committed by GitHub
commit 9400225fe9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 4 deletions

View File

@ -1024,6 +1024,21 @@ lazy val sbtBig = (project in file(".big"))
)
*/
// util projects used by Zinc and Lm
lazy val lowerUtils = (project in (file("internal") / "lower"))
.aggregate(lowerUtilProjects.map(p => LocalProject(p.id)): _*)
.settings(
publish / skip := true,
crossScalaVersions := Nil,
)
lazy val upperModules = (project in (file("internal") / "upper"))
.aggregate((allProjects diff lowerUtilProjects).map(p => LocalProject(p.id)): _*)
.settings(
publish / skip := true,
crossScalaVersions := Nil,
)
lazy val sbtIgnoredProblems = {
Vector(
exclude[IncompatibleSignatureProblem]("sbt.package.some"),
@ -1159,7 +1174,11 @@ def allProjects =
mainProj,
sbtProj,
bundledLauncherProj,
coreMacrosProj,
coreMacrosProj
) ++ lowerUtilProjects
lazy val lowerUtilProjects =
Seq(
utilCache,
utilControl,
utilInterface,
@ -1167,7 +1186,7 @@ def allProjects =
utilPosition,
utilRelation,
utilScripted,
utilTracking,
utilTracking
)
lazy val nonRoots = allProjects.map(p => LocalProject(p.id))
@ -1207,7 +1226,9 @@ lazy val docProjects: ScopeFilter = ScopeFilter(
sbtProj,
scriptedSbtReduxProj,
scriptedSbtOldProj,
scriptedPluginProj
scriptedPluginProj,
upperModules,
lowerUtils,
),
inConfigurations(Compile)
)

View File

@ -1,7 +1,7 @@
scalacOptions ++= Seq("-feature", "-language:postfixOps", "-Ywarn-unused:_,-imports")
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0")
addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.5")
addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.6")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.2.1")
addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.4.4")