Skip to content

Commit d7df53b

Browse files
authored
Play 3.0.5, akka -> pekko (#74)
1 parent 6a455a3 commit d7df53b

9 files changed

+17
-17
lines changed

acdc-ws/app/Module.scala

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
*/
77

88
import com.google.inject.AbstractModule
9+
import play.api.libs.concurrent.PekkoGuiceSupport
910

1011
import com.salesforce.mce.kineticpulse.{Metric, PrometheusMetric}
11-
1212
import tasks.{AuthSettingReloadTask, DataCountTask, DataInstExpirationTask}
13+
1314
import utils.{Authorization, AuthorizationSettings}
1415

15-
class Module extends AbstractModule {
16+
class Module extends AbstractModule with PekkoGuiceSupport {
1617

1718
override def configure() = {
1819
// Pass in custom implementation with configs for Authorization

acdc-ws/app/tasks/AuthSettingReloadTask.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import javax.inject.Inject
1111

1212
import scala.concurrent.ExecutionContext
1313

14-
import akka.actor.ActorSystem
14+
import org.apache.pekko.actor.ActorSystem
1515
import play.api.Logging
1616

1717
import utils.Authorization

acdc-ws/app/tasks/DataCountTask.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import javax.inject.Inject
55
import scala.concurrent.ExecutionContext
66
import scala.concurrent.duration.DurationInt
77

8-
import akka.actor.ActorSystem
8+
import org.apache.pekko.actor.ActorSystem
99
import play.api.Logging
1010

1111
import com.salesforce.mce.acdc.db.{

acdc-ws/app/tasks/DataInstExpirationTask.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import javax.inject.Inject
1414
import scala.concurrent.ExecutionContext
1515
import scala.concurrent.duration._
1616

17-
import akka.actor.ActorSystem
17+
import org.apache.pekko.actor.ActorSystem
1818
import play.api.Logging
1919
import services.DatabaseService
2020

acdc-ws/conf/application.conf

+7-7
Original file line numberDiff line numberDiff line change
@@ -59,20 +59,20 @@ com.salesforce.mce.kineticpulse.metrics {
5959

6060
}
6161

62-
## Akka
63-
# https://www.playframework.com/documentation/latest/ScalaAkka#Configuration
64-
# https://www.playframework.com/documentation/latest/JavaAkka#Configuration
62+
## Pekko
63+
# https://www.playframework.com/documentation/latest/ScalaPekko#Configuration
64+
# https://www.playframework.com/documentation/latest/JavaPekko#Configuration
6565
# ~~~~~
66-
# Play uses Akka internally and exposes Akka Streams and actors in Websockets and
66+
# Play uses Pekko internally and exposes Pekko Streams and actors in Websockets and
6767
# other streaming HTTP responses.
68-
akka {
69-
# "akka.log-config-on-start" is extraordinarly useful because it log the complete
68+
pekko {
69+
# "pekko.log-config-on-start" is extraordinarly useful because it log the complete
7070
# configuration at INFO level, including defaults and overrides, so it s worth
7171
# putting at the very top.
7272
#
7373
# Put the following in your conf/logback.xml file:
7474
#
75-
# <logger name="akka.actor" level="INFO" />
75+
# <logger name="org.apache.pekko.actor" level="INFO" />
7676
#
7777
# And then uncomment this line to debug the configuration.
7878
#

build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ val slickVersion = "3.4.1"
22
val jacksonVersion = "2.18.0"
33

44
val scalaTestArtifact = "org.scalatest" %% "scalatest" % "3.2.+" % Test
5-
val kineticpulse = "com.salesforce.mce" %% "kineticpulse-metric" % "0.2.4"
5+
val kineticpulse = "com.salesforce.mce" %% "kineticpulse-metric" % "0.3.0"
66

77
lazy val commonSettings = Seq(
88
scalacOptions ++= Seq("-deprecation", "-feature", "-Xlint"), // , "-Xfatal-warnings"),

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.8.2
1+
sbt.version=1.9.6

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.0")
22

3-
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.5")
3+
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.5")
44

55
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
66

version.sbt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
ThisBuild / version := "0.9.11"
2-
1+
ThisBuild / version := "0.10.0"

0 commit comments

Comments
 (0)