Merge pull request #426 from mkurz/pekko

Pekko
playframework · Oct 5, 2023 · c5a1127 · c5a1127
2 parents 08261f2 + 0beaeb4
commit c5a1127
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/build.sbt b/build.sbt
@@ -27,6 +27,9 @@ val ScalatestSeleniumVersion = ScalatestVersion + ".0"
 val ScalatestMockitoVersion  = ScalatestVersion + ".0"
 
 ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("releases")
+// To make use of Pekko snapshots uncomment following two resolvers:
+// ThisBuild / resolvers += Resolver.ApacheMavenSnapshotsRepo
+// ThisBuild / resolvers += Resolver.sonatypeRepo("snapshots")
 
 // Customise sbt-dynver's behaviour to make it work with tags which aren't v-prefixed
 ThisBuild / dynverVTagPrefix := false
@@ -95,7 +98,7 @@ lazy val `scalatestplus-play` = project
     licenses := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0.html")),
     libraryDependencies ++= Seq(
       ws,
-      nettyServer % Test, // Using netty for now, we can switch back to akkaHttpServer when it has Scala 3 artifacts
+      nettyServer % Test, // Using netty for now, we can switch back to pekkoHttpServer when it has Scala 3 artifacts
       playTest,
       "org.scalatest"            %% "scalatest"         % ScalatestVersion,
       "org.scalatestplus"        %% "mockito-4-11"      % ScalatestMockitoVersion,

diff --git a/docs/manual/working/scalaGuide/main/tests/code/ExampleEssentialActionSpec.scala b/docs/manual/working/scalaGuide/main/tests/code/ExampleEssentialActionSpec.scala
@@ -3,7 +3,7 @@
  */
 package scalaguide.tests.scalatest
 
-import akka.stream.Materializer
+import org.apache.pekko.stream.Materializer
 import org.scalatestplus.play._
 import org.scalatestplus.play.guice.GuiceOneAppPerSuite
 import play.api.libs.json.Json

diff --git a/module/src/test/scala/org/scalatestplus/play/MixedFixtureSpec.scala b/module/src/test/scala/org/scalatestplus/play/MixedFixtureSpec.scala
@@ -18,9 +18,9 @@ package org.scalatestplus.play
 
 import java.util.concurrent.atomic.AtomicInteger
 
-import akka.actor.ActorSystem
-import akka.actor.CoordinatedShutdown
-import akka.stream.Materializer
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.actor.CoordinatedShutdown
+import org.apache.pekko.stream.Materializer
 import play.api.http.HttpErrorHandler
 import play.api.http.HttpRequestHandler
 import play.api.inject.Injector

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,7 +2,7 @@ resolvers ++= DefaultOptions.resolvers(snapshot = true)
 resolvers ++= Resolver
   .sonatypeOssRepos("snapshots") // used by deploy nightlies, which publish here & use -Dplay.version
 
-addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.9.0-RC2"))
+addSbtPlugin("org.playframework" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "3.0.0-M1"))
 
 addSbtPlugin("org.scalameta"     % "sbt-scalafmt"    % "2.5.2")
 addSbtPlugin("com.typesafe"      % "sbt-mima-plugin" % "1.1.3")