aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorJakob Odersky <jakob@odersky.com>2016-01-24 20:21:17 -0800
committerJakob Odersky <jakob@odersky.com>2016-02-03 20:46:28 -0800
commitf865a76c2f441f619b069505b73fcbd1cba1a67c (patch)
tree3f53c519f4575037bdebf8c8399ca25d50649543 /project
parent46c30908f827e27b58166f56efa4f15917c1af4f (diff)
downloadakka-serial-f865a76c2f441f619b069505b73fcbd1cba1a67c.tar.gz
akka-serial-f865a76c2f441f619b069505b73fcbd1cba1a67c.tar.bz2
akka-serial-f865a76c2f441f619b069505b73fcbd1cba1a67c.zip
Add support for Akka streams
Diffstat (limited to 'project')
-rw-r--r--project/Dependencies.scala4
-rw-r--r--project/FlowBuild.scala28
2 files changed, 23 insertions, 9 deletions
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)
)
}