Cross compile with Scala 3 (#931)

Author: jchyb

.github/workflows/ci.yml

@@ -101,6 +101,52 @@ jobs:
       - name: Run tests
         id: run-tests
         run: SCALA_MAJOR_VERSION=${{ env.scala }} sbt root/test
+  ci-3:
+    # run on external PRs, but not on internal PRs since those will be run by push to branch
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
+    runs-on: ubuntu-20.04
+    env:
+      scala: 3
+    steps:
+      - name: Check-out repository
+        id: repo-checkout
+        uses: actions/checkout@v2
+
+      - name: Set up JDK
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: 8
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - name: Install AWS cli 1
+        run: |
+          curl "https://s3.amazonaws.com/aws-cli/awscli-bundle-1.27.127.zip" -o "awscliv1.zip"
+          unzip -qq ./awscliv1.zip
+          sudo ./awscli-bundle/install -i /usr/local/aws1 -b /usr/local/bin/aws1
+
+      - name: Install AWS cli 2
+        run: |
+          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+          unzip -qq ./awscliv2.zip
+          sudo ./aws/install -i /usr/local/aws2 -b /usr/local/bin/aws2
+
+      - name: Cache SBT
+        id: cache-sbt
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.sbt
+            ~/.ivy2/cache
+            ~/.coursier
+          key: ${{ runner.os }}-sbt-${{ env.scala }}-${{ hashFiles('**/build.sbt') }}
+
+      - name: Run tests
+        id: run-tests
+        run: SCALA_MAJOR_VERSION=${{ env.scala }} sbt root/test
 
   ci-docker:
     # run on external PRs, but not on internal PRs since those will be run by push to branch
@@ -143,7 +189,7 @@ jobs:
         run: sbt "project nativeServer; Docker / publishLocal"
 
   publish-jar:
-    needs: [ci-2-12, ci-2-13, ci-docker]
+    needs: [ci-2-12, ci-2-13, ci-3, ci-docker]
     if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))
     runs-on: ubuntu-20.04
     steps:
@@ -202,7 +248,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   publish-docker:
-    needs: [ci-2-12, ci-2-13, ci-docker]
+    needs: [ci-2-12, ci-2-13, ci-3, ci-docker]
     if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))
     runs-on: ubuntu-20.04
     steps:

build.sbt

@@ -10,11 +10,13 @@ import scala.sys.process.Process
 
 val v2_12 = "2.12.15"
 val v2_13 = "2.13.8"
+val v3    = "3.3.1"
 
 lazy val resolvedScalaVersion =
   sys.env.get("SCALA_MAJOR_VERSION") match {
     case Some("2.12")      => v2_12
     case Some("2.13")      => v2_13
+    case Some("3")         => v3
     case Some(unsupported) => throw new IllegalArgumentException(s"Unsupported SCALA_MAJOR_VERSION: $unsupported")
     case _                 => v2_13
   }
@@ -26,7 +28,7 @@ lazy val ensureDockerBuildx = taskKey[Unit]("Ensure that docker buildx configura
 lazy val dockerBuildWithBuildx = taskKey[Unit]("Build docker images using buildx")
 
 val config = "com.typesafe" % "config" % "1.4.3"
-val pureConfig = "com.github.pureconfig" %% "pureconfig" % "0.17.4"
+val pureConfig = "com.github.pureconfig" %% "pureconfig-core" % "0.17.4"
 val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "2.2.0"
 
 val scalalogging = "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5"
@@ -55,9 +57,10 @@ val springVersion = "5.3.31"
 val awsSpringMessaging = "org.springframework.cloud" % "spring-cloud-aws-messaging" % awsSpringMessagingVersion
 val springWeb = "org.springframework" % "spring-web" % springVersion
 
-val scalaAsync = "org.scala-lang.modules" %% "scala-async" % "1.0.1"
+val scala2Async = "org.scala-lang.modules" %% "scala-async" % "1.0.1"
+val scala3Async = "com.github.rssh" %% "shim-scala-async-dotty-cps-async" % "0.9.19" // allows cross compilation w/o changes in source code
 
-val scalikeJdbc = "org.scalikejdbc" %% "scalikejdbc" % "3.5.0"
+val scalikeJdbc = "org.scalikejdbc" %% "scalikejdbc" % "4.1.0"
 val h2 = "com.h2database" % "h2" % "2.2.224"
 
 val common = Seq(scalalogging)
@@ -74,7 +77,12 @@ val buildSettings = commonSmlBuildSettings ++ ossPublishSettings ++ Seq(
     ScmInfo(url("https://github.com/softwaremill/elasticmq"), "scm:git@github.com:softwaremill/elasticmq.git")
   ),
   scalaVersion := resolvedScalaVersion,
-  scalacOptions ++= Seq("-Xasync", "-target:jvm-1.8"),
+  scalacOptions ++= {
+    CrossVersion.partialVersion(scalaVersion.value) match {
+      case Some((3, _)) => Seq("-Xtarget:8")
+      case _            => Seq("-Xasync", "-target:jvm-1.8")
+    }
+  },
   libraryDependencies += scalaXml,
   dependencyOverrides := pekko100verrides,
   parallelExecution := false,
@@ -131,7 +139,10 @@ lazy val persistenceCore: Project = (project in file("persistence/persistence-co
         pekkoSlf4j,
         config,
         pekkoTestkit,
-        scalaAsync
+        CrossVersion.partialVersion(scalaVersion.value) match {
+          case Some((3, _)) => scala3Async
+          case _            => scala2Async
+        }
       ) ++ common
     )
   )
@@ -180,7 +191,10 @@ lazy val restSqs: Project = (project in file("rest/rest-sqs"))
         pekkoHttpSprayJson,
         pekkoTestkit,
         pekkoHttpTestkit,
-        scalaAsync
+        CrossVersion.partialVersion(scalaVersion.value) match {
+          case Some((3, _)) => scala3Async
+          case _            => scala2Async
+        }
       ) ++ common
     )
   )

core/src/main/scala/org/elasticmq/DeliveryReceipt.scala

@@ -13,5 +13,5 @@ object DeliveryReceipt {
   private val Separator = "#"
 
   def generate(id: MessageId) =
-    new DeliveryReceipt(id + Separator + UUID.randomUUID().toString)
+    new DeliveryReceipt(String.valueOf(id) + Separator + UUID.randomUUID().toString)
 }

core/src/main/scala/org/elasticmq/actor/queue/QueueActorMessageOps.scala

@@ -19,7 +19,6 @@ trait QueueActorMessageOps
   this: QueueActorStorage =>
 
   def nowProvider: NowProvider
-  def context: org.apache.pekko.actor.ActorContext
 
   timers.startTimerWithFixedDelay(s"Timer: ${queueData.name}", DeduplicationIdsCleanup, 1.second)
 

core/src/main/scala/org/elasticmq/actor/queue/QueueActorQueueOps.scala

@@ -2,6 +2,7 @@ package org.elasticmq.actor.queue
 
 import org.elasticmq.{FifoDeduplicationIdsHistory, QueueStatistics}
 import org.elasticmq.actor.reply.ReplyAction
+import org.elasticmq.actor.reply.valueToReplyWith
 import org.elasticmq.msg._
 import org.elasticmq.util.Logging
 

core/src/main/scala/org/elasticmq/actor/reply/ReplyingActor.scala

@@ -17,11 +17,11 @@ trait ReplyingActor extends Actor {
   private def doReceiveAndReply[T](msg: M[T]): Unit = {
     try {
       receiveAndReply(msg) match {
-        case ReplyWith(t) => sender ! t
+        case ReplyWith(t) => sender() ! t
         case DoNotReply() => // do nothing
       }
     } catch {
-      case e: Exception => sender ! Failure(e)
+      case e: Exception => sender() ! Failure(e)
     }
   }
 

core/src/test/scala/org/elasticmq/actor/QueueActorMsgOpsTest.scala

@@ -142,7 +142,7 @@ class QueueActorMsgOpsTest extends ActorTest with QueueManagerForEachTest with D
       val lookedUpReceipt = lookupAfterReceiving.flatMap(_.deliveryReceipt)
 
       receivedReceipt.size should be > (0)
-      lookedUpReceipt should be('defined)
+      lookedUpReceipt should be(Symbol("defined"))
 
       receivedReceipt.headOption should be(lookedUpReceipt)
     }

core/src/test/scala/org/elasticmq/actor/QueueManagerActorTest.scala

@@ -31,7 +31,7 @@ class QueueManagerActorTest extends ActorTest with QueueManagerForEachTest with
       lookupResult <- queueManagerActor ? LookupQueue("q2")
     } yield {
       // Then
-      lookupResult should be('defined)
+      lookupResult should be(Symbol("defined"))
     }
   }
 
@@ -52,7 +52,7 @@ class QueueManagerActorTest extends ActorTest with QueueManagerForEachTest with
       r2 <- queueManagerActor ? LookupQueue(q2.name)
     } yield {
       r1 should be(None)
-      r2 should be('defined)
+      r2 should be(Symbol("defined"))
     }
   }
 
@@ -66,7 +66,7 @@ class QueueManagerActorTest extends ActorTest with QueueManagerForEachTest with
       // When & then
       result <- queueManagerActor ? CreateQueue(q1)
     } yield {
-      result should be('right)
+      result should be(Symbol("right"))
     }
   }
 
@@ -81,7 +81,7 @@ class QueueManagerActorTest extends ActorTest with QueueManagerForEachTest with
       // When & then
       result <- queueManagerActor ? CreateQueue(q2)
     } yield {
-      result should be('left)
+      result should be(Symbol("left"))
     }
   }
 

core/src/test/scala/org/elasticmq/actor/test/ActorTest.scala

@@ -7,6 +7,7 @@ import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.BeforeAndAfterAll
 
 import scala.concurrent.duration._
+import scala.concurrent.ExecutionContext
 import org.scalatest.funsuite.AsyncFunSuiteLike
 import org.scalatest.matchers.should.Matchers
 
@@ -18,7 +19,7 @@ abstract class ActorTest
     with BeforeAndAfterAll {
   private val maxDuration = 1.minute
   implicit val timeout: Timeout = maxDuration
-  implicit val ec = system.dispatcher
+  implicit val ec: ExecutionContext = system.dispatcher
 
   override protected def afterAll(): Unit = {
     system.terminate().futureValue

persistence/persistence-file/src/main/scala/org/elasticmq/persistence/file/QueuePersister.scala

@@ -2,18 +2,22 @@ package org.elasticmq.persistence.file
 
 import com.typesafe.config.ConfigRenderOptions
 import org.elasticmq.{DeadLettersQueueData, QueueData}
-import pureconfig.generic.ProductHint
-import pureconfig.generic.auto._
-import pureconfig.{CamelCase, ConfigFieldMapping, ConfigWriter}
+import pureconfig.ConfigWriter
 
 import java.io.PrintWriter
 
 object QueuePersister {
 
-  private implicit val queueMetadataHint: ProductHint[QueueMetadata] =
-    ProductHint[QueueMetadata](ConfigFieldMapping(CamelCase, CamelCase))
-  private implicit val deadLettersHint: ProductHint[DeadLettersQueueData] =
-    ProductHint[DeadLettersQueueData](ConfigFieldMapping(CamelCase, CamelCase))
+  private implicit val deadLettersWriter: ConfigWriter[DeadLettersQueueData] =
+    ConfigWriter.forProduct2[DeadLettersQueueData, String, Int]("name", "maxReceiveCount")(deadLetterQueueData => 
+      (deadLetterQueueData.name, deadLetterQueueData.maxReceiveCount)
+    )
+  private implicit val queueMetadataWriter: ConfigWriter[QueueMetadata] = 
+    ConfigWriter.forProduct9[QueueMetadata, Long, Long, Long, Option[DeadLettersQueueData], Boolean, Boolean, String, String, Map[String,String]](
+      "defaultVisibilityTimeout", "delay", "receiveMessageWait", "deadLettersQueue", "fifo", "contentBasedDeduplication", "copyTo", "moveTo", "tags"
+    )(qm =>
+      (qm.defaultVisibilityTimeout, qm.delay, qm.receiveMessageWait, qm.deadLettersQueue, qm.fifo, qm.contentBasedDeduplication, qm.copyTo, qm.moveTo, qm.tags)
+    )
 
   def saveToConfigFile(queues: List[QueueData], storagePath: String): Unit = {
     val queuesConfig: String = prepareQueuesConfig(queues)