diff --git a/acdc-ws/app/Module.scala b/acdc-ws/app/Module.scala index 9441b16..4bf6261 100644 --- a/acdc-ws/app/Module.scala +++ b/acdc-ws/app/Module.scala @@ -6,13 +6,14 @@ */ import com.google.inject.AbstractModule +import play.api.libs.concurrent.PekkoGuiceSupport import com.salesforce.mce.kineticpulse.{Metric, PrometheusMetric} - import tasks.{AuthSettingReloadTask, DataCountTask, DataInstExpirationTask} + import utils.{Authorization, AuthorizationSettings} -class Module extends AbstractModule { +class Module extends AbstractModule with PekkoGuiceSupport { override def configure() = { // Pass in custom implementation with configs for Authorization diff --git a/acdc-ws/app/tasks/AuthSettingReloadTask.scala b/acdc-ws/app/tasks/AuthSettingReloadTask.scala index 8107c2d..dbfdfe2 100644 --- a/acdc-ws/app/tasks/AuthSettingReloadTask.scala +++ b/acdc-ws/app/tasks/AuthSettingReloadTask.scala @@ -11,7 +11,7 @@ import javax.inject.Inject import scala.concurrent.ExecutionContext -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import play.api.Logging import utils.Authorization diff --git a/acdc-ws/app/tasks/DataCountTask.scala b/acdc-ws/app/tasks/DataCountTask.scala index e58003e..846f21d 100644 --- a/acdc-ws/app/tasks/DataCountTask.scala +++ b/acdc-ws/app/tasks/DataCountTask.scala @@ -5,7 +5,7 @@ import javax.inject.Inject import scala.concurrent.ExecutionContext import scala.concurrent.duration.DurationInt -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import play.api.Logging import com.salesforce.mce.acdc.db.{ diff --git a/acdc-ws/app/tasks/DataInstExpirationTask.scala b/acdc-ws/app/tasks/DataInstExpirationTask.scala index 9b5c6b2..8cb2beb 100644 --- a/acdc-ws/app/tasks/DataInstExpirationTask.scala +++ b/acdc-ws/app/tasks/DataInstExpirationTask.scala @@ -14,7 +14,7 @@ import javax.inject.Inject import scala.concurrent.ExecutionContext import scala.concurrent.duration._ -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import play.api.Logging import services.DatabaseService diff --git a/acdc-ws/conf/application.conf b/acdc-ws/conf/application.conf index b939c08..2b73f2e 100644 --- a/acdc-ws/conf/application.conf +++ b/acdc-ws/conf/application.conf @@ -59,20 +59,20 @@ com.salesforce.mce.kineticpulse.metrics { } -## Akka -# https://www.playframework.com/documentation/latest/ScalaAkka#Configuration -# https://www.playframework.com/documentation/latest/JavaAkka#Configuration +## Pekko +# https://www.playframework.com/documentation/latest/ScalaPekko#Configuration +# https://www.playframework.com/documentation/latest/JavaPekko#Configuration # ~~~~~ -# Play uses Akka internally and exposes Akka Streams and actors in Websockets and +# Play uses Pekko internally and exposes Pekko Streams and actors in Websockets and # other streaming HTTP responses. -akka { - # "akka.log-config-on-start" is extraordinarly useful because it log the complete +pekko { + # "pekko.log-config-on-start" is extraordinarly useful because it log the complete # configuration at INFO level, including defaults and overrides, so it s worth # putting at the very top. # # Put the following in your conf/logback.xml file: # - # + # # # And then uncomment this line to debug the configuration. # diff --git a/build.sbt b/build.sbt index 2b9ce9d..ca60502 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ val slickVersion = "3.4.1" val jacksonVersion = "2.18.0" val scalaTestArtifact = "org.scalatest" %% "scalatest" % "3.2.+" % Test -val kineticpulse = "com.salesforce.mce" %% "kineticpulse-metric" % "0.2.4" +val kineticpulse = "com.salesforce.mce" %% "kineticpulse-metric" % "0.3.0" lazy val commonSettings = Seq( scalacOptions ++= Seq("-deprecation", "-feature", "-Xlint"), // , "-Xfatal-warnings"), diff --git a/project/build.properties b/project/build.properties index 46e43a9..2743082 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.6 diff --git a/project/plugins.sbt b/project/plugins.sbt index a9d6dfe..eda68f9 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.0") -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.5") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.5") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") diff --git a/version.sbt b/version.sbt index 8977c59..0c75cf1 100644 --- a/version.sbt +++ b/version.sbt @@ -1,2 +1 @@ - ThisBuild / version := "0.9.11" - + ThisBuild / version := "0.10.0"