Merge pull request #68 from playframework/play-3-pekko

Silhouette pekko based with Play 3
playframework · Dec 9, 2023 · 651b2cc · 651b2cc
2 parents 4e7126a + 5f8a0db
commit 651b2cc
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/build.sbt b/build.sbt
@@ -114,11 +114,11 @@ lazy val silhouette = (project in file("silhouette"))
         Library.Specs2.matcherExtra % Test,
         Library.mockito % Test,
         Library.scalaGuice % Test,
-        Library.akkaTestkit % Test
+        Library.pekkoTestkit % Test
       ),
   )
   .enablePlugins(PlayScala)
-  .disablePlugins(PlayAkkaHttpServer)
+  .disablePlugins(PlayPekkoHttpServer)
 
 lazy val silhouetteCas = (project in file("silhouette-cas"))
   .settings(commonSettings)
@@ -210,7 +210,7 @@ lazy val silhouetteTestkit = (project in file("silhouette-testkit"))
         Library.Specs2.matcherExtra % Test,
         Library.mockito % Test,
         Library.scalaGuice % Test,
-        Library.akkaTestkit % Test
+        Library.pekkoTestkit % Test
       )
       ++ {
         CrossVersion.partialVersion(scalaVersion.value) match {

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -23,11 +23,11 @@ object Dependencies {
 
     object Play {
       val version: String = play.core.PlayVersion.current
-      val ws = "com.typesafe.play" %% "play-ws" % version
-      val cache = "com.typesafe.play" %% "play-cache" % version
-      val test = "com.typesafe.play" %% "play-test" % version
-      val specs2 = "com.typesafe.play" %% "play-specs2" % version
-      val openid = "com.typesafe.play" %% "play-openid" % version
+      val ws = "org.playframework" %% "play-ws" % version
+      val cache = "org.playframework" %% "play-cache" % version
+      val test = "org.playframework" %% "play-test" % version
+      val specs2 = "org.playframework" %% "play-specs2" % version
+      val openid = "org.playframework" %% "play-openid" % version
     }
 
     object Specs2 {
@@ -41,7 +41,7 @@ object Dependencies {
     val jbcrypt = "de.svenkubiak" % "jBCrypt" % "0.4.3"
     val jwt = "com.auth0" % "java-jwt" % "3.19.4"
     val scalaGuice = "net.codingwell" %% "scala-guice" % "6.0.0"
-    val akkaTestkit = "com.typesafe.akka" %% "akka-testkit" % play.core.PlayVersion.akkaVersion
+    val pekkoTestkit = "org.apache.pekko" %% "pekko-testkit" % play.core.PlayVersion.pekkoVersion
     val mockito = "org.mockito" % "mockito-core" % "5.3.1"
     val casClient = "org.jasig.cas.client" % "cas-client-core" % "3.6.4"
     val casClientSupportSAML = "org.jasig.cas.client" % "cas-client-support-saml" % "3.6.4"

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,4 +1,4 @@
 addSbtPlugin(dependency = "ch.epfl.scala" % "sbt-version-policy" % "3.1.0")
 addSbtPlugin(dependency = "com.github.sbt" % "sbt-unidoc" % "0.5.0")
-addSbtPlugin(dependency = "com.typesafe.play" % "sbt-plugin" % "2.9.0")
+addSbtPlugin(dependency = "org.playframework" % "sbt-plugin" % "3.0.0")
 addSbtPlugin(dependency = "com.github.sbt" % "sbt-ci-release" % "1.5.12")
diff --git a/silhouette/app/play/silhouette/api/EventBus.scala b/silhouette/app/play/silhouette/api/EventBus.scala
@@ -15,8 +15,8 @@
  */
 package play.silhouette.api
 
-import akka.event.{ ActorEventBus, SubchannelClassification }
-import akka.util.Subclassification
+import org.apache.pekko.event.{ ActorEventBus, SubchannelClassification }
+import org.apache.pekko.util.Subclassification
 import play.api.mvc.RequestHeader
 
 /**

diff --git a/silhouette/test/play/silhouette/api/EventBusSpec.scala b/silhouette/test/play/silhouette/api/EventBusSpec.scala
@@ -15,8 +15,8 @@
  */
 package play.silhouette.api
 
-import akka.actor.{ Actor, ActorSystem, Props }
-import akka.testkit.TestProbe
+import org.apache.pekko.actor.{ Actor, ActorSystem, Props }
+import org.apache.pekko.testkit.TestProbe
 import org.specs2.specification.Scope
 import play.api.test.{ FakeRequest, PlaySpecification, WithApplication }
 

diff --git a/silhouette/test/play/silhouette/api/actions/SecuredActionSpec.scala b/silhouette/test/play/silhouette/api/actions/SecuredActionSpec.scala
@@ -19,8 +19,8 @@ import com.google.inject.AbstractModule
 
 import javax.inject.Inject
 
-import akka.actor.{ Actor, ActorSystem, Props }
-import akka.testkit.TestProbe
+import org.apache.pekko.actor.{ Actor, ActorSystem, Props }
+import org.apache.pekko.testkit.TestProbe
 import play.silhouette.api._
 import play.silhouette.api.actions.SecuredActionSpec._
 import play.silhouette.api.exceptions.{ NotAuthenticatedException, NotAuthorizedException }

diff --git a/silhouette/test/play/silhouette/api/actions/UnsecuredActionSpec.scala b/silhouette/test/play/silhouette/api/actions/UnsecuredActionSpec.scala
@@ -19,8 +19,8 @@ import com.google.inject.AbstractModule
 
 import javax.inject.Inject
 
-import akka.actor.{ Actor, ActorSystem, Props }
-import akka.testkit.TestProbe
+import org.apache.pekko.actor.{ Actor, ActorSystem, Props }
+import org.apache.pekko.testkit.TestProbe
 import play.silhouette.api._
 import play.silhouette.api.actions.UnsecuredActionSpec._
 import play.silhouette.api.exceptions.NotAuthorizedException