From 6fdcac8e58995732f303db60679e226e98780398 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@odersky.com>
Date: Sat, 21 Jan 2017 18:16:43 -0800
Subject: Upgrade scala and akka-serial

---
 mavigator-server/build.sbt                           |  4 ++--
 mavigator-uav/build.sbt                              |  6 +++---
 .../scala/mavigator/uav/serial/SerialBackend.scala   |  6 +++---
 project/Dependencies.scala                           | 20 +++++++++++---------
 project/MavigatorBuild.scala                         |  2 +-
 project/plugins.sbt                                  |  6 +++---
 6 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/mavigator-server/build.sbt b/mavigator-server/build.sbt
index d430750..ee3ffd8 100644
--- a/mavigator-server/build.sbt
+++ b/mavigator-server/build.sbt
@@ -8,7 +8,7 @@ libraryDependencies ++= Seq(
   Dependencies.akkaHttp,
   Dependencies.akkaHttpCore,
   Dependencies.akkaStream,
-  Dependencies.flowNative //FIXME runtime dependencies from uav are not included, is this an sbt bug?
+  Dependencies.akkaSerialNative //FIXME runtime dependencies from uav are not included, is this an sbt bug?
 )
 
 Js.dependsOnJs(MavigatorBuild.cockpit)
@@ -23,7 +23,7 @@ cancelable in Global := true
  */
 enablePlugins(DockerPlugin)
 
-val filter = ScopeFilter(
+lazy val filter = ScopeFilter(
   inAnyProject,
   inConfigurations(Compile)
 )
diff --git a/mavigator-uav/build.sbt b/mavigator-uav/build.sbt
index c2b97c6..19a510c 100644
--- a/mavigator-uav/build.sbt
+++ b/mavigator-uav/build.sbt
@@ -5,8 +5,8 @@ MavigatorBuild.defaultSettings
 libraryDependencies ++= Seq(
   Dependencies.akkaActor,
   Dependencies.akkaStream,
-  Dependencies.flow,
-  Dependencies.flowNative,
-  Dependencies.flowStream,
+  Dependencies.akkaSerial,
+  Dependencies.akkaSerialNative,
+  Dependencies.akkaSerialStream,
   Dependencies.reactiveStreams
 )
diff --git a/mavigator-uav/src/main/scala/mavigator/uav/serial/SerialBackend.scala b/mavigator-uav/src/main/scala/mavigator/uav/serial/SerialBackend.scala
index 1a6b50b..878e891 100644
--- a/mavigator-uav/src/main/scala/mavigator/uav/serial/SerialBackend.scala
+++ b/mavigator-uav/src/main/scala/mavigator/uav/serial/SerialBackend.scala
@@ -7,11 +7,11 @@ import scala.concurrent.duration._
 import scala.util.{Failure, Success}
 
 import akka.NotUsed
+import akka.serial.{Parity, SerialSettings}
+import akka.serial.stream.Serial
+import akka.serial.stream.Serial.Connection
 import akka.stream.scaladsl.{Flow, Keep}
 import akka.util.ByteString
-import ch.jodersky.flow.{Parity, SerialSettings}
-import ch.jodersky.flow.stream.Serial
-import ch.jodersky.flow.stream.Serial.Connection
 
 object SerialBackend extends Backend {
 
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 582fdde..b0a5762 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -6,21 +6,23 @@ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
 
 object Dependencies {
 
-  final val AkkaVersion = "2.4.12"
+  final val AkkaVersion = "2.4.16"
   val akkaActor = "com.typesafe.akka" %% "akka-actor" % AkkaVersion
-  val akkaHttp = "com.typesafe.akka" %% "akka-http-experimental" % "2.4.11"
-  val akkaHttpCore = "com.typesafe.akka" %% "akka-http-core" % "2.4.11"
   val akkaStream = "com.typesafe.akka" %% "akka-stream" % AkkaVersion
 
-  val reactiveStreams = "org.reactivestreams" % "reactive-streams" % "1.0.0"
+  final val AkkaHttpVersion = "10.0.1"
+  val akkaHttp = "com.typesafe.akka" %% "akka-http" % AkkaHttpVersion
+  val akkaHttpCore = "com.typesafe.akka" %% "akka-http-core" % AkkaHttpVersion
+
+  final val AkkaSerialVersion = "4.0.0-RC1"
+  val akkaSerial = "ch.jodersky" %% "akka-serial-core" % AkkaSerialVersion
+  val akkaSerialNative = "ch.jodersky" % "akka-serial-native" % AkkaSerialVersion % Runtime
+  val akkaSerialStream = "ch.jodersky" %% "akka-serial-stream" % AkkaSerialVersion
 
-  final val FlowVersion = "3.0.3"
-  val flow = "ch.jodersky" %% "flow-core" % FlowVersion
-  val flowNative = "ch.jodersky" % "flow-native" % FlowVersion % Runtime
-  val flowStream = "ch.jodersky" %% "flow-stream" % FlowVersion
+  val reactiveStreams = "org.reactivestreams" % "reactive-streams" % "1.0.0"
 
   val jsDom = Def.setting{"org.scala-js" %%% "scalajs-dom" % "0.9.1"}
-  val scalatags = Def.setting{"com.lihaoyi" %%% "scalatags" % "0.6.1"}
+  val scalatags = Def.setting{"com.lihaoyi" %%% "scalatags" % "0.6.2"}
   val scalarx = Def.setting{"com.lihaoyi" %%% "scalarx" % "0.3.2"}
 
 }
diff --git a/project/MavigatorBuild.scala b/project/MavigatorBuild.scala
index e634d03..1eb1fc0 100644
--- a/project/MavigatorBuild.scala
+++ b/project/MavigatorBuild.scala
@@ -9,7 +9,7 @@ object MavigatorBuild extends Build {
   // settings common to all projects
   val defaultSettings = Seq(
     resolvers += Resolver.jcenterRepo,
-    scalaVersion := "2.11.8",
+    scalaVersion := "2.12.1",
     scalacOptions ++= Seq("-feature", "-deprecation")
   )
 
diff --git a/project/plugins.sbt b/project/plugins.sbt
index bde5181..e2fdc99 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -9,13 +9,13 @@ resolvers += Resolver.jcenterRepo
  */
 
 // add support for scalajs
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.14")
 
 // twirl html templating
-addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.1.1")
+addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.3.0")
 
 // generate MAVLink protocol bindings
-addSbtPlugin("com.github.jodersky" % "sbt-mavlink" % "0.7.0")
+addSbtPlugin("com.github.jodersky" % "sbt-mavlink" % "0.8.0-SNAPSHOT")
 
 
 /*
-- 
cgit v1.2.3