aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jodersky@gmail.com>2014-03-23 21:39:50 +0100
committerJakob Odersky <jodersky@gmail.com>2014-03-23 21:39:50 +0100
commit89253834598706b638a54b729f312cf70fa13974 (patch)
tree9ae0d17853868296e67be3cf2adce9ca0ada6d8d
parent917a6bc5d88d765ec6d80c8ccce108849b3c4f78 (diff)
parent1e57edfc595eff47b420243f54dabd580244601a (diff)
downloadakka-serial-89253834598706b638a54b729f312cf70fa13974.tar.gz
akka-serial-89253834598706b638a54b729f312cf70fa13974.tar.bz2
akka-serial-89253834598706b638a54b729f312cf70fa13974.zip
Merge pull request #3 from bjarkevad/master
Updated Akka to 2.3.0, not thoroughly tested
-rw-r--r--project/Dependencies.scala2
-rw-r--r--project/FlowBuild.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index f7bd333..7115ba6 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -2,7 +2,7 @@ import sbt._
object Dependencies {
- lazy val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.2.3"
+ lazy val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.3.0"
lazy val ioCore = "com.github.scala-incubator.io" %% "scala-io-core" % "0.4.2"
lazy val ioFile = "com.github.scala-incubator.io" %% "scala-io-file" % "0.4.2"
diff --git a/project/FlowBuild.scala b/project/FlowBuild.scala
index e12d9b8..5638243 100644
--- a/project/FlowBuild.scala
+++ b/project/FlowBuild.scala
@@ -7,7 +7,7 @@ import NativePackKeys._
object FlowBuild extends Build {
val Organization = "com.github.jodersky"
val ScalaVersion = "2.10.3"
- val Version = "1.1.0" //version of flow library
+ val Version = "1.2.0" //version of flow library
val NativeMajorVersion = 2 //major version of native API
val NativeMinorVersionPosix = 0 //minor version of native posix implementation
val NativeVersionPosix = NativeMajorVersion + "." + NativeMinorVersionPosix