From 80aeb7eed95871068c5d6d6b11f6075915eceaea Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Fri, 27 Dec 2019 00:24:03 -0500
Subject: [PATCH] add aggregate project for lower utils and upper modules

---
 build.sbt           | 27 ++++++++++++++++++++++++---
 project/plugins.sbt |  2 +-
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/build.sbt b/build.sbt
index 8bbff6876..b7bde8af5 100644
--- a/build.sbt
+++ b/build.sbt
@@ -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)
 )
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 01c64e095..31d988b2d 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -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")