From d50419e13c6166462be715b9bf2f00882ef154b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martynas=20Mickevi=C4=8Dius?= <self@2m.lt>
Date: Mon, 1 Jul 2019 09:56:16 +0300
Subject: [PATCH] Nightly with Akka 2.6

---
 mqtt/src/test/java/docs/javadsl/MqttFlowTest.java | 10 +++-------
 project/Dependencies.scala                        |  9 ++++-----
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/mqtt/src/test/java/docs/javadsl/MqttFlowTest.java b/mqtt/src/test/java/docs/javadsl/MqttFlowTest.java
index e8a6df07b7..777981b6ee 100644
--- a/mqtt/src/test/java/docs/javadsl/MqttFlowTest.java
+++ b/mqtt/src/test/java/docs/javadsl/MqttFlowTest.java
@@ -112,12 +112,9 @@ public void sendAnAckAfterMessageSent() throws Exception {
     // #create-flow-ack
 
     // #run-flow-ack
-    final Pair<Pair<NotUsed, CompletionStage<Done>>,
-            CompletionStage<List<MqttMessageWithAck>>>
+    final Pair<Pair<NotUsed, CompletionStage<Done>>, CompletionStage<List<MqttMessageWithAck>>>
         materialized =
-            source.viaMat(mqttFlow, Keep.both())
-                    .toMat(Sink.seq(), Keep.both())
-                    .run(materializer);
+            source.viaMat(mqttFlow, Keep.both()).toMat(Sink.seq(), Keep.both()).run(materializer);
 
     // #run-flow-ack
 
@@ -131,11 +128,10 @@ public void sendAnAckAfterMessageSent() throws Exception {
   class MqttMessageWithAckFake extends MqttMessageWithAckImpl {
     Boolean acked;
 
-    MqttMessageWithAckFake(){
+    MqttMessageWithAckFake() {
       acked = false;
     }
 
-
     @Override
     public CompletionStage<Done> messageArrivedComplete() {
       return ack();
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 5e57126a5d..7ac5602baf 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -3,15 +3,14 @@ import Keys._
 
 object Dependencies {
 
+  val Nightly = sys.env.get("TRAVIS_EVENT_TYPE").contains("cron")
+
   val Scala211 = "2.11.12"
   val Scala212 = "2.12.7"
   val Scala213 = "2.13.0"
-  val ScalaVersions = Seq(Scala212, Scala211, Scala213)
+  val ScalaVersions = Seq(Scala212, Scala211, Scala213).filterNot(_ == Scala211 && Nightly)
 
-  val AkkaVersion = sys.env.get("AKKA_SERIES") match {
-    case Some("2.4") => sys.error("Akka 2.4 is not supported anymore")
-    case _ => "2.5.23"
-  }
+  val AkkaVersion = if (Nightly) "2.6.0-M3" else "2.5.23"
 
   val InfluxDBJavaVersion = "2.15"