Adapt to Akka 2.6 API updates (#1806)

akka · Jul 2, 2019 · 85f65b1 · 85f65b1
1 parent f1a941e
commit 85f65b1
Show file tree

Hide file tree

Showing 4 changed files with 416 additions and 415 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,6 +21,7 @@ jobs:
       name: "Build code style check (fixed with `sbt scalafmtSbt`)"
     - env: CMD="++2.11.12 Test/compile"
       name: "Compile all tests (with Scala 2.11)"
+      if: type != cron
     - env: CMD="++2.13.0 Test/compile"
       name: "Compile all tests (with Scala 2.13)"
     - env: CMD="unidoc"

diff --git a/mqtt-streaming/src/main/scala/akka/stream/alpakka/mqtt/streaming/impl/ClientState.scala b/mqtt-streaming/src/main/scala/akka/stream/alpakka/mqtt/streaming/impl/ClientState.scala
@@ -296,7 +296,7 @@ import scala.util.{Either, Failure, Success}
           QueueOfferState.waitForQueueOfferCompleted(nextState, stash = data.stash)
 
         case (_, ConnectionLost(_)) =>
-          Behavior.same
+          Behaviors.same
         case (_, e) =>
           disconnected(data.copy(stash = data.stash :+ e))
       }

diff --git a/mqtt-streaming/src/main/scala/akka/stream/alpakka/mqtt/streaming/impl/ServerState.scala b/mqtt-streaming/src/main/scala/akka/stream/alpakka/mqtt/streaming/impl/ServerState.scala
@@ -793,7 +793,7 @@ import scala.util.{Failure, Success}
           case (_, ReceiveConnectTimeout) =>
             throw ClientConnectionFailed
           case (_, ConnectionLost) =>
-            Behavior.same // We know... we are disconnected...
+            Behaviors.same // We know... we are disconnected...
           case (_, PublishReceivedLocally(publish, _))
               if !data.publishers.exists(Topics.filter(_, publish.topicName)) =>
             Behaviors.same