Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Blg intg 1603/migrate to pekko from akka #160

Merged
merged 2 commits into from
Jul 25, 2024
+20 −20
Merged

Blg intg 1603/migrate to pekko from akka #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e77c090
Update akka dependencies to pekko and change package names
jtakakura Jun 26, 2024
f83ad59
BLG_INTG-1603 Change names containing akka
jtakakura Jun 27, 2024
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
18 changes: 9 additions & 9 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ lazy val commonSettings = Seq(
"-Ywarn-unused"
),
libraryDependencies ++= {
val catsVersion = "2.8.0"
val monixVersion = "3.2.2"
val doobieVersion = "0.9.0"
val akkaVersion = "2.6.17"
val akkaHttpVersion = "10.2.7"
val catsVersion = "2.8.0"
val monixVersion = "3.2.2"
val doobieVersion = "0.9.0"
val pekkoVersion = "1.0.3"
val pekkoHttpVersion = "1.0.1"
Seq(
"org.typelevel" %% "cats-core" % catsVersion,
"org.typelevel" %% "cats-kernel" % catsVersion,
Expand All @@ -25,10 +25,10 @@ lazy val commonSettings = Seq(
"io.monix" %% "monix-reactive" % monixVersion,
"org.tpolecat" %% "doobie-core" % doobieVersion,
"org.tpolecat" %% "doobie-hikari" % doobieVersion,
"com.typesafe.akka" %% "akka-actor" % akkaVersion,
"com.typesafe.akka" %% "akka-stream" % akkaVersion,
"com.typesafe.akka" %% "akka-slf4j" % akkaVersion,
"com.typesafe.akka" %% "akka-http" % akkaHttpVersion,
"org.apache.pekko" %% "pekko-actor" % pekkoVersion,
"org.apache.pekko" %% "pekko-stream" % pekkoVersion,
"org.apache.pekko" %% "pekko-slf4j" % pekkoVersion,
"org.apache.pekko" %% "pekko-http" % pekkoHttpVersion,
"org.xerial" % "sqlite-jdbc" % "3.36.0.3",
"com.nulab-inc" % "backlog4j" % "2.5.2",
"org.typelevel" %% "simulacrum" % "1.0.0",
Expand Down
8 changes: 4 additions & 4 deletions core/src/main/scala/com/nulabinc/backlog/migration/common/conf/BacklogConfiguration.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,18 @@ trait BacklogConfiguration {
}
}

val akkaMailBoxPool = {
val pekkoMailBoxPool = {
try {
external.getInt("application.akka.mailbox-pool")
external.getInt("application.pekko.mailbox-pool")
} catch {
case _: ConfigException =>
internal.getInt("application.akka.mailbox-pool")
internal.getInt("application.pekko.mailbox-pool")
}
}

def getBacklogConfiguration() = {
try {
external.getInt("application.akka.mailbox-pool")
external.getInt("application.pekko.mailbox-pool")
external
} catch {
case _: ConfigException =>
Expand Down
12 changes: 6 additions & 6 deletions ...ion/common/interpreters/AkkaHttpDSL.scala → ...on/common/interpreters/PekkoHttpDSL.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@ package com.nulabinc.backlog.migration.common.interpreters

import java.net.InetSocketAddress

import akka.actor.ActorSystem
import akka.http.scaladsl.model._
import akka.http.scaladsl.model.headers.{BasicHttpCredentials, HttpCredentials}
import akka.http.scaladsl.settings.{ClientConnectionSettings, ConnectionPoolSettings}
import akka.http.scaladsl.{ClientTransport, Http}
import com.nulabinc.backlog.migration.common.dsl.{HttpDSL, HttpQuery, RequestError, ServerDown}
import monix.eval.Task
import org.apache.pekko.actor.ActorSystem
import org.apache.pekko.http.scaladsl.model._
import org.apache.pekko.http.scaladsl.model.headers.{BasicHttpCredentials, HttpCredentials}
import org.apache.pekko.http.scaladsl.settings.{ClientConnectionSettings, ConnectionPoolSettings}
import org.apache.pekko.http.scaladsl.{ClientTransport, Http}
import org.slf4j.LoggerFactory

import scala.concurrent.ExecutionContext
import scala.concurrent.duration._
import scala.util.control.NonFatal
import scala.util.{Failure, Try}

class AkkaHttpDSL()(implicit
class PekkoHttpDSL()(implicit
actorSystem: ActorSystem,
exc: ExecutionContext
) extends HttpDSL[Task] {
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/resources/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ application {
backlog4jVersion = "0.0.2"
export-limit-at-once = 100
language=default
akka.mailbox-pool = 100
pekko.mailbox-pool = 100
defaultRetryCount = 3
iaah = ""
}
Expand Down
Loading