From 4b154cbe7a615652b0e9570bddbce3bfbba9ac7b Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Thu, 1 Oct 2015 03:03:44 -0400
Subject: [PATCH] Fix actions/join test

---
 sbt/src/sbt-test/actions/join/build.sbt       | 20 +++++++++++++++++++
 .../sbt-test/actions/join/project/Build.scala | 12 -----------
 2 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 sbt/src/sbt-test/actions/join/build.sbt
 delete mode 100644 sbt/src/sbt-test/actions/join/project/Build.scala

diff --git a/sbt/src/sbt-test/actions/join/build.sbt b/sbt/src/sbt-test/actions/join/build.sbt
new file mode 100644
index 000000000..ac73e48c3
--- /dev/null
+++ b/sbt/src/sbt-test/actions/join/build.sbt
@@ -0,0 +1,20 @@
+lazy val intTask = taskKey[Int]("int")
+
+lazy val root = (project in file(".")).
+  dependsOn(b, c).
+  settings(
+    intTask in Compile := {
+      // a sequence of tasks could be joined together
+      Seq(b, c).map(p => intTask in (p, Compile)).join.map( as => (1 /: as)(_ + _) ).value
+    }
+  )
+
+lazy val b = (project in file("b")).
+  settings(
+    intTask in Compile := 1
+  )
+
+lazy val c = (project in file("c")).
+  settings{
+    intTask in Compile := 2
+  }
diff --git a/sbt/src/sbt-test/actions/join/project/Build.scala b/sbt/src/sbt-test/actions/join/project/Build.scala
deleted file mode 100644
index 438c3ea09..000000000
--- a/sbt/src/sbt-test/actions/join/project/Build.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-import sbt._
-import Keys._
-import Import._
-
-object Build extends Build
-{
-	lazy val root = Project("root", file(".")) dependsOn(b,c) settings(
-		compile in Compile <<= Seq(b, c).map(p => compile in (p, Compile)).join.map( as => (inc.Analysis.Empty /: as)(_ ++ _) )
-	)
-	lazy val b = Project("b", file("b"))
-	lazy val c = Project("c", file("c"))
-}