Skip to content

Commit

Permalink
Play 3.0.5, akka -> pekko (#74)
Browse files Browse the repository at this point in the history
  • Loading branch information
schowsf authored Oct 18, 2024
1 parent 6a455a3 commit d7df53b
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 17 deletions.
5 changes: 3 additions & 2 deletions acdc-ws/app/Module.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion acdc-ws/app/tasks/AuthSettingReloadTask.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion acdc-ws/app/tasks/DataCountTask.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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.{
Expand Down
2 changes: 1 addition & 1 deletion acdc-ws/app/tasks/DataInstExpirationTask.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
14 changes: 7 additions & 7 deletions acdc-ws/conf/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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:
#
# <logger name="akka.actor" level="INFO" />
# <logger name="org.apache.pekko.actor" level="INFO" />
#
# And then uncomment this line to debug the configuration.
#
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.8.2
sbt.version=1.9.6
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")

Expand Down
3 changes: 1 addition & 2 deletions version.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
ThisBuild / version := "0.9.11"

ThisBuild / version := "0.10.0"

0 comments on commit d7df53b

Please sign in to comment.