add support for scala 2.12 and upgrade versions

ouven · Nov 18, 2016 · 5f1d444 · 5f1d444
1 parent 446871e
commit 5f1d444
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: scala
 scala:
    - 2.11.8
+   - 2.12.0
 jdk:
   - oraclejdk8
 

diff --git a/build.sbt b/build.sbt
@@ -1,13 +1,16 @@
 import com.typesafe.sbt.packager.docker.{Cmd, ExecCmd}
 
 val Versions = new {
-  val akka = "2.4.10"
+  val akka = "2.4.12"
+  val `akka-http` = "10.0.0-RC2"
 }
 
 lazy val commonSettings = Seq(
   organization := "de.aktey.akka.visualmailbox",
 
-  scalaVersion := "2.11.8",
+  scalaVersion := "2.12.0",
+
+  crossScalaVersions := Seq("2.11.8", "2.12.0"),
 
   scalacOptions ++= Seq("-deprecation", "-feature"),
 
@@ -73,7 +76,7 @@ lazy val common = project
   .settings(commonSettings: _*)
   .settings(Seq(
     libraryDependencies ++= Seq(
-      "org.scalacheck" %% "scalacheck" % "1.13.0" % "test"
+      "org.scalacheck" %% "scalacheck" % "1.13.4" % "test"
     )
   ))
 
@@ -92,8 +95,8 @@ lazy val visualization = project
     publishArtifact := false,
 
     libraryDependencies ++= Seq(
-      "de.heikoseeberger" %% "akka-sse" % "1.8.0",
-      "com.typesafe.akka" %% "akka-http-experimental" % Versions.akka,
+      "de.heikoseeberger" %% "akka-sse" % "2.0.0-M4",
+      "com.typesafe.akka" %% "akka-http" % Versions.`akka-http`,
       "com.typesafe.akka" %% "akka-slf4j" % Versions.akka,
       "ch.qos.logback" % "logback-classic" % "1.1.7"
     ),

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "1.0.2-SNAPSHOT"
+version in ThisBuild := "1.1.0-SNAPSHOT"
diff --git a/visualization/src/main/scala/de/aktey/akka/visualmailbox/VisualMailboxMetricServer.scala b/visualization/src/main/scala/de/aktey/akka/visualmailbox/VisualMailboxMetricServer.scala
@@ -43,7 +43,7 @@ object VisualMailboxMetricServer extends App {
 
   Http()
     .bindAndHandle(Routing.root(MetricFlow.metricSource(router)), webConfig.host, webConfig.port)
-    .onSuccess { case ServerBinding(address) =>
+    .foreach { case ServerBinding(address) =>
       log.info(s"""{"type":"http-bound","address":"$address"}""")
     }
 }
diff --git a/visualization/src/main/scala/de/aktey/akka/visualmailbox/web/Routing.scala b/visualization/src/main/scala/de/aktey/akka/visualmailbox/web/Routing.scala
@@ -19,7 +19,7 @@ object Routing {
       complete {
         metricFlow
           .map(s => ServerSentEvent(s, "vmm"))
-          .keepAlive(20.seconds, () => ServerSentEvent.Heartbeat)
+          .keepAlive(20.seconds, () => ServerSentEvent.heartbeat)
       }
     }
   }