Skip to content

Commit

Permalink
Switch from Akka to Pekko (#17814)
Browse files Browse the repository at this point in the history
* Automated renames by bash script

This commit is exclusively contains changes by the bash script.
For the bash script is present at the pull request.

* Manual pekko migration changes

* adapt fully qualified name references
* adapt pekko package declarations
* adapt bazel files with dependency changes
* adapt canton pekko lib shade_rule
* adapt logger configuration declarations
* pin maven dependencies
* revert incorrect changes by script to compatibility module

Workarounds for further TODOs:
* disable http-json-perf and libs-scala/gatling-utils modules to maintain clean pekko dependencies (without akka)
* disable GraphQLSchemaSpec test (sangria library needs to be upgraded)

* Formatting
  • Loading branch information
nmarton-da authored Nov 13, 2023
1 parent e67fd30 commit 6933514
Showing 614 changed files with 10,173 additions and 14,538 deletions.
2 changes: 1 addition & 1 deletion BAZEL.md
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ da_scala_binary(
main_class = "com.daml.lf.engine.script.ScriptMain",
resources = glob(["src/main/resources/**/*"]),
scala_runtime_deps = [
"@maven//:com_typesafe_akka_akka_slf4j",
"@maven//:org_apache_pekko_pekko_slf4j",
],
scalacopts = lf_scalacopts_stricter,
visibility = ["//visibility:public"],
62 changes: 31 additions & 31 deletions bazel-java-deps.bzl
Original file line number Diff line number Diff line change
@@ -49,9 +49,10 @@ netty_tcnative_version = "2.0.61.Final"
netty_version = "4.1.100.Final"
grpc_version = "1.59.0"
protobuf_version = "3.24.0"
akka_version = "2.6.21"
akka_http_version = "10.2.10"
gatling_version = "3.5.1"
pekko_version = "1.0.1"
pekko_http_version = "1.0.0"

#gatling_version = "3.5.1"
guava_version = "31.1-jre"

# observability libs
@@ -71,8 +72,8 @@ def install_java_deps():
"com.auth0:java-jwt:4.2.1",
"com.auth0:jwks-rsa:0.21.2",
"com.chuusai:shapeless_{}:2.3.6".format(scala_major_version),
"com.fasterxml.jackson.core:jackson-core:2.14.1",
"com.fasterxml.jackson.core:jackson-databind:2.14.1",
"com.fasterxml.jackson.core:jackson-core:2.14.3",
"com.fasterxml.jackson.core:jackson-databind:2.14.3",
"com.github.ben-manes.caffeine:caffeine:3.1.2",
"com.github.blemale:scaffeine_{}:5.2.1".format(scala_major_version),
"com.github.pathikrit:better-files_{}:3.9.1".format(scala_major_version),
@@ -114,20 +115,21 @@ def install_java_deps():
"com.thesamet.scalapb:scalapb-json4s_{}:0.11.1".format(scala_major_version, scalapb_version),
"com.thesamet.scalapb:scalapb-runtime-grpc_{}:{}".format(scala_major_version, scalapb_version),
"com.thesamet.scalapb:scalapb-runtime_{}:{}".format(scala_major_version, scalapb_version),
"com.typesafe.akka:akka-actor-testkit-typed_{}:{}".format(scala_major_version, akka_version),
"com.typesafe.akka:akka-actor-typed_{}:{}".format(scala_major_version, akka_version),
"com.typesafe.akka:akka-actor_{}:{}".format(scala_major_version, akka_version),
"com.typesafe.akka:akka-http-spray-json_{}:{}".format(scala_major_version, akka_http_version),
"com.typesafe.akka:akka-http-testkit_{}:{}".format(scala_major_version, akka_http_version),
"com.typesafe.akka:akka-http_{}:{}".format(scala_major_version, akka_http_version),
"com.typesafe.akka:akka-slf4j_{}:{}".format(scala_major_version, akka_version),
"com.typesafe.akka:akka-stream-testkit_{}:{}".format(scala_major_version, akka_version),
"com.typesafe.akka:akka-stream_{}:{}".format(scala_major_version, akka_version),
"com.typesafe.akka:akka-testkit_{}:{}".format(scala_major_version, akka_version),
"org.apache.pekko:pekko-actor-testkit-typed_{}:{}".format(scala_major_version, pekko_version),
"org.apache.pekko:pekko-actor-typed_{}:{}".format(scala_major_version, pekko_version),
"org.apache.pekko:pekko-actor_{}:{}".format(scala_major_version, pekko_version),
"org.apache.pekko:pekko-http-spray-json_{}:{}".format(scala_major_version, pekko_http_version),
"org.apache.pekko:pekko-http-testkit_{}:{}".format(scala_major_version, pekko_http_version),
"org.apache.pekko:pekko-http_{}:{}".format(scala_major_version, pekko_http_version),
"org.apache.pekko:pekko-slf4j_{}:{}".format(scala_major_version, pekko_version),
"org.apache.pekko:pekko-stream-testkit_{}:{}".format(scala_major_version, pekko_version),
"org.apache.pekko:pekko-stream_{}:{}".format(scala_major_version, pekko_version),
"org.apache.pekko:pekko-testkit_{}:{}".format(scala_major_version, pekko_version),
"com.typesafe.scala-logging:scala-logging_{}:3.9.5".format(scala_major_version),
"com.typesafe.slick:slick-hikaricp_{}:3.3.3".format(scala_major_version),
"com.typesafe.slick:slick_{}:3.3.3".format(scala_major_version),
"com.zaxxer:HikariCP:3.2.0",
"commons-codec:commons-codec:1.11",
"commons-io:commons-io:2.11.0",
"dev.optics:monocle-core_{}:3.2.0".format(scala_major_version),
"dev.optics:monocle-macro_{}:3.2.0".format(scala_major_version),
@@ -141,14 +143,14 @@ def install_java_deps():
"io.dropwizard.metrics:metrics-core:{}".format(dropwizard_version),
"io.dropwizard.metrics:metrics-jmx:{}".format(dropwizard_version),
"io.dropwizard.metrics:metrics-jvm:{}".format(dropwizard_version),
"io.gatling.highcharts:gatling-charts-highcharts:{}".format(gatling_version),
"io.gatling:gatling-app:{}".format(gatling_version),
"io.gatling:gatling-charts:{}".format(gatling_version),
"io.gatling:gatling-commons:{}".format(gatling_version),
"io.gatling:gatling-core:{}".format(gatling_version),
"io.gatling:gatling-http-client:{}".format(gatling_version),
"io.gatling:gatling-http:{}".format(gatling_version),
"io.gatling:gatling-recorder:{}".format(gatling_version),
# "io.gatling.highcharts:gatling-charts-highcharts:{}".format(gatling_version),
# "io.gatling:gatling-app:{}".format(gatling_version),
# "io.gatling:gatling-charts:{}".format(gatling_version),
# "io.gatling:gatling-commons:{}".format(gatling_version),
# "io.gatling:gatling-core:{}".format(gatling_version),
# "io.gatling:gatling-http-client:{}".format(gatling_version),
# "io.gatling:gatling-http:{}".format(gatling_version),
# "io.gatling:gatling-recorder:{}".format(gatling_version),
"io.get-coursier:interface:0.0.21",
"io.github.paoloboni:spray-json-derived-codecs_{}:2.3.10".format(scala_major_version),
"io.grpc:grpc-api:{}".format(grpc_version),
@@ -230,24 +232,22 @@ def install_java_deps():
"org.playframework.anorm:anorm-tokenizer_{}:2.7.0".format(scala_major_version),
"org.playframework.anorm:anorm_{}:2.7.0".format(scala_major_version),
"org.postgresql:postgresql:42.6.0",
"org.reactivestreams:reactive-streams-tck:1.0.2",
"org.reactivestreams:reactive-streams:1.0.2",
"org.reactivestreams:reactive-streams-tck:1.0.4",
"org.reactivestreams:reactive-streams:1.0.4",
"org.reflections:reflections:0.9.12",
"org.sangria-graphql:sangria-spray-json_{}:1.0.2".format(scala_major_version),
"org.sangria-graphql:sangria_{}:2.0.1".format(scala_major_version),
"org.scala-lang.modules:scala-collection-contrib_{}:0.2.2".format(scala_major_version),
"org.scala-lang.modules:scala-parallel-collections_{}:1.0.4".format(scala_major_version),
"org.scala-lang:scala-library:{}".format(scala_version),
"org.scalacheck:scalacheck_{}:1.15.4".format(scala_major_version),
"org.scalactic:scalactic_{}:3.2.9".format(scala_major_version),
"org.scalactic:scalactic_{}:3.2.11".format(scala_major_version),
"org.scalameta:munit_{}:0.7.26".format(scala_major_version),
"org.scalatest:scalatest_{}:3.2.9".format(scala_major_version),
"org.scalatestplus:scalacheck-1-15_{}:3.2.9.0".format(scala_major_version),
"org.scalatestplus:selenium-3-141_{}:3.2.9.0".format(scala_major_version),
"org.scalatestplus:testng-6-7_{}:3.2.9.0".format(scala_major_version),
"org.scalatest:scalatest_{}:3.2.11".format(scala_major_version),
"org.scalatestplus:scalacheck-1-15_{}:3.2.11.0".format(scala_major_version),
"org.scalatestplus:testng-7-5_{}:3.2.11.0".format(scala_major_version),
"org.scalaz:scalaz-core_{}:7.2.33".format(scala_major_version),
"org.scalaz:scalaz-scalacheck-binding_{}:7.2.33-scalacheck-1.15".format(scala_major_version),
"org.seleniumhq.selenium:selenium-java:3.12.0",
"org.slf4j:jul-to-slf4j:2.0.6",
"org.slf4j:jul-to-slf4j:2.0.6",
"org.slf4j:slf4j-api:2.0.6",
Loading

0 comments on commit 6933514

Please sign in to comment.