Skip to content

Commit

Permalink
upgrade scala and akka
Browse files Browse the repository at this point in the history
  • Loading branch information
jodersky committed Jul 23, 2015
1 parent c6cb29f commit 0ced60b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ 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.*

#### 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 |
|-------------------|-----------------------------|---------------------------------------------------------------------------------|
Expand Down Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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"
)
)

Expand Down

0 comments on commit 0ced60b

Please sign in to comment.