Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/app/actors/Bindings.scala
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package actors

import com.google.inject.AbstractModule
import play.api.libs.concurrent.AkkaGuiceSupport
import play.api.libs.concurrent.PekkoGuiceSupport

class ActorsModule extends AbstractModule with AkkaGuiceSupport {
class ActorsModule extends AbstractModule with PekkoGuiceSupport {
override def configure(): Unit = {
bindActor[ScheduleTasksActor]("ScheduleTasksActor")
bindActor[TaskDispatchActor](
Expand Down
2 changes: 1 addition & 1 deletion api/app/actors/ScheduleTasksActor.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package actors

import akka.actor.{Actor, ActorLogging, Cancellable}
import org.apache.pekko.actor.{Actor, ActorLogging, Cancellable}
import db.InternalTasksDao
import io.apibuilder.task.v0.models.TaskType
import play.api.{Environment, Mode}
Expand Down
2 changes: 1 addition & 1 deletion api/app/actors/TaskActor.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package actors

import akka.actor.{Actor, ActorLogging}
import org.apache.pekko.actor.{Actor, ActorLogging}
import com.google.inject.assistedinject.Assisted
import io.apibuilder.task.v0.models.TaskType
import processor.TaskActorCompanion
Expand Down
2 changes: 1 addition & 1 deletion api/app/actors/TaskDispatchActor.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package actors

import akka.actor._
import org.apache.pekko.actor.*
import io.apibuilder.task.v0.models.TaskType
import play.api.libs.concurrent.InjectedActorSupport
import processor.TaskDispatchActorCompanion
Expand Down
4 changes: 2 additions & 2 deletions api/app/play/LoggingFilter.scala
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.apicollective.play

import akka.stream.Materializer
import org.apache.pekko.stream.Materializer
import play.api.{Logger, Logging}
import play.api.mvc._
import play.api.mvc.*

import scala.concurrent.{ExecutionContext, Future}
import play.api.http.HttpFilters
Expand Down
2 changes: 1 addition & 1 deletion api/app/processor/SyncGeneratorServiceProcessor.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package processor

import akka.actor.ActorSystem
import org.apache.pekko.actor.ActorSystem
import cats.data.Validated.{Invalid, Valid}
import cats.data.ValidatedNec
import cats.implicits.*
Expand Down
2 changes: 1 addition & 1 deletion api/conf/base.conf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ mail.subjectPrefix="[apibuilder]"
# Space separate list of email addresses
apibuilder.sendErrorsTo="[email protected]"

akka {
pekko {
actor {
default-dispatcher {
fork-join-executor {
Expand Down
2 changes: 1 addition & 1 deletion app/conf/base.conf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ play.http.requestHandler = "play.http.DefaultHttpRequestHandler"
apibuilder.supportEmail="[email protected]"
apibuilder.github.oauth.client.secret=${?CONF_APIBUILDER_GITHUB_OAUTH_CLIENT_SECRET}

akka {
pekko {
actor {
default-dispatcher {
fork-join-executor {
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ lazy val api = project
filters,
jdbc,
ws,
"com.typesafe.play" %% "play-guice" % "2.9.4",
"org.playframework" %% "play-guice" % "3.0.6",
"com.google.inject" % "guice" % "5.1.0",
"com.google.inject.extensions" % "guice-assistedinject" % "5.1.0",
"org.projectlombok" % "lombok" % "1.18.42" % "provided",
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ logLevel := Level.Warn
resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/"

// Use the Play sbt plugin for Play projects
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.9")
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.6")

addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.6.10")
addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % "2.0.7")

addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")

Expand Down
Loading