Bump Pekko deps

VirtusLab · Sep 6, 2023 · 7efc54a · 7efc54a
1 parent 1659222
commit 7efc54a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/examples/akka-persistence-app/project/plugins.sbt b/examples/akka-persistence-app/project/plugins.sbt
@@ -1,7 +1,9 @@
 resolvers += Resolver.ApacheMavenSnapshotsRepo
 
+val akkaGrpcSbtPluginVersion = "2.1.6"
+
 addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.9")
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.1.6")
+addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % akkaGrpcSbtPluginVersion)
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.1")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0")
 addSbtPlugin("org.virtuslab.ash" % "sbt-akka-serialization-helper" % "0.7.3")
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -5,6 +5,8 @@ object Dependencies {
   val scalaVersion212 = "2.12.18"
 
   val akkaProjectionVersion = "1.2.5"
+  val akkaGrpcRuntimeVersion = "2.1.6"
+  val akkaHttpCorsVersion = "1.2.0"
   val akkaVersion = "2.6.20"
   val borerVersion = "1.8.0"
   val circeYamlVersion = "0.14.2"
@@ -26,8 +28,8 @@ object Dependencies {
   val akkaTestKitTyped = "com.typesafe.akka" %% "akka-actor-testkit-typed" % akkaVersion
   val akkaStreamTestKit = "com.typesafe.akka" %% "akka-stream-testkit" % akkaVersion
 
-  val akkaHttpCors = "ch.megard" %% "akka-http-cors" % "1.2.0" // required by akka-grpc-runtime
-  val akkaGrpc = "com.lightbend.akka.grpc" %% "akka-grpc-runtime" % "2.1.6"
+  val akkaHttpCors = "ch.megard" %% "akka-http-cors" % akkaHttpCorsVersion // required by akka-grpc-runtime
+  val akkaGrpc = "com.lightbend.akka.grpc" %% "akka-grpc-runtime" % akkaGrpcRuntimeVersion
 
   val borerCore = "io.bullet" %% "borer-core" % borerVersion
   val borerDerivation = "io.bullet" %% "borer-derivation" % borerVersion

diff --git a/scripts/akka-to-pekko b/scripts/akka-to-pekko
@@ -5,3 +5,5 @@ set -e -o pipefail -u
 git ls-files | grep -Ev 'akka-to-pekko|logo/|scalafmt\.conf|scala-steward\.conf' | xargs sed -E -f scripts/akka-to-pekko.sed -i
 
 git ls-files | grep -Ev 'akka-to-pekko|logo/' | rename -e 's/akka/pekko/' -e 's/Akka/Pekko/' -e 's/\b(ash)\b/psh/' --make-dirs --stdin
+
+git rm -f .github/dependabot.yml
diff --git a/scripts/akka-to-pekko.sed b/scripts/akka-to-pekko.sed
@@ -6,6 +6,7 @@ s/"akka\./"org.apache.pekko./
 s/akka\.actor\.typed/org.apache.pekko.actor.typed/g
 s/akka\.persistence\.typed/org.apache.pekko.persistence.typed/g
 s/```at akka/```at org.apache.pekko/g
+s/ch\.megard/org.apache.pekko/
 s/com\.lightbend\.akka(\.\w+)?/org.apache.pekko/
 s/com\.typesafe\.akka/org.apache.pekko/g
 s/doc\.akka\.io/pekko.apache.org/g
@@ -18,12 +19,12 @@ s/Akka/Pekko/g
 s/\<ash\>/psh/g
 s/\<ASH\>/ASH/g
 
-s/("ch\.megard" %% "pekko-http-cors") % ".*"/\1 % "0.0.0-SNAPSHOT"/
-s/("org\.apache\.pekko" %% "pekko-grpc-runtime") % ".*"/\1 % "1.0.0-RC2-2-56662643-SNAPSHOT"/
-s/("org\.apache\.pekko" % "sbt-pekko-grpc") % ".*"/\1 % "0.0.0-94-0bfb43a6-SNAPSHOT"/
+s/(val pekkoGrpcRuntimeVersion) = ".*"/\1 = "1.0.0"/
+s/(val pekkoGrpcSbtPluginVersion) = ".*"/\1 = "0.0.0-94-0bfb43a6-SNAPSHOT"/
 s/(val pekkoHttp2SupportVersion) = .*/\1 = "0.0.0+4272-045c925b-SNAPSHOT"/
+s/(val pekkoHttpCorsVersion) = .*/\1 = "1.0.0"/
 s/(val pekkoHttpVersion) = .*/\1 = "1.0.0"/
 s/(val pekkoManagementVersion) = .*/\1 = "1.0.0"/
-s/(val pekkoPersistenceJdbcVersion) = .*/\1 = "0.0.0+998-6a9e5841-SNAPSHOT"/
-s/(val pekkoProjectionVersion) = .*/\1 = "0.0.0+68-6f80a745-SNAPSHOT"/
+s/(val pekkoPersistenceJdbcVersion) = .*/\1 = "1.0.0"/
+s/(val pekkoProjectionVersion) = .*/\1 = "0.0.0+75-1d3f6fab-SNAPSHOT"/
 s/(val pekkoVersion) = .*/\1 = "1.0.1"/