diff options
author | Jakob Odersky <jakob@odersky.com> | 2016-04-18 02:08:03 -0700 |
---|---|---|
committer | Jakob Odersky <jakob@odersky.com> | 2016-04-18 02:08:03 -0700 |
commit | 97ed5329395bc5bd1efed2e66e83a6e824cc1cbe (patch) | |
tree | 093e859c22a62e756af7124c7ca6b8b67b07b278 | |
parent | 4604e09ae4cdaba9614ae59818febeb263861c6c (diff) | |
download | akka-serial-97ed5329395bc5bd1efed2e66e83a6e824cc1cbe.tar.gz akka-serial-97ed5329395bc5bd1efed2e66e83a6e824cc1cbe.tar.bz2 akka-serial-97ed5329395bc5bd1efed2e66e83a6e824cc1cbe.zip |
Upgrade Akka and Scala build
-rw-r--r-- | CHANGELOG.md | 3 | ||||
-rw-r--r-- | project/Dependencies.scala | 4 | ||||
-rw-r--r-- | project/FlowBuild.scala | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 40e939c..f534a30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Version 2.5.1 +- Upgrade Akka to 2.4.3 + # Version 2.5.0 - Rename main 'flow' project to 'flow-core' - Implement support for Akka streams diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 3b122be..a96a97d 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.2" + val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.4.4" - val akkaStream ="com.typesafe.akka" %% "akka-stream" % "2.4.2" + val akkaStream ="com.typesafe.akka" %% "akka-stream" % "2.4.4" } diff --git a/project/FlowBuild.scala b/project/FlowBuild.scala index 79c658f..05f2161 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-M3") + val scalaVersions = List("2.11.8", "2.12.0-M4") lazy val commonSettings: Seq[Setting[_]] = Seq( resolvers += Resolver.jcenterRepo, |