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

Update play-ahc-ws, play-akka-http-server, ... to 3.0.0 #52

Merged
merged 3 commits into from
Oct 26, 2023
Merged

Update play-ahc-ws, play-akka-http-server, ... to 3.0.0 #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ec65f0
Update play-ahc-ws, play-akka-http-server, ... to 3.0.0
lunatech-ops Oct 26, 2023
8b7377e
Migrate to Play 3 with Pekko
wjglerum Oct 26, 2023
de60c52
Merge branch 'main' into update/play-ahc-ws-3.0.0
wjglerum Oct 26, 2023
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
4 changes: 2 additions & 2 deletions app/actors/Cleaner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package actors

import akka.actor.{Actor, ActorLogging, ActorRef, ActorSystem}
import cats.data.EitherT
import com.google.inject.name.Named
import com.google.inject.{Inject, Singleton}
import com.typesafe.akka.extension.quartz.QuartzSchedulerExtension
import org.apache.pekko.actor.{Actor, ActorLogging, ActorRef, ActorSystem}
import org.apache.pekko.extension.quartz.QuartzSchedulerExtension
import services.{PeopleService, UnifiService}

import scala.concurrent.ExecutionContext
Expand Down
2 changes: 1 addition & 1 deletion app/filters/TLSFilter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package filters

import akka.stream.Materializer
import com.google.inject.Inject
import org.apache.pekko.stream.Materializer
import play.api.Environment
import play.api.mvc._

Expand Down
4 changes: 2 additions & 2 deletions app/modules/WifiModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package modules

import actors.{Cleaner, CleanerScheduler}
import com.google.inject.AbstractModule
import play.api.libs.concurrent.AkkaGuiceSupport
import play.api.libs.concurrent.PekkoGuiceSupport

class WifiModule extends AbstractModule with AkkaGuiceSupport {
class WifiModule extends AbstractModule with PekkoGuiceSupport {
override def configure(): Unit = {
bindActor[Cleaner]("cleaner-actor")
bind(classOf[CleanerScheduler]).asEagerSingleton()
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ scalaVersion := "2.13.12"

libraryDependencies ++= Seq(
guice, ws,
"com.enragedginger" %% "akka-quartz-scheduler" % "1.9.3-akka-2.6.x",
"io.github.samueleresca" %% "pekko-quartz-scheduler" % "1.0.0-pekko-1.0.x",
"org.typelevel" %% "cats-core" % "2.10.0",
"com.lunatech" %% "play-googleopenconnect" % "2.9.7"
"com.lunatech" %% "play-googleopenconnect" % "3.0.0"
)
2 changes: 1 addition & 1 deletion conf/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ play.ws.ssl.loose.acceptAnyCertificate = true

play.modules.enabled += "modules.WifiModule"

akka {
pekko {
quartz {
schedules {
Clean {
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0")
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.0")

ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always