Merge branch 'akka-2.4'

4 files changed, 14 insertions, 7 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02b85e4..c0b02d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# Version 2.3.0
+- Upgrade Akka to 2.4.0, requiring a minimum JRE version of 1.8
+- Drop support for Scala 2.10
+- Add support for Scala 2.12
+
 # Version 2.2.4
 - Include even more info in POM generation, necessary to sync with maven central.
 
diff --git a/Documentation/getting-started.md b/Documentation/getting-started.md
index d681dd6..8dabb80 100644
--- a/Documentation/getting-started.md
+++ b/Documentation/getting-started.md
@@ -1,7 +1,9 @@
 # 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.4"
+	libraryDependencies += "com.github.jodersky" %% "flow" % "2.3.0"
+
+*Note: since version 2.3.0, flow depends on Akka 2.4, therefore requiring a minimum Java Runtime version of 1.8*
 
 Next, you need to include flow's native library that supports communication for serial devices.
 
@@ -17,7 +19,7 @@ It is recommended that you use the first option for testing purposes or end-user
 ### The Easy Way
 In case your OS/architecture combination is present in the table below, add a second dependency to your project:
 
-    libraryDependencies += "com.github.jodersky" % "flow-native" % "2.2.4"
+    libraryDependencies += "com.github.jodersky" % "flow-native" % "2.3.0"
 
 | OS                | Architecture                | Notes                                                                           |
 |-------------------|-----------------------------|---------------------------------------------------------------------------------|
diff --git a/README.md b/README.md
index beea949..d3bc6a9 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ object Terminal {
 
 More examples on flow's usage are located in the `flow-samples` directory. The examples may be run with sbt: `flow-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.13/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.4.0/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 03fdc47..47ead93 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -6,13 +6,13 @@ import NativeKeys._
 
 object FlowBuild extends Build {
 
-  val scalaVersions = List("2.11.7", "2.10.5")
+  val scalaVersions = List("2.11.7", "2.12.0-M2")
   
   lazy val commonSettings: Seq[Setting[_]] = Seq(
-    version := "2.2.5-SNAPSHOT",
+    version := "2.3.1-SNAPSHOT",
     scalaVersion in ThisBuild := scalaVersions.head,
     crossScalaVersions in ThisBuild := scalaVersions.reverse,
-    scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature", "-target:jvm-1.7"),
+    scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature", "-target:jvm-1.8"),
     organization := "com.github.jodersky",
     licenses := Seq(("BSD New", url("http://opensource.org/licenses/BSD-3-Clause"))),
     homepage := Some(url("https://github.com/jodersky/flow")),
@@ -58,7 +58,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.13"
+      libraryDependencies += "com.typesafe.akka" %% "akka-actor" % "2.4.0"
     )
   )