From 49ce40318c8e20ec1bd451f6e3b7f5f28862df62 Mon Sep 17 00:00:00 2001 From: Pawel Lipski <pawel.p.lipski@gmail.com> Date: Thu, 24 Aug 2023 18:17:02 +0200 Subject: [PATCH] Fix PSH version in `scripts/akka-to-pekko` --- .github/workflows/standard-workflow.yml | 1 + .gitignore | 1 + scripts/akka-to-pekko.sed | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/standard-workflow.yml b/.github/workflows/standard-workflow.yml index a9f0fac9..0c5ddb33 100644 --- a/.github/workflows/standard-workflow.yml +++ b/.github/workflows/standard-workflow.yml @@ -143,6 +143,7 @@ jobs: - uses: coursier/cache-action@v6 - uses: coursier/setup-action@v1 + - run: git fetch --tags - name: Publish Maven artifacts run: sbt ci-release env: diff --git a/.gitignore b/.gitignore index d4c726c1..eeacf1e3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *.log .bsp/ +.DS_Store/ .idea/ .sbt/ null/ diff --git a/scripts/akka-to-pekko.sed b/scripts/akka-to-pekko.sed index e8a9caf0..4f88ede6 100644 --- a/scripts/akka-to-pekko.sed +++ b/scripts/akka-to-pekko.sed @@ -1,4 +1,5 @@ /<START-AKKA>/, /<END-AKKA>/ d +s/import akka/import org.apache.pekko/ # All cases where "akka" isn't simply replaced with "pekko" s/"akka\./"org.apache.pekko./ @@ -11,7 +12,6 @@ s/doc\.akka\.io/pekko.apache.org/g # TODO (#325): use a more proper link once this tutorial is published s!https://developer\.lightbend\.com/docs/akka-platform-guide/microservices-tutorial/index\.html!https://github.com/apache/incubator-pekko-platform-guide/blob/main/docs-source/docs/modules/microservices-tutorial/pages/index.adoc! s!https://github\.com/akka/akka-samples/tree/2\.6/akka-sample-cluster-scala!https://github.com/apache/incubator-pekko-samples/tree/forked-from-akka/akka-sample-cluster-scala! -s/import akka/import org.apache.pekko/ s/akka/pekko/g s/Akka/Pekko/g @@ -21,7 +21,7 @@ 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/("org\.virtuslab\.ash" % "sbt-akka-serialization-helper") % ".*"/\1 % "0.1.0"/ +s/("org\.virtuslab\.psh" % "sbt-pekko-serialization-helper") % ".*"/\1 % "0.7.2.1"/ s/(val pekkoHttp2SupportVersion) = .*/\1 = "0.0.0+4272-045c925b-SNAPSHOT"/ s/(val pekkoHttpVersion) = .*/\1 = "1.0.0"/ s/(val pekkoManagementVersion) = .*/\1 = "1.0.0"/