diff options
| author | Jakob Odersky <jodersky@gmail.com> | 2015-10-03 15:43:42 -0700 |
|---|---|---|
| committer | Jakob Odersky <jodersky@gmail.com> | 2015-10-03 15:43:42 -0700 |
| commit | 1de1317375117b32001d943d64db6d6412c9d720 (patch) | |
| tree | 9af1a7f16ff154a7ae44e4ff57d6da9cb5603e43 /project/Build.scala | |
| parent | 7a785d1560f9aea79d5738e81b554ae77b676dd9 (diff) | |
| parent | 64436bd4364cbe7e4889724011ea80eb325565af (diff) | |
| download | akka-serial-1de1317375117b32001d943d64db6d6412c9d720.tar.gz akka-serial-1de1317375117b32001d943d64db6d6412c9d720.tar.bz2 akka-serial-1de1317375117b32001d943d64db6d6412c9d720.zip | |
Merge branch 'akka-2.4'
Diffstat (limited to 'project/Build.scala')
| -rw-r--r-- | project/Build.scala | 8 |
1 files changed, 4 insertions, 4 deletions
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" ) ) |