aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jakob@odersky.com>2016-10-07 19:29:25 -0700
committerJakob Odersky <jakob@odersky.com>2016-10-07 19:29:25 -0700
commit3c008569878041bd754d28fe424ce9e0c2327498 (patch)
tree6141b93c7f201a1c932264667c5b16b4fc768996
parentc27a6fceeafaeac7d7f34a332a43de713150b55c (diff)
downloadakka-serial-3c008569878041bd754d28fe424ce9e0c2327498.tar.gz
akka-serial-3c008569878041bd754d28fe424ce9e0c2327498.tar.bz2
akka-serial-3c008569878041bd754d28fe424ce9e0c2327498.zip
Upgrade dependencies and Scala versions
-rw-r--r--project/Dependencies.scala4
-rw-r--r--project/FlowBuild.scala2
-rw-r--r--project/build.properties2
3 files changed, 4 insertions, 4 deletions
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 3079933..527d911 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -4,8 +4,8 @@ import sbt._
object Dependencies {
- val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.4.8"
+ val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.4.11"
- val akkaStream ="com.typesafe.akka" %% "akka-stream" % "2.4.8"
+ val akkaStream ="com.typesafe.akka" %% "akka-stream" % "2.4.11"
}
diff --git a/project/FlowBuild.scala b/project/FlowBuild.scala
index 5873645..f7f652a 100644
--- a/project/FlowBuild.scala
+++ b/project/FlowBuild.scala
@@ -5,7 +5,7 @@ import Keys._
object FlowBuild extends Build {
- val scalaVersions = List("2.11.8", "2.12.0-M5")
+ val scalaVersions = List("2.11.8", "2.12.0-RC1")
lazy val commonSettings: Seq[Setting[_]] = Seq(
resolvers += Resolver.jcenterRepo,
diff --git a/project/build.properties b/project/build.properties
index 43b8278..35c88ba 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.11
+sbt.version=0.13.12