Merge pull request #2682 from xuwei-k/aggregate

`aggregate` can now be used inside a .sbt file

main/src/main/scala/sbt/dsl/package.scala

@@ -5,7 +5,8 @@ import internals.{
   DslConfigs,
   DslEnablePlugins,
   DslDisablePlugins,
-  DslDependsOn
+  DslDependsOn,
+  DslAggregate
 }
 
 package object dsl {
@@ -13,4 +14,6 @@ package object dsl {
   def disablePlugins(ps: AutoPlugin*): DslEntry = DslDisablePlugins(ps)
   def configs(cs: Configuration*): DslEntry = DslConfigs(cs)
   def dependsOn(deps: ClasspathDep[ProjectReference]*): DslEntry = DslDependsOn(deps)
+  // avoid conflict with `sbt.Keys.aggregate`
+  def aggregateProjects(refs: ProjectReference*): DslEntry = DslAggregate(refs)
 }

main/src/main/scala/sbt/internals/DslAst.scala

@@ -62,3 +62,7 @@ case class DslConfigs(cs: Seq[Configuration]) extends ProjectManipulation {
 case class DslDependsOn(cs: Seq[ClasspathDep[ProjectReference]]) extends ProjectManipulation {
   override val toFunction: Project => Project = _.dependsOn(cs: _*)
 }
+/** this represents an `aggregate()` in the sbt DSL */
+case class DslAggregate(refs: Seq[ProjectReference]) extends ProjectManipulation {
+  override val toFunction: Project => Project = _.aggregate(refs: _*)
+}

notes/0.13.13/aggregate-build-sbt.md

@@ -0,0 +1,5 @@
+  [@xuwei-k]: https://github.com/xuwei-k
+
+### Improvements
+
+- Add the ability to call aggregate for the current project inside a build sbt file. By [@xuwei-k][@xuwei-k]

sbt/src/sbt-test/project/aggregate/build.sbt

@@ -0,0 +1,3 @@
+aggregateProjects(
+  RootProject(file("projA"))
+)

sbt/src/sbt-test/project/aggregate/projA/A.scala

@@ -0,0 +1 @@
+class A

sbt/src/sbt-test/project/aggregate/projA/build.sbt

@@ -0,0 +1,3 @@
+name := "projA"
+
+scalaVersion := "2.11.8"

sbt/src/sbt-test/project/aggregate/test

@@ -0,0 +1,2 @@
+> compile
+$ exists projA/target/scala-2.11/classes/A.class