From 122be04b0844aff0da580ad542f8575ce1e7f837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre=20Del=C3=A8gue?= Date: Fri, 4 Oct 2024 15:02:29 +0200 Subject: [PATCH] Move to play 3 / pekko --- nio-server/build.sbt | 17 +++++++++++------ nio-server/conf/application.conf | 2 +- project/Dependencies.scala | 4 ++-- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/nio-server/build.sbt b/nio-server/build.sbt index d30c6208..78fa2766 100644 --- a/nio-server/build.sbt +++ b/nio-server/build.sbt @@ -23,6 +23,11 @@ dependencyOverrides ++= Seq( libraryDependencies ++= Seq( ws, + "org.apache.pekko" %% "pekko-stream" % pekko, + "org.apache.pekko" %% "pekko-actor-typed" % pekko, + "org.apache.pekko" %% "pekko-slf4j" % pekko, + "org.apache.pekko" %% "pekko-slf4j" % pekko, + "org.apache.pekko" %% "pekko-serialization-jackson" % pekko, "org.apache.pekko" %% "pekko-http" % "1.1.0", "org.apache.pekko" %% "pekko-http-xml" % "1.1.0", "org.reactivemongo" %% "reactivemongo" % s"$reactiveMongoVersion-pekko.RC13", @@ -57,12 +62,12 @@ scalacOptions ++= Seq( /// ASSEMBLY CONFIG -parallelExecution in Test := false -mainClass in assembly := Some("play.core.server.ProdServerStart") -test in assembly := {} -assemblyJarName in assembly := "nio.jar" -fullClasspath in assembly += Attributed.blank(PlayKeys.playPackageAssets.value) -assemblyMergeStrategy in assembly := { +Test / parallelExecution := false +assembly / mainClass := Some("play.core.server.ProdServerStart") +assembly / test := {} +assembly / assemblyJarName := "nio.jar" +assembly / fullClasspath += Attributed.blank(PlayKeys.playPackageAssets.value) +assembly / assemblyMergeStrategy := { case PathList("javax", xs @ _*) => MergeStrategy.first case PathList("META-INF", "native", xs @ _*) => MergeStrategy.first case PathList("org", "apache", "commons", "logging", xs @ _*) => MergeStrategy.discard diff --git a/nio-server/conf/application.conf b/nio-server/conf/application.conf index b31cc0db..a5f3ccf9 100644 --- a/nio-server/conf/application.conf +++ b/nio-server/conf/application.conf @@ -56,7 +56,7 @@ S3-dispatcher { throughput = 1 } -play.http.secret.key = "nioSecret" +play.http.secret.key = "nioSecretnioSecretnioSecretnioSecretnioSecretnioSecretnioSecretnioSecretnioSecret" play.http.secret.key = ${?APPLICATION_SECRET} http.port=9000 http.port=${?HTTP_PORT} diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 8bdbefdd..fe6ce877 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -1,7 +1,7 @@ object Dependencies { - val playJsonJodaVersion = "2.9.1" val reactiveMongoVersion = "1.1.0" - val pekkoKafka = "1.1.0" + val pekko = "1.1.1" + val pekkoKafka = "1.1.0" val pureConfig = "0.14.0" val scalaticVersion = "3.2.0" val catsVersion = "2.2.0"