Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nightly with Akka 2.6 #1799

Merged
merged 1 commit into from
Jul 1, 2019
Merged

Nightly with Akka 2.6 #1799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions mqtt/src/test/java/docs/javadsl/MqttFlowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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();
Expand Down
9 changes: 4 additions & 5 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down