diff --git a/build.sbt b/build.sbt index bc4b84a..3f03c98 100644 --- a/build.sbt +++ b/build.sbt @@ -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, diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 367cdd2..fd22381 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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" } diff --git a/src/main/scala/play/engineio/EngineIOSessionActor.scala b/src/main/scala/play/engineio/EngineIOSessionActor.scala index 16e373e..4c2c5d2 100644 --- a/src/main/scala/play/engineio/EngineIOSessionActor.scala +++ b/src/main/scala/play/engineio/EngineIOSessionActor.scala @@ -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))) => diff --git a/src/main/scala/play/socketio/SocketIOSessionFlow.scala b/src/main/scala/play/socketio/SocketIOSessionFlow.scala index 54cef0e..5a19e91 100644 --- a/src/main/scala/play/socketio/SocketIOSessionFlow.scala +++ b/src/main/scala/play/socketio/SocketIOSessionFlow.scala @@ -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) diff --git a/src/test/java/play/socketio/javadsl/TestSocketIOJavaApplication.java b/src/test/java/play/socketio/javadsl/TestSocketIOJavaApplication.java index 06772d6..d49554b 100644 --- a/src/test/java/play/socketio/javadsl/TestSocketIOJavaApplication.java +++ b/src/test/java/play/socketio/javadsl/TestSocketIOJavaApplication.java @@ -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;