Merge pull request #7 from coreywoodfield/pekko

Migrate from akka to pekko

.github/workflows/ci.yaml

@@ -34,7 +34,7 @@ jobs:
       - name: Test
         run: sbt test
   publish:
-    if: ${{ github.event_name != 'pull_request' }} && (github.repository == 'lucidsoftware/akka-thread-context')
+    if: ${{ github.event_name != 'pull_request' }} && (github.repository == 'lucidsoftware/pekko-thread-context')
     needs: build
     runs-on: ubuntu-20.04
     steps:
@@ -54,7 +54,7 @@ jobs:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
   release:
-    if: ${{ startsWith(github.ref, 'refs/tags') && (github.repository == 'lucidsoftware/akka-thread-context') }}
+    if: ${{ startsWith(github.ref, 'refs/tags') && (github.repository == 'lucidsoftware/pekko-thread-context') }}
     runs-on: ubuntu-latest
     needs: build
     steps:
@@ -66,8 +66,4 @@ jobs:
       - name: Upload Assets
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          set -x
-         tag="${GITHUB_REF#refs/tags/}"
-         targets=($(printf -- "-a %s " */target/*.jar))
-         hub release create "${targets[@]}" -m "Release $tag" $tag
+        run: bash release.sh

README.md

@@ -1,23 +1,23 @@
-# Akka actor thread context
+# Pekko actor thread context
 
-[![Build Status](https://travis-ci.com/lucidsoftware/akka-thread-context.svg?branch=master)](https://travis-ci.com/lucidsoftware/akka-thread-context)
-![Maven Version](https://img.shields.io/maven-central/v/com.lucidchart/akka-actor-thread-context_2.11.svg)
+[![Build Status](https://travis-ci.com/lucidsoftware/pekko-thread-context.svg?branch=master)](https://travis-ci.com/lucidsoftware/pekko-thread-context)
+![Maven Version](https://img.shields.io/maven-central/v/com.lucidchart/pekko-actor-thread-context_2.13.svg)
 
-Propagate thread-local values across Akka actors. See
+Propagate thread-local values across Pekko actors. See
 [java-thread-context](https://github.com/lucidsoftware/java-thread-context).
 
 Currently works only for local actor systems.
 
 ## Install
 
 ```scala
-libraryDependencies += "com.lucidchart" %% "akka-actor-thread-context" % "<version>"
+libraryDependencies += "com.lucidchart" %% "pekko-actor-thread-context" % "<version>"
 ```
 
 ## Usage
 
 In the configuration for your actor system,
 
 ```hocon
-actor.default-dispatcher.type = com.lucidchart.akka.threadcontext.DefaultDispatcherConfigurator
+actor.default-dispatcher.type = com.lucidchart.pekko.threadcontext.DefaultDispatcherConfigurator
 ```

build.sbt

@@ -1,23 +1,23 @@
-lazy val `akka-actor-thread-context` = project.cross
+lazy val `pekko-actor-thread-context` = project.cross
 
 lazy val commonSettings = Seq(publishTo := sonatypePublishToBundle.value)
 
-lazy val `akka-actor-thread-context_2.12` = `akka-actor-thread-context`("2.12.14").settings(commonSettings)
-lazy val `akka-actor-thread-context_2.13` = `akka-actor-thread-context`("2.13.6").settings(commonSettings)
+lazy val `pekko-actor-thread-context_2.12` = `pekko-actor-thread-context`("2.12.14").settings(commonSettings)
+lazy val `pekko-actor-thread-context_2.13` = `pekko-actor-thread-context`("2.13.12").settings(commonSettings)
 
 inScope(Global)(Seq(
   credentials += Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", sys.env.getOrElse("SONATYPE_USERNAME", ""), sys.env.getOrElse("SONATYPE_PASSWORD", "")),
   developers += Developer("pauldraper", "Paul Draper", "paulddraper@gmail.com", url("https://github.com/pauldraper")),
-  homepage := Some(url("https://git.lucidchart.com/lucidsoftware/akka-thread-context")),
+  homepage := Some(url("https://git.lucidchart.com/lucidsoftware/pekko-thread-context")),
   licenses += "Apache 2.0 License" -> url("https://www.apache.org/licenses/LICENSE-2.0"),
   organization := "com.lucidchart",
   organizationHomepage := Some(url("http://github.com/lucidsoftware")),
   organizationName := "Lucid Software",
   resolvers += Resolver.typesafeRepo("releases"),
-  scalaVersion := "2.13.6",
+  scalaVersion := "2.13.12",
   scmInfo := Some(ScmInfo(
-    url("https://github.com/lucidsoftware/akka-thread-context"),
-    "scm:git:git@github.com:lucidsoftware/akka-thread-context.git"
+    url("https://github.com/lucidsoftware/pekko-thread-context"),
+    "scm:git:git@github.com:lucidsoftware/pekko-thread-context.git"
   )),
   startYear := Some(2017),
   publishMavenStyle := true,

akka-actor-thread-context/build.sbt → pekko-actor-thread-context/build.sbt

@@ -1,5 +1,5 @@
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %% "akka-actor" % "2.6.15",
+  "org.apache.pekko" %% "pekko-actor" % "1.0.2",
   "com.lucidchart" % "thread-context" % "0.7"
 )
 publishTo := sonatypePublishToBundle.value

akka-actor-thread-context/src/main/scala-2.11/com/lucidchart/akka/threadcontext/DispatcherConfigurator.scala → pekko-actor-thread-context/src/main/scala-2.11/com/lucidchart/pekko/threadcontext/DispatcherConfigurator.scala

@@ -1,6 +1,6 @@
-package com.lucidchart.akka.threadcontext
+package com.lucidchart.pekko.threadcontext
 
-import akka.dispatch.{Dispatcher, DispatcherPrerequisites, MessageDispatcherConfigurator}
+import org.apache.pekko.dispatch.{Dispatcher, DispatcherPrerequisites, MessageDispatcherConfigurator}
 import com.github.threadcontext.Context
 import com.typesafe.config.Config
 import java.util.concurrent.TimeUnit

akka-actor-thread-context/src/main/scala-2.12/com/lucidchart/akka/threadcontext/DispatcherConfigurator.scala → pekko-actor-thread-context/src/main/scala-2.12/com/lucidchart/pekko/threadcontext/DispatcherConfigurator.scala

@@ -1,6 +1,6 @@
-package com.lucidchart.akka.threadcontext
+package com.lucidchart.pekko.threadcontext
 
-import akka.dispatch.{Dispatcher, DispatcherPrerequisites, MessageDispatcherConfigurator}
+import org.apache.pekko.dispatch.{Dispatcher, DispatcherPrerequisites, MessageDispatcherConfigurator}
 import com.github.threadcontext.Context
 import com.typesafe.config.Config
 import java.util.concurrent.TimeUnit

akka-actor-thread-context/src/main/scala-2.13/com/lucidchart/akka/threadcontext/DispatcherConfigurator.scala → pekko-actor-thread-context/src/main/scala-2.13/com/lucidchart/pekko/threadcontext/DispatcherConfigurator.scala

@@ -1,6 +1,6 @@
-package com.lucidchart.akka.threadcontext
+package com.lucidchart.pekko.threadcontext
 
-import akka.dispatch.{Dispatcher, DispatcherPrerequisites, MessageDispatcherConfigurator}
+import org.apache.pekko.dispatch.{Dispatcher, DispatcherPrerequisites, MessageDispatcherConfigurator}
 import com.github.threadcontext.Context
 import com.typesafe.config.Config
 import java.util.concurrent.TimeUnit

akka-actor-thread-context/src/main/scala/com/lucidchart/akka/threadcontext/DefaultDispatcherConfigurator.scala → pekko-actor-thread-context/src/main/scala/com/lucidchart/pekko/threadcontext/DefaultDispatcherConfigurator.scala

@@ -1,6 +1,6 @@
-package com.lucidchart.akka.threadcontext
+package com.lucidchart.pekko.threadcontext
 
-import akka.dispatch.DispatcherPrerequisites
+import org.apache.pekko.dispatch.DispatcherPrerequisites
 import com.github.threadcontext.Context
 import com.typesafe.config.Config
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.5.4
+sbt.version=1.8.2

project/build.sbt

@@ -1,5 +1,5 @@
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
 
 addSbtPlugin("com.lucidchart" % "sbt-cross" % "4.0")
 
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.2")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.18")

release.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -x
+tag="${GITHUB_REF#refs/tags/}"
+targets=($(printf -- "-a %s " */target/*.jar))
+hub release create "${targets[@]}" -m "Release $tag" $tag