From 0ced60b3a8a345b23748ceb3c70df95ccaf8afea Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jodersky@gmail.com>
Date: Thu, 23 Jul 2015 09:18:15 +0200
Subject: upgrade scala and akka

---
 CHANGELOG.md        | 4 ++++
 README.md           | 6 +++---
 project/Build.scala | 8 ++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83c7dc1..f8c1cd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Version 2.2.1
+- Upgrade Akka to 2.3.12
+- Upgrade Scala to 2.11.7
+
 # Version 2.2.0
 - Feature: implement watching for new ports.
 - Upgrade to Akka 2.3.11
diff --git a/README.md b/README.md
index 0445f20..ee8d40a 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Serial communication library for Scala, designed to be reactive, lightweight and
 ## Getting Started
 Flow uses sbt as build system. To get started, include a dependency to flow in your project:
 
-    libraryDependencies += "com.github.jodersky" %% "flow" % "2.2.0"
+    libraryDependencies += "com.github.jodersky" %% "flow" % "2.2.1"
 
 ### Including Native Library
 *NOTICE: 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.*
@@ -21,7 +21,7 @@ Flow uses sbt as build system. To get started, include a dependency to flow in y
 #### The easy way
 In case your OS/architecture combination is present in the below table, add a second dependency to your project:
 
-    libraryDependencies += "com.github.jodersky" % "flow-native" % "2.2.0"
+    libraryDependencies += "com.github.jodersky" % "flow-native" % "2.2.1"
 
 | OS                | Architecture                | Notes                                                                           |
 |-------------------|-----------------------------|---------------------------------------------------------------------------------|
@@ -106,7 +106,7 @@ object Terminal {
 
 More examples on flow's usage are located in the flow-samples directory. The examples may be run with sbt: `samples-<sample_name>/run`.
 
-Since flow integrates into the Akka-IO framework, a good resource on its general design is the framework's [documentation](http://doc.akka.io/docs/akka/2.3.10/scala/io.html).
+Since flow integrates into the Akka-IO framework, a good resource on its general design is the framework's [documentation](http://doc.akka.io/docs/akka/2.3.12/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/Build.scala b/project/Build.scala
index 17b0df0..c6b7f6b 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -7,9 +7,9 @@ import NativeKeys._
 object FlowBuild extends Build {
   
   lazy val commonSettings: Seq[Setting[_]] = Seq(
-    version := "2.2.0",
-    scalaVersion in ThisBuild := "2.11.6",
-    crossScalaVersions in ThisBuild := Seq("2.10.5", "2.11.6"),
+    version := "2.2.1",
+    scalaVersion in ThisBuild := "2.11.7",
+    crossScalaVersions in ThisBuild := Seq("2.10.5", "2.11.7"),
     organization := "com.github.jodersky",
     licenses := Seq(("BSD New", url("http://opensource.org/licenses/BSD-3-Clause"))),
     scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature", "-target:jvm-1.7")
@@ -42,7 +42,7 @@ object FlowBuild extends Build {
       javahHeaderDirectory := (baseDirectory in ThisBuild).value / "flow-native" / "src",
       javahClasses := Seq("com.github.jodersky.flow.internal.NativeSerial"),
       compileOrder in Compile := CompileOrder.Mixed,
-      libraryDependencies += "com.typesafe.akka" %% "akka-actor" % "2.3.11"
+      libraryDependencies += "com.typesafe.akka" %% "akka-actor" % "2.3.12"
     )
   )
 
-- 
cgit v1.2.3