update akka and scala versionsv2.1.0

4 files changed, 31 insertions, 29 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 557e3af..88d7cd3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,47 +1,49 @@
-Version 2.0.10
-- Remove dependencies on scala-io
+Version 2.1.0
+ -  Remove dependencies on scala-io
+ -  Upgrade to Akka 2.3.9
+ -  Upgrade to Scla 2.11.5
 
 Version 2.0.9
-- Fix termios initialization issues (#12)
+ -  Fix termios initialization issues (#12)
 
 Version 2.0.8
-- Upgrade to Akka dependency 2.3.8 (version 2.3.7 is skipped)
-- Upgrade to Scala 2.11.4
-- Upgrade sbt version to 0.13.7
+ -  Upgrade to Akka dependency 2.3.8 (version 2.3.7 is skipped)
+ -  Upgrade to Scala 2.11.4
+ -  Upgrade sbt version to 0.13.7
 
 Version 2.0.6
-- Fix version incoherency problem.
+ -  Fix version incoherency problem.
 
 Version 2.0.5
--  Upgrade to Akka dependency 2.3.6
+ -  Upgrade to Akka dependency 2.3.6
 
 Version 2.0.4
--  Upgrade to Akka dependency 2.3.5
+ -  Upgrade to Akka dependency 2.3.5
 
 Version 2.0.3
--  Upgrade to Akka dependency 2.3.4
+ -  Upgrade to Akka dependency 2.3.4
 
 Version 2.0.2
--  Upgrade to Akka dependency 2.3.3 (merge #10)
--  Add support for Scala 2.11 (merge #10)
--  Remove Scala version from native fat jar.
+ -  Upgrade to Akka dependency 2.3.3 (merge #10)
+ -  Add support for Scala 2.11 (merge #10)
+ -  Remove Scala version from native fat jar.
 
 Version 2.0.1
--  Use system actor for manager.
+ -  Use system actor for manager.
 
 Version 2.0
--  Use of direct buffers to increase performance when receiving and transmititng data.
--  Remove need to register to receive incoming data from an operator. A port is now opened by a client who will be the sole actor to receive messages from the operator.
--  Migrate native build to Autotools (C compiler is not called through sbt anymore).
--  Add debian packaging.
--  Add mac packaging.
--  Upgrade Akka dependency to 2.3.2.
+ -  Use of direct buffers to increase performance when receiving and transmititng data.
+ -  Remove need to register to receive incoming data from an operator. A port is now opened by a client who will be the sole actor to receive messages from the operator.
+ -  Migrate native build to Autotools (C compiler is not called through sbt anymore).
+ -  Add debian packaging.
+ -  Add mac packaging.
+ -  Upgrade Akka dependency to 2.3.2.
 
 Version 1.2
--  Upgrade Akka dependency to 2.3.0. (merge #3)
+ -  Upgrade Akka dependency to 2.3.0. (merge #3)
 
 Version 1.1
--  Restructure build for easier cross-compilation. (fixes #1)
+ -  Restructure build for easier cross-compilation. (fixes #1)
 
 Version 1.0
--  Initial release.
\ No newline at end of file
+ -  Initial release.
\ No newline at end of file
diff --git a/README.md b/README.md
index 11fcb0a..9daccf3 100644
--- a/README.md
+++ b/README.md
@@ -9,13 +9,13 @@ For a short guide on how to use flow see the file [documentation/basics.md](docu
 
 Flow is built and its examples run with SBT. To get started, include a dependency to flow in your project:
 
-    libraryDependencies += "com.github.jodersky" %% "flow" % "2.0.9"
+    libraryDependencies += "com.github.jodersky" %% "flow" % "2.1.0"
 
 ATTENTION: flow uses native libraries to back serial communication, therefore before you can run any application depending on flow you must include flow's native library! To do so, you have two options.
 
 1.  The easy way: add a second dependency to your project:
         
-        libraryDependencies += "com.github.jodersky" % "flow-native" % "2.0.9"
+        libraryDependencies += "com.github.jodersky" % "flow-native" % "2.1.0"
 
     This will add a jar to your classpath containing native libraries for various platforms. At run time, the correct library for the current platform is selected, extracted and loaded. This solution enables running applications seamlessly, as if they were pure JVM applications. However, since the JVM does not enable full determination of the current platform (only OS and rough architecture are known), only a couple of platforms can be supported through this solution at the same time. Currently, these are given in the table below.
 
@@ -40,7 +40,7 @@ It is recomended that you use the first option only for testing purposes or end-
 ## Examples
 Examples on flow's usage are located in the flow-samples directory. The examples may be run by switching to the corresponding project in sbt: `project flow-samples-<sample_name>` and typing `run`. Be sure to connect a serial device before running an example.
 
-Since flow integrates into the Akka-IO framework, a good resource on its general design is the framework's documentation at http://doc.akka.io/docs/akka/2.3.8/scala/io.html
+Since flow integrates into the Akka-IO framework, a good resource on its general design is the framework's documentation at http://doc.akka.io/docs/akka/2.3.9/scala/io.html
 
 ## Native side
 Since hardware is involved in serial communication, a Scala-only solution is not possible. Nevertherless, the native code is kept simple and minimalistic with the burden of dealing with threads left to Scala. The code aims to be POSIX compliant and therefore easily portable.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index d9c32be..6e4c328 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -2,6 +2,6 @@ import sbt._
 
 object Dependencies {
 
-  lazy val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.3.8"
+  lazy val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.3.9"
 
 }
diff --git a/project/FlowBuild.scala b/project/FlowBuild.scala
index 05883d6..3c1e8f5 100644
--- a/project/FlowBuild.scala
+++ b/project/FlowBuild.scala
@@ -7,8 +7,8 @@ import NativeKeys._
 
 object FlowBuild extends Build {
   val Organization = "com.github.jodersky"
-  val ScalaVersion = "2.11.4"
-  val Version = "2.0.9"
+  val ScalaVersion = "2.11.5"
+  val Version = "2.1.0"
   
   
   lazy val commonSettings: Seq[Setting[_]] =