Merge pull request #201 from mcornejo/play_30

Update to play 3.0 and scala 3.3.1
jilen · Nov 11, 2023 · c6721a3 · c6721a3
2 parents 1a11c48 + 4ca024d
commit c6721a3
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -20,6 +20,10 @@ For play 2.8.x
 
 > libraryDependencies += "com.dripower" %% "play-circe" % "2814.1"
 
+For play 3.0.x
+
+> libraryDependencies += "com.dripower" %% "play-circe" % "3000.0"
+
 
 Usage
 -----

diff --git a/build.sbt b/build.sbt
@@ -1,41 +1,32 @@
 import ReleaseTransformations._
 
-organization := "com.dripower"
-name := "play-circe"
-scalaVersion := "2.13.12"
-crossScalaVersions := Seq("2.12.18", "2.13.12", "3.3.1")
+organization := "com.dripower"
+name := "play-circe"
+scalaVersion := "3.3.1"
 
-val playV = "2.8.20"
+val playV = "3.0.0"
 val circeV = "0.14.6"
 
 val crossDeps = Seq(
- "io.circe" %% "circe-core" % circeV,
- "io.circe" %% "circe-parser" % circeV,
- "io.circe" %% "circe-generic" % circeV % Test,
- "org.scalameta" %% "munit" % "1.0.0-M10" % Test,
- "org.hamcrest" % "hamcrest" % "2.2" % Test
+ "io.circe" %% "circe-core" % circeV,
+ "io.circe" %% "circe-parser" % circeV,
+ "io.circe" %% "circe-generic" % circeV % Test,
+ "org.scalameta" %% "munit" % "1.0.0-M10" % Test,
+ "org.hamcrest" % "hamcrest" % "2.2" % Test,
+ "org.playframework" %% "play" % playV % Provided,
+ "org.playframework" %% "play-guice" % playV % Provided
 )
 
-val scala2Deps = Seq(
- "com.typesafe.play" %% "play" % playV % Provided,
- "com.typesafe.play" %% "play-guice" % playV % Provided
-).map(_.cross(CrossVersion.for3Use2_13))
-
-libraryDependencies ++= (crossDeps ++ scala2Deps)
+libraryDependencies ++= crossDeps
 
 scalacOptions := {
- val base = Seq(
+ Seq(
  "-release:11",
  "-deprecation",
  "-encoding",
  "UTF-8",
  "-feature"
  )
- if (scalaVersion.value.startsWith("3.")) {
- base
- } else {
- base ++ Seq("-Xlint")
- }
 }
 
 // POM settings for Sonatype

diff --git a/src/main/scala/play/api/libs/circe/Circe.scala b/src/main/scala/play/api/libs/circe/Circe.scala
@@ -1,7 +1,7 @@
 package play.api.libs.circe
 
-import akka.stream.scaladsl.{Flow, Sink}
-import akka.util.ByteString
+import org.apache.pekko.stream.scaladsl.{Flow, Sink}
+import org.apache.pekko.util.ByteString
 import cats.syntax.all._
 import io.circe.{Codec => _, _}
 import org.slf4j._

diff --git a/src/test/scala/play/api/libs/circe/CirceController.scala b/src/test/scala/play/api/libs/circe/CirceController.scala
@@ -1,6 +1,6 @@
 package play.api.libs.circe
 
-import akka.actor._
+import org.apache.pekko.actor._
 import io.circe.{Printer, Json}
 import io.circe.syntax._
 import play.api.mvc._

diff --git a/src/test/scala/play/api/libs/circe/CirceSpec.scala b/src/test/scala/play/api/libs/circe/CirceSpec.scala
@@ -1,9 +1,9 @@
 package play.api.libs.circe
 
-import akka.actor.ActorSystem
-import akka.stream.Materializer
-import akka.stream.scaladsl.Source
-import akka.util.ByteString
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.util.ByteString
 import io.circe.syntax._
 import play.api.mvc._
 import play.api.inject.guice._

diff --git a/src/test/scala/play/api/libs/circe/Fakes.scala b/src/test/scala/play/api/libs/circe/Fakes.scala
@@ -1,6 +1,6 @@
 package play.api.libs.circe
 
-import akka.util.ByteString
+import org.apache.pekko.util.ByteString
 
 import java.net.URI
 import java.security.cert.X509Certificate

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-ThisBuild / version := "2814.5-SNAPSHOT"
+ThisBuild / version := "3000.0-SNAPSHOT"