From f865a76c2f441f619b069505b73fcbd1cba1a67c Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@odersky.com>
Date: Sun, 24 Jan 2016 20:21:17 -0800
Subject: Add support for Akka streams

---
 project/Dependencies.scala |  4 +++-
 project/FlowBuild.scala    | 28 ++++++++++++++++++++--------
 2 files changed, 23 insertions(+), 9 deletions(-)

(limited to 'project')

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index d051938..6ab96db 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -4,6 +4,8 @@ import sbt._
 
 object Dependencies {
 
-  val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.4.1"
+  val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.4.2-RC1"
+
+  val akkaStream ="com.typesafe.akka" %% "akka-stream" % "2.4.2-RC1"
 
 }
diff --git a/project/FlowBuild.scala b/project/FlowBuild.scala
index 8e9bc73..4171e13 100644
--- a/project/FlowBuild.scala
+++ b/project/FlowBuild.scala
@@ -31,7 +31,7 @@ object FlowBuild extends Build {
 
   lazy val root: Project = (
     Project("root", file("."))
-    aggregate(main, native)
+    aggregate(core, native, stream)
     settings(commonSettings: _*)
     settings(
       publishArtifact := false,
@@ -41,9 +41,9 @@ object FlowBuild extends Build {
     )
   )
 
-  lazy val main = Project(
-    id = "flow-main",
-    base = file("flow-main")
+  lazy val core = Project(
+    id = "flow-core",
+    base = file("flow-core")
   )
 
   lazy val native = Project(
@@ -51,16 +51,28 @@ object FlowBuild extends Build {
     base = file("flow-native")
   )
 
+  lazy val stream = Project(
+    id = "flow-stream",
+    base = file("flow-stream"),
+    dependencies = Seq(core)
+  )
+
   lazy val samplesTerminal = Project(
-    id = "flow-samples-terminal",
+    id = "samples-terminal",
     base = file("flow-samples") / "terminal",
-    dependencies = Seq(main, native % Runtime)
+    dependencies = Seq(core, native % Runtime)
+  )
+
+  lazy val samplesTerminalStream = Project(
+    id = "samples-terminal-stream",
+    base = file("flow-samples") / "terminal-stream",
+    dependencies = Seq(stream, native % Runtime)
   )
 
   lazy val samplesWatcher = Project(
-    id = "flow-samples-watcher",
+    id = "samples-watcher",
     base = file("flow-samples") / "watcher",
-    dependencies = Seq(main, native % Runtime)
+    dependencies = Seq(core, native % Runtime)
   )
 
 }
-- 
cgit v1.2.3