Skip to content

Commit ea0a7f1

Browse files
committed
Fix PSH version in scripts/akka-to-pekko
1 parent e985c2b commit ea0a7f1

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

.github/workflows/standard-workflow.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ jobs:
143143
- uses: coursier/cache-action@v6
144144
- uses: coursier/setup-action@v1
145145

146+
- run: git fetch --tags
146147
- name: Publish Maven artifacts
147148
run: sbt ci-release
148149
env:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
*.log
33

44
.bsp/
5+
.DS_Store/
56
.idea/
67
.sbt/
78
null/

circe-akka-serializer/src/main/scala/org/virtuslab/ash/circe/AkkaCodecs.scala

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.virtuslab.ash.circe
22

3-
import akka.actor
3+
// scalafix:off
4+
import akka.actor.{ActorSystem => ClassicActorSystem}
45
import akka.actor.typed.ActorRef
56
import akka.actor.typed.ActorRefResolver
67
import akka.actor.typed.ActorSystem
@@ -11,28 +12,29 @@ import akka.stream.StreamRefResolver
1112
import io.circe.Codec
1213
import io.circe.Decoder
1314
import io.circe.Encoder
15+
//scalafix:on
1416

1517
/**
1618
* Default codecs for serializing some of Akka types
1719
*/
1820
trait AkkaCodecs {
19-
private def serializationSystem: actor.ActorSystem = Serialization.getCurrentTransportInformation().system
21+
private def serializationSystem: ClassicActorSystem = Serialization.getCurrentTransportInformation().system
2022

21-
implicit def actorRefCodec[T](implicit system: actor.ActorSystem = serializationSystem): Codec[ActorRef[T]] = {
23+
implicit def actorRefCodec[T](implicit system: ClassicActorSystem = serializationSystem): Codec[ActorRef[T]] = {
2224
val resolver = ActorRefResolver(ActorSystem.wrap(system))
2325
Codec.from(
2426
Decoder.decodeString.map(resolver.resolveActorRef),
2527
Encoder.encodeString.contramap(resolver.toSerializationFormat))
2628
}
2729

28-
implicit def sinkRefCodec[T](implicit system: actor.ActorSystem = serializationSystem): Codec[SinkRef[T]] = {
30+
implicit def sinkRefCodec[T](implicit system: ClassicActorSystem = serializationSystem): Codec[SinkRef[T]] = {
2931
val resolver = StreamRefResolver(ActorSystem.wrap(system))
3032
Codec.from(
3133
Decoder.decodeString.map(resolver.resolveSinkRef),
3234
Encoder.encodeString.contramap(resolver.toSerializationFormat(_: SinkRef[T])))
3335
}
3436

35-
implicit def sourceRefCodec[T](implicit system: actor.ActorSystem = serializationSystem): Codec[SourceRef[T]] = {
37+
implicit def sourceRefCodec[T](implicit system: ClassicActorSystem = serializationSystem): Codec[SourceRef[T]] = {
3638
val resolver = StreamRefResolver(ActorSystem.wrap(system))
3739
Codec.from(
3840
Decoder.decodeString.map(resolver.resolveSourceRef),

scripts/akka-to-pekko.sed

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/<START-AKKA>/, /<END-AKKA>/ d
2+
s/import akka/import org.apache.pekko/
23

34
# All cases where "akka" isn't simply replaced with "pekko"
45
s/"akka\./"org.apache.pekko./
@@ -11,7 +12,6 @@ s/doc\.akka\.io/pekko.apache.org/g
1112
# TODO (#325): use a more proper link once this tutorial is published
1213
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!
1314
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!
14-
s/import akka/import org.apache.pekko/
1515

1616
s/akka/pekko/g
1717
s/Akka/Pekko/g
@@ -21,7 +21,7 @@ s/\<ASH\>/ASH/g
2121
s/("ch\.megard" %% "pekko-http-cors") % ".*"/\1 % "0.0.0-SNAPSHOT"/
2222
s/("org\.apache\.pekko" %% "pekko-grpc-runtime") % ".*"/\1 % "1.0.0-RC2-2-56662643-SNAPSHOT"/
2323
s/("org\.apache\.pekko" % "sbt-pekko-grpc") % ".*"/\1 % "0.0.0-94-0bfb43a6-SNAPSHOT"/
24-
s/("org\.virtuslab\.ash" % "sbt-akka-serialization-helper") % ".*"/\1 % "0.1.0"/
24+
s/("org\.virtuslab\.psh" % "sbt-pekko-serialization-helper") % ".*"/\1 % "0.7.2.1"/
2525
s/(val pekkoHttp2SupportVersion) = .*/\1 = "0.0.0+4272-045c925b-SNAPSHOT"/
2626
s/(val pekkoHttpVersion) = .*/\1 = "1.0.0"/
2727
s/(val pekkoManagementVersion) = .*/\1 = "1.0.0"/

0 commit comments

Comments
 (0)