Mise à jour vers Play 3.0 / Apache Pekko

betagouv · Dec 1, 2023 · 668ed62 · 668ed62
1 parent f1719f7
commit 668ed62
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 20 deletions.
diff --git a/app/filters/SentryFilter.scala b/app/filters/SentryFilter.scala
@@ -1,9 +1,9 @@
 package filters
 
-import akka.stream.Materializer
 import cats.syntax.all._
 import io.sentry.{ITransaction, Sentry, SpanStatus}
 import javax.inject.Inject
+import org.apache.pekko.stream.Materializer
 import play.api.mvc.{Filter, RequestHeader, Result}
 import scala.concurrent.{ExecutionContext, Future}
 import serializers.Keys

diff --git a/app/helper/OvhApi.scala b/app/helper/OvhApi.scala
@@ -4,10 +4,10 @@ import java.nio.charset.StandardCharsets.UTF_8
 import java.security.MessageDigest
 import java.time.ZonedDateTime
 
-import akka.stream.Materializer
-import akka.util.ByteString
 import cats.syntax.all._
 import models.{Error, EventType}
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.util.ByteString
 import play.api.libs.json.{JsValue, Json, Reads, Writes}
 import play.api.libs.ws.{WSClient, WSResponse}
 import play.api.mvc.{PlayBodyParsers, Request}

diff --git a/app/services/EmailsService.scala b/app/services/EmailsService.scala
@@ -1,13 +1,13 @@
 package services
 
-import akka.stream.scaladsl.{RestartSource, Sink, Source}
-import akka.stream.{Materializer, RestartSettings}
 import cats.data.NonEmptyList
 import cats.syntax.all._
 import helper.MiscHelpers
 import javax.inject.{Inject, Singleton}
 import models.EmailPriority
 import modules.AppConfig
+import org.apache.pekko.stream.scaladsl.{RestartSource, Sink, Source}
+import org.apache.pekko.stream.{Materializer, RestartSettings}
 import play.api.Logger
 import play.api.libs.concurrent.MaterializerProvider
 import play.api.libs.mailer.{Email, SMTPConfiguration, SMTPMailer}

diff --git a/app/services/FileService.scala b/app/services/FileService.scala
@@ -1,8 +1,5 @@
 package services
 
-import akka.Done
-import akka.actor.ActorSystem
-import akka.stream.scaladsl._
 import anorm._
 import aplus.macros.Macros
 import cats.syntax.all._
@@ -15,6 +12,9 @@ import javax.inject.{Inject, Singleton}
 import models.{Error, EventType, FileMetadata, User}
 import models.dataModels.FileMetadataRow
 import modules.AppConfig
+import org.apache.pekko.Done
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.scaladsl._
 import play.api.mvc.Request
 import play.api.libs.concurrent.{ActorSystemProvider, MaterializerProvider}
 import play.api.db.Database

diff --git a/app/services/NotificationService.scala b/app/services/NotificationService.scala
@@ -1,7 +1,5 @@
 package services
 
-import akka.stream.scaladsl.{Sink, Source}
-import akka.stream.{ActorAttributes, Materializer, Supervision}
 import cats.syntax.all._
 import constants.Constants
 import controllers.routes
@@ -10,6 +8,8 @@ import java.time.ZoneId
 import java.util.UUID
 import javax.inject.{Inject, Singleton}
 import models._
+import org.apache.pekko.stream.scaladsl.{Sink, Source}
+import org.apache.pekko.stream.{ActorAttributes, Materializer, Supervision}
 import play.api.libs.concurrent.MaterializerProvider
 import play.api.libs.mailer.Email
 import play.api.mvc.Request

diff --git a/app/services/ServicesDependencies.scala b/app/services/ServicesDependencies.scala
@@ -1,8 +1,8 @@
 package services
 
-import akka.actor.ActorSystem
 import cats.effect.unsafe.IORuntime
 import javax.inject.{Inject, Singleton}
+import org.apache.pekko.actor.ActorSystem
 import play.api.inject.ApplicationLifecycle
 import scala.concurrent.{ExecutionContext, Future}
 

diff --git a/app/services/SmsApi.scala b/app/services/SmsApi.scala
@@ -1,10 +1,10 @@
 package services
 
-import akka.stream.Materializer
 import cats.syntax.all._
 import helper.{MessageBirdApi, OvhApi, Time}
 import java.time.ZonedDateTime
 import models.{Error, EventType, Sms, User}
+import org.apache.pekko.stream.Materializer
 import play.api.Configuration
 import play.api.libs.concurrent.Futures
 import play.api.libs.json.Json

diff --git a/app/tasks/AutoAddExpertTask.scala b/app/tasks/AutoAddExpertTask.scala
@@ -2,13 +2,13 @@ package tasks
 
 import java.util.UUID
 
-import akka.actor._
 import cats.syntax.all._
 import helper.Time
 import javax.inject.Inject
 import models.Answer.AnswerType
 import models._
 import modules.AppConfig
+import org.apache.pekko.actor._
 import services._
 
 import scala.concurrent.duration._

diff --git a/app/tasks/RemoveExpiredFilesTask.scala b/app/tasks/RemoveExpiredFilesTask.scala
@@ -5,9 +5,9 @@ import java.io.File
 import java.time.Instant
 import java.time.temporal.ChronoUnit.DAYS
 
-import akka.actor.ActorSystem
 import javax.inject.Inject
 import models.EventType
+import org.apache.pekko.actor.ActorSystem
 import play.api.Configuration
 import services.{EventService, FileService}
 

diff --git a/app/tasks/WeeklyEmailsTask.scala b/app/tasks/WeeklyEmailsTask.scala
@@ -3,11 +3,11 @@ package tasks
 import java.time.temporal.ChronoUnit
 import java.time.{DayOfWeek, ZonedDateTime}
 
-import akka.actor.ActorSystem
 import cats.Eq
 import cats.syntax.all._
 import helper.Time
 import javax.inject.Inject
+import org.apache.pekko.actor.ActorSystem
 import play.api.Configuration
 import services.NotificationService
 

diff --git a/app/tasks/WipeOldDataTask.scala b/app/tasks/WipeOldDataTask.scala
@@ -1,9 +1,9 @@
 package tasks
 
-import akka.actor.ActorSystem
 import java.time.{Duration, ZonedDateTime}
 import javax.inject.Inject
 import models.{EventType, User}
+import org.apache.pekko.actor.ActorSystem
 import play.api.Configuration
 import scala.concurrent.duration._
 import scala.concurrent.ExecutionContext

diff --git a/build.sbt b/build.sbt
@@ -91,8 +91,8 @@ libraryDependencies += guice
 libraryDependencies ++= Seq(
   "org.postgresql" % "postgresql" % "42.7.0",
   anormDependency,
-  "com.typesafe.play" %% "play-mailer" % "9.0.0",
-  "com.typesafe.play" %% "play-json" % "2.10.3",
+  "org.playframework" %% "play-mailer" % "10.0.0",
+  "org.playframework" %% "play-json" % "3.0.1",
   "com.sun.mail" % "javax.mail" % "1.6.2",
   "net.jcazevedo" %% "moultingyaml" % "0.4.2",
   "com.github.tototoshi" %% "scala-csv" % "1.3.10",
@@ -104,7 +104,7 @@ libraryDependencies ++= Seq(
 
 // UI
 libraryDependencies ++= Seq(
-  "org.webjars" %% "webjars-play" % "2.9.0",
+  "org.webjars" %% "webjars-play" % "3.0.0",
   "org.webjars.bower" % "material-design-lite" % "1.3.0",
   "org.webjars" % "material-design-icons" % "4.0.0",
   "org.webjars.npm" % "roboto-fontface" % "0.10.0",

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,7 +1,7 @@
 // The Play plugin
 // Important note: when upgrading the play version, check that the correct minor version
 //                 of jackson is set in build.sbt (with the patch version that is not vulnerable)
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.0")
 addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9")
 addSbtPlugin("com.typesafe.sbt" % "sbt-digest" % "1.1.4")