diff options
| author | Jakob Odersky <jakob@odersky.com> | 2016-07-09 18:22:22 -0700 |
|---|---|---|
| committer | Jakob Odersky <jakob@odersky.com> | 2016-07-09 18:22:22 -0700 |
| commit | d2cbc59328cf18c9323a9c80d2095353bcd513c3 (patch) | |
| tree | 1ac9c058a55435d47b093a1976585fb03d309769 | |
| parent | abb62fdc7617bbeaec8dd0751f9693f5d79c79c6 (diff) | |
| download | akka-serial-d2cbc59328cf18c9323a9c80d2095353bcd513c3.tar.gz akka-serial-d2cbc59328cf18c9323a9c80d2095353bcd513c3.tar.bz2 akka-serial-d2cbc59328cf18c9323a9c80d2095353bcd513c3.zip | |
Update Scala 2.12 support to milestone 5
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | project/Dependencies.scala | 4 | ||||
| -rw-r--r-- | project/FlowBuild.scala | 2 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index c778473..a11f328 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: scala scala: - 2.11.8 - - 2.12.0-M4 + - 2.12.0-M5 jdk: - oraclejdk8 # this should be changed to openjdk as soon as it becomes available on Travis CI compiler: diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ce1a6b1..3079933 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,8 +4,8 @@ import sbt._ object Dependencies { - val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.4.7" + val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.4.8" - val akkaStream ="com.typesafe.akka" %% "akka-stream" % "2.4.7" + val akkaStream ="com.typesafe.akka" %% "akka-stream" % "2.4.8" } diff --git a/project/FlowBuild.scala b/project/FlowBuild.scala index a2e40aa..5873645 100644 --- a/project/FlowBuild.scala +++ b/project/FlowBuild.scala @@ -5,7 +5,7 @@ import Keys._ object FlowBuild extends Build { - val scalaVersions = List("2.11.8", "2.12.0-M4") + val scalaVersions = List("2.11.8", "2.12.0-M5") lazy val commonSettings: Seq[Setting[_]] = Seq( resolvers += Resolver.jcenterRepo, diff --git a/project/plugins.sbt b/project/plugins.sbt index e994184..3c53cfd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,7 +5,7 @@ resolvers += Resolver.jcenterRepo // Build, package and load native libraries -addSbtPlugin("ch.jodersky" % "sbt-jni" % "1.1.0") +addSbtPlugin("ch.jodersky" % "sbt-jni" % "1.2.1") /* * Utility plugins, can be disabled during plain build |