add cross-compilation and remove scala version from native jarv2.0.2

4 files changed, 15 insertions, 5 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 422f2c2..09132ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+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.
+
+Version 2.0.1
+-  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.
diff --git a/README.md b/README.md
index f2bbd96..c0e66fd 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.1"
+    libraryDependencies += "com.github.jodersky" %% "flow" % "2.0.2"
 
 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.1"
+        libraryDependencies += "com.github.jodersky" % "flow-native" % "2.0.2"
 
     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.
 
diff --git a/project/FlowBuild.scala b/project/FlowBuild.scala
index 2b59910..450033b 100644
--- a/project/FlowBuild.scala
+++ b/project/FlowBuild.scala
@@ -8,14 +8,15 @@ import NativeKeys._
 object FlowBuild extends Build {
   val Organization = "com.github.jodersky"
   val ScalaVersion = "2.11.1"
-  val Version = "2.0.1"
+  val Version = "2.0.2"
   
   
   lazy val commonSettings: Seq[Setting[_]] =
     UniqueVersionDefaults.settings ++
     Seq(
       organization := Organization,
-      scalaVersion := ScalaVersion,
+      scalaVersion in ThisBuild := ScalaVersion,
+      crossScalaVersions in ThisBuild := Seq("2.10.4", ScalaVersion),
       baseVersion := Version,
       licenses := Seq(("BSD-3-Clause", url("http://opensource.org/licenses/BSD-3-Clause"))),
       homepage := Some(url("http://github.com/jodersky/flow")),
@@ -81,6 +82,7 @@ object FlowBuild extends Build {
     settings(publishSettings: _*)
     settings(NativeDefaults.settings: _*)
     settings(
+      crossPaths := false,
       nativeBuildDirectory := (baseDirectory in ThisBuild).value / "flow-native"
     )
   )
diff --git a/project/build.properties b/project/build.properties
index 8ac605a..be6c454 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.2
+sbt.version=0.13.5