aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jodersky@gmail.com>2014-04-29 21:36:37 +0200
committerJakob Odersky <jodersky@gmail.com>2014-04-29 21:38:02 +0200
commitff6cd147f47f7f8536e85fc01ddec97505cee866 (patch)
tree11c43eb601e581169524893de7169ca190906a26
parentb0f328427ddc5cf2017c76739f5fdc4e7e34721c (diff)
downloadakka-serial-ff6cd147f47f7f8536e85fc01ddec97505cee866.tar.gz
akka-serial-ff6cd147f47f7f8536e85fc01ddec97505cee866.tar.bz2
akka-serial-ff6cd147f47f7f8536e85fc01ddec97505cee866.zip
update dependencies
-rw-r--r--CHANGELOG.md3
-rw-r--r--project/Dependencies.scala2
-rw-r--r--project/FlowBuild.scala4
-rw-r--r--project/build.properties2
4 files changed, 6 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81a7a56..422f2c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,8 @@ Version 2.0
- 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.
-- Downgrade Akka dependency to 2.2.0, for use with Play! projects.
+- Add mac packaging.
+- Upgrade Akka dependency to 2.3.2.
Version 1.2
- Upgrade Akka dependency to 2.3.0. (merge #3)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 9590394..5b9c0e1 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.0"
+ lazy val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.3.2"
lazy val ioCore = "com.github.scala-incubator.io" %% "scala-io-file" % "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 a43d375..a046392 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.10.3"
- val Version = "2.0.0-RC3"
+ val ScalaVersion = "2.10.4"
+ val Version = "2.0.0-RC4"
lazy val commonSettings: Seq[Setting[_]] =
diff --git a/project/build.properties b/project/build.properties
index 0974fce..8ac605a 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.0
+sbt.version=0.13.2