Skip to content

Commit

Permalink
JS-2090 Pekko replaces Akka
Browse files Browse the repository at this point in the history
  • Loading branch information
@Zschimmer
Zschimmer committed Nov 1, 2023
1 parent 4bfcce7 commit 25381b2
Show file tree
Hide file tree
Showing 257 changed files with 1,525 additions and 1,526 deletions.
105 changes: 53 additions & 52 deletions build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
*
* sbt allows to preset these command line options in the environment variable SBT_OPTS.
*/
import BuildUtils._
import BuildUtils.*
import java.nio.file.Paths
import sbt.Keys.testOptions
import sbt.file
Expand Down Expand Up @@ -159,7 +159,7 @@ val commonSettings = Seq(
if (sys.props.contains("evictionWarnings"))
Nil
else {
import Dependencies._
import Dependencies.*
cats ++
("org.typelevel" %% "cats-core" % catsVersion) ++
("org.typelevel" %% "cats-effect" % catsEffectVersion) ++
Expand Down Expand Up @@ -241,7 +241,7 @@ lazy val `js7-install` = project
.settings(commonSettings)
.enablePlugins(JavaAppPackaging, UniversalDeployPlugin)
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies ++= log4j ++ lmaxDisruptor
}
.settings(
Expand All @@ -263,7 +263,7 @@ lazy val `js7-install` = project
lazy val `js7-docker` = project
.settings(commonSettings)
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies ++= log4j ++ lmaxDisruptor
}
.enablePlugins(JavaAppPackaging, UniversalDeployPlugin)
Expand All @@ -278,7 +278,7 @@ lazy val `js7-tester` = crossProject(JSPlatform, JVMPlatform)
.withoutSuffixFor(JVMPlatform)
.settings(commonSettings)
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies ++=
diffx ++
slf4j ++
Expand All @@ -295,7 +295,7 @@ lazy val `js7-base` = crossProject(JSPlatform, JVMPlatform)
.dependsOn(`js7-tester` % "test")
.settings(commonSettings)
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies ++=
"dev.zio" %%% "izumi-reflect" % izumiReflectVersion ++
"org.typelevel" %%% "cats-core" % catsVersion ++
Expand Down Expand Up @@ -323,7 +323,7 @@ lazy val `js7-base` = crossProject(JSPlatform, JVMPlatform)
"org.scalacheck" %%% "scalacheck" % scalaCheckVersion % "test"
}
.jvmSettings {
import Dependencies._
import Dependencies.*
libraryDependencies ++=
scalaLogging ++ log4j % "test" ++ lmaxDisruptor % "test" ++
typesafeConfig ++
Expand Down Expand Up @@ -367,7 +367,7 @@ lazy val `js7-data` = crossProject(JSPlatform, JVMPlatform)
.dependsOn(`js7-base`, `js7-base` % "test->test", `js7-tester` % "test")
.settings(commonSettings)
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies ++=
"org.scalatest" %%% "scalatest" % scalaTestVersion % "test" ++
//"org.scalatest" %%% "scalatest-freespec" % scalaTestVersion % "test" ++
Expand All @@ -383,7 +383,7 @@ lazy val `js7-data-for-java` = project
`js7-tester`.jvm % "test")
.settings(commonSettings)
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies ++=
typesafeConfig ++
"io.vavr" % "vavr" % vavrVersion ++
Expand All @@ -401,13 +401,13 @@ lazy val `js7-common` = project
`js7-tester`.jvm % "test")
.settings(commonSettings)
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies ++=
typesafeConfig ++
akkaHttp ++
akkaActor ++
akkaSlf4j ++
akkaHttpTestkit % "test" ++
pekkoHttp ++
pekkoActor ++
pekkoSlf4j ++
pekkoHttpTestkit % "test" ++
javaxInject ++
guice ++
findbugs ++
Expand All @@ -426,14 +426,14 @@ lazy val `js7-common-http` = crossProject(JSPlatform, JVMPlatform)
.jvmConfigure(_.dependsOn(`js7-common`))
.settings(commonSettings)
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies ++= scalaTest % "test"
libraryDependencies += "io.monix" %%% "monix-eval" % monixVersion
}
.jvmSettings {
import Dependencies._
import Dependencies.*
libraryDependencies ++=
akkaHttp ++
pekkoHttp ++
scalaLogging ++
log4j % "test" ++
lmaxDisruptor % "test"
Expand All @@ -454,10 +454,10 @@ lazy val `js7-controller` = project
.settings(
Compile / packageDoc / mappings := Seq.empty)
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies ++=
scalaTest % "test" ++
akkaHttpTestkit % "test" ++
pekkoHttpTestkit % "test" ++
log4j % "test" ++
lmaxDisruptor % "test"
}
Expand All @@ -470,7 +470,7 @@ lazy val `js7-provider` = project
.settings(
Compile / packageDoc / mappings := Seq.empty)
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies ++=
scalaTest % "test" ++
log4j % "test" ++
Expand All @@ -489,15 +489,15 @@ lazy val `js7-proxy` = crossProject(JSPlatform, JVMPlatform)
.settings(commonSettings)
.settings(
libraryDependencies ++= {
import Dependencies._
import Dependencies.*
"org.scalatest" %%% "scalatest" % scalaTestVersion % "test" ++
Nil/*++
"org.scalatest" %%% "scalatest-freespec" % scalaTestVersion % "test"*/
})
.jvmSettings(
libraryDependencies ++= {
import Dependencies._
akkaHttp ++
import Dependencies.*
pekkoHttp ++
hamcrest % "test" ++
log4j % "test" ++
lmaxDisruptor % "test"
Expand All @@ -514,14 +514,14 @@ lazy val `js7-controller-client` = crossProject(JSPlatform, JVMPlatform)
.settings(commonSettings)
.settings(
libraryDependencies += {
import Dependencies._
import Dependencies.*
"org.scalatest" %%% "scalatest" % scalaTestVersion % "test" /*++
"org.scalatest" %%% "scalatest-freespec" % scalaTestVersion % "test"*/
})
.jvmSettings(
libraryDependencies ++= {
import Dependencies._
akkaHttp ++
import Dependencies.*
pekkoHttp ++
log4j % "test" ++
lmaxDisruptor % "test"
})
Expand All @@ -533,11 +533,11 @@ lazy val `js7-core` = project
`js7-service-pgp` % "test")
.settings(commonSettings)
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies ++=
tagging ++
diffx ++
akkaHttpTestkit % "test" ++
pekkoHttpTestkit % "test" ++
scalaTest % "test" ++
scalaCheck % "test" ++ log4j % "test" ++
lmaxDisruptor % "test"
Expand All @@ -547,7 +547,7 @@ lazy val `js7-launcher` = project
.dependsOn(`js7-launcher-for-windows`, `js7-core`, `js7-base`.jvm % "test->test", `js7-tester`.jvm % "test")
.settings(commonSettings)
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies ++=
scalaTest % "test" ++
scalaCheck % "test" ++
Expand All @@ -559,8 +559,9 @@ lazy val `js7-launcher-for-java` = project
.dependsOn(`js7-launcher`, `js7-data-for-java`, `js7-base`.jvm % "test->test", `js7-tester`.jvm % "test")
.settings(commonSettings)
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies ++=
java8Compat ++
"io.vavr" % "vavr" % vavrVersion ++
hamcrest % "test" ++
scalaTest % "test" ++
Expand All @@ -573,7 +574,7 @@ lazy val `js7-launcher-for-windows` = project
.dependsOn(`js7-base`.jvm, `js7-base`.jvm % "test->test", `js7-tester`.jvm % "test")
.settings(commonSettings)
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies ++=
jna ++
scalaTest % "test" ++
Expand All @@ -585,10 +586,10 @@ lazy val `js7-journal` = project
.dependsOn(`js7-common-http`.jvm, `js7-common`, `js7-base`.jvm % "test->test", `js7-tester`.jvm % "test")
.settings(commonSettings)
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies ++=
akkaHttp ++
akkaHttpTestkit % "test" ++
pekkoHttp ++
pekkoHttpTestkit % "test" ++
guice ++
tagging ++
diffx ++
Expand All @@ -605,10 +606,10 @@ lazy val `js7-cluster` = project
`js7-base`.jvm % "test->test", `js7-tester`.jvm % "test", `js7-license-fake` % "test")
.settings(commonSettings)
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies ++=
diffx ++
akkaHttpTestkit % "test" ++
pekkoHttpTestkit % "test" ++
scalaTest % "test" ++
scalaCheck % "test" ++
log4j % "test" ++
Expand All @@ -624,7 +625,7 @@ lazy val `js7-cluster-watch-api` = crossProject(JSPlatform, JVMPlatform)
`js7-tester` % "test")
.settings(commonSettings)
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies ++=
diffx ++
scalaTest % "test" ++
Expand All @@ -641,7 +642,7 @@ lazy val `js7-cluster-watch` = project
`js7-tester`.jvm % "test")
.settings(commonSettings)
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies ++=
diffx ++
scalaTest % "test" ++
Expand All @@ -658,14 +659,14 @@ lazy val `js7-agent` = project
`js7-service-pgp` % "test")
.settings(commonSettings)
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies ++=
findbugs ++
akkaActor ++
akkaStream ++
akkaSlf4j ++
akkaHttpTestkit % "test" ++
akkaHttp ++
pekkoActor ++
pekkoStream ++
pekkoSlf4j ++
pekkoHttpTestkit % "test" ++
pekkoHttp ++
intelliJAnnotations % "compile" ++
guice ++
scalaTest % "test" ++
Expand All @@ -682,7 +683,7 @@ lazy val `js7-subagent` = project
`js7-tester`.jvm % "test")
.settings(commonSettings)
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies ++=
intelliJAnnotations % "compile" ++
scalaTest % "test" ++
Expand All @@ -697,12 +698,12 @@ lazy val `js7-agent-client` = project
.settings(commonSettings)
.settings(description := "JS7 Agent - Client")
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies ++=
guice ++
"io.monix" %% "monix-reactive" % monixVersion ++
akkaActor ++
akkaHttp ++
pekkoActor ++
pekkoHttp ++
scalaTest % "test" ++
log4j % "test" ++
lmaxDisruptor % "test"
Expand All @@ -713,7 +714,7 @@ lazy val `js7-agent-data` = project
.settings(commonSettings)
.settings(description := "JS7 Agent - Value Classes")
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies ++=
findbugs ++
intelliJAnnotations % "compile" ++
Expand All @@ -736,7 +737,7 @@ lazy val `js7-service-pgp` = project
`js7-tester`.jvm % "test")
.settings(commonSettings)
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies += bouncyCastle
}

Expand All @@ -763,9 +764,9 @@ lazy val `js7-tests` = project
publish / skip := true,
description := "JS7 Tests")
.settings {
import Dependencies._
import Dependencies.*
libraryDependencies ++=
akkaHttpTestkit % "test" ++ // For IntelliJ IDEA 2018.2
pekkoHttpTestkit % "test" ++ // For IntelliJ IDEA 2018.2
scalaTest ++
diffx % "test" ++
diffxScalaTest % "test" ++
Expand Down
4 changes: 2 additions & 2 deletions js7-agent-client/src/main/resources/js7/agent/client/main/log4j2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<root level="WARN">
<appenderRef ref="stderr"/>
</root>
<logger level="warn" name="akka.actor.CoordinatedShutdown"/>
<logger level="warn" name="akka.event.slf4j.Slf4jLogger"/>
<logger level="warn" name="org.apache.pekko.actor.CoordinatedShutdown"/>
<logger level="warn" name="org.apache.pekko.event.slf4j.Slf4jLogger"/>
</loggers>
</configuration>
6 changes: 3 additions & 3 deletions js7-agent-client/src/main/scala/js7/agent/client/AgentClient.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package js7.agent.client

import akka.actor.ActorSystem
import js7.agent.data.AgentApi
import js7.agent.data.AgentState.keyedEventJsonCodec
import js7.agent.data.commands.AgentCommand
Expand All @@ -12,11 +11,12 @@ import js7.base.io.https.HttpsConfig
import js7.base.problem.Checked
import js7.base.session.SessionApi
import js7.base.web.Uri
import js7.common.http.AkkaHttpClient
import js7.common.http.PekkoHttpClient
import js7.data.event.{Event, EventRequest, KeyedEvent, Stamped}
import js7.data.session.HttpSessionApi
import monix.eval.Task
import monix.reactive.Observable
import org.apache.pekko.actor.ActorSystem

/**
* Client for JS7 Agent.
Expand All @@ -25,7 +25,7 @@ import monix.reactive.Observable
* @author Joacim Zschimmer
*/
trait AgentClient
extends AgentApi with HttpSessionApi with AkkaHttpClient
extends AgentApi with HttpSessionApi with PekkoHttpClient
with SessionApi.HasUserAndPassword
{
protected def httpClient = this
Expand Down
Loading

0 comments on commit 25381b2

Please sign in to comment.