Skip to content

Commit

Permalink
Revert "Nmarton/pekko rebased (digital-asset#17789)" (digital-asset#1…
Browse files Browse the repository at this point in the history
…7796)

This reverts commit d310692.

@remyhaemmerle-da messed up and merged the PR too fast.
  • Loading branch information
remyhaemmerle-da authored Nov 9, 2023
1 parent d310692 commit 6ef062d
Showing 679 changed files with 15,567 additions and 11,261 deletions.
81 changes: 39 additions & 42 deletions bazel-java-deps.bzl
Original file line number Diff line number Diff line change
@@ -49,13 +49,9 @@ 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"
pekko_version = "1.0.1"
pekko_http_version = "1.0.0"

#gatling_version = "3.5.1"
akka_version = "2.6.21"
akka_http_version = "10.2.10"
gatling_version = "3.5.1"
guava_version = "31.1-jre"

# observability libs
@@ -75,8 +71,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.3",
"com.fasterxml.jackson.core:jackson-databind:2.14.3",
"com.fasterxml.jackson.core:jackson-core:2.14.1",
"com.fasterxml.jackson.core:jackson-databind:2.14.1",
"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),
@@ -93,14 +89,14 @@ def install_java_deps():
"com.google.protobuf:protobuf-java-util:{}".format(protobuf_version),
"com.google.protobuf:protobuf-java:{}".format(protobuf_version),
"com.h2database:h2:2.1.210",
"com.lihaoyi:ammonite-compiler_{}:2.5.9".format(scala_version),
"com.lihaoyi:ammonite-compiler-interface_{}:2.5.9".format(scala_version),
"com.lihaoyi:ammonite-interp-api_{}:2.5.9".format(scala_version),
"com.lihaoyi:ammonite-interp_{}:2.5.9".format(scala_version),
"com.lihaoyi:ammonite-repl_{}:2.5.9".format(scala_version),
"com.lihaoyi:ammonite-runtime_{}:2.5.9".format(scala_version),
"com.lihaoyi:ammonite-util_{}:2.5.9".format(scala_major_version),
"com.lihaoyi:ammonite_{}:2.5.9".format(scala_version),
"com.lihaoyi:ammonite-compiler_{}:2.5.5".format(scala_version),
"com.lihaoyi:ammonite-compiler-interface_{}:2.5.5".format(scala_version),
"com.lihaoyi:ammonite-interp-api_{}:2.5.5".format(scala_version),
"com.lihaoyi:ammonite-interp_{}:2.5.5".format(scala_version),
"com.lihaoyi:ammonite-repl_{}:2.5.5".format(scala_version),
"com.lihaoyi:ammonite-runtime_{}:2.5.5".format(scala_version),
"com.lihaoyi:ammonite-util_{}:2.5.5".format(scala_major_version),
"com.lihaoyi:ammonite_{}:2.5.5".format(scala_version),
"com.lihaoyi:fansi_{}:0.4.0".format(scala_major_version),
"com.lihaoyi:os-lib_{}:0.8.0".format(scala_major_version),
"com.lihaoyi:pprint_{}:0.8.1".format(scala_major_version),
@@ -118,21 +114,20 @@ 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),
"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.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),
"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),
@@ -146,14 +141,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),
@@ -235,22 +230,24 @@ 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.4",
"org.reactivestreams:reactive-streams:1.0.4",
"org.reactivestreams:reactive-streams-tck:1.0.2",
"org.reactivestreams:reactive-streams:1.0.2",
"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.11".format(scala_major_version),
"org.scalactic:scalactic_{}:3.2.9".format(scala_major_version),
"org.scalameta:munit_{}:0.7.26".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.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.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",
16 changes: 8 additions & 8 deletions bazel_tools/scala_version.bzl
Original file line number Diff line number Diff line change
@@ -4,21 +4,21 @@
# Keep the Scala versions in sync with /nix/nixpkgs.nix and /release/src/Options.hs.
# When upgrading download the libraries from maven and then use the sha256sum to generate the checksum.

default_scala_version = "2.13.11"
default_scala_version = "2.13.10"

scala_artifacts = {
"2.13.11": {
"2.13.10": {
"io_bazel_rules_scala_scala_compiler": {
"artifact": "org.scala-lang:scala-compiler:2.13.11",
"sha256": "c5a14770370e73a69367b131da1533890200b1e2aa70643b73f9ff31ef2e69ec",
"artifact": "org.scala-lang:scala-compiler:2.13.10",
"sha256": "2cd4a964ea48e78c91a2a7b19c4fc67a9868728ace5ee966b1d498270b3c3aa7",
},
"io_bazel_rules_scala_scala_library": {
"artifact": "org.scala-lang:scala-library:2.13.11",
"sha256": "71853291f61bda32786a866533361cae474344f5b2772a379179b02112444ed3",
"artifact": "org.scala-lang:scala-library:2.13.10",
"sha256": "e6ca607c3fce03e8fa38af3374ce1f8bb098e316e8bf6f6d27331360feddb1c1",
},
"io_bazel_rules_scala_scala_reflect": {
"artifact": "org.scala-lang:scala-reflect:2.13.11",
"sha256": "6a46ed9b333857e8b5ea668bb254ed8e47dacd1116bf53ade9467aa4ae8f1818",
"artifact": "org.scala-lang:scala-reflect:2.13.10",
"sha256": "62bd7a7198193c5373a992c122990279e413af3307162472a5d3cbb8ecadb35e",
},
},
}
Loading

0 comments on commit 6ef062d

Please sign in to comment.