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.

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

Upgrade to Akka 2.6.0 #89

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ lazy val root = (project in file("."))
// Production dependencies
"com.typesafe.play" %% "play" % playVersion,
"com.typesafe.akka" %% "akka-remote" % AkkaVersion,
"com.typesafe.akka" %% "akka-slf4j" % AkkaVersion,
// Test dependencies for running a Play server
"com.typesafe.play" %% "play-akka-http-server" % playVersion % Test,
"com.typesafe.play" %% "play-logback" % playVersion % Test,
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ object Dependencies {
val Scala212 = "2.12.15" // sync! see comment above
val Scala213 = "2.13.8" // sync! see comment above

val AkkaVersion = "2.5.32"
val AkkaVersion = "2.6.19"
}
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.0")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.7.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")

addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.3")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.15")

addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")

Expand Down
3 changes: 2 additions & 1 deletion src/main/scala/play/engineio/EngineIOSessionActor.scala
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ class EngineIOSessionActor[SessionData](
import EngineIOManagerActor._
import EngineIOSessionActor._

private val sessionTick = context.system.scheduler.schedule(config.pingInterval, config.pingInterval, self, Tick)
private val sessionTick =
context.system.scheduler.scheduleAtFixedRate(config.pingInterval, config.pingInterval, self, Tick)

override def postStop() = {
retrieveRequesters.foreach { case (transport, (RetrieveRequester(requester, requestId))) =>
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/play/socketio/SocketIOSessionFlow.scala
Original file line number Diff line number Diff line change
Expand Up @@ -314,13 +314,13 @@ private class SocketIOSessionStage[SessionData](
}
}

override def onPull() = {
override def onPull(): Unit = {
if (isAvailable(engineIOOut)) {
pull(engineIOIn)
}
}

override def onDownstreamFinish() = {
override def onDownstreamFinish(cause: Throwable): Unit = {
// Cancel the ins so we can't get any more events
cancel(engineIOIn)
cancel(socketIOIn)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ protected void configure() {
bind(Router.class).toProvider(new RouterProvider(routerBuilder));
}
})
.build().getWrappedApplication();
.build().asScala();

System.out.println("Started Java application.");
return application;
Expand Down