feat: r2dbc cross build for Scala 3 (#856)

* remove unreachable case to avoid scala3 compile warning
akka · Apr 18, 2023 · 0366656 · 0366656
1 parent 9601677
commit 0366656
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/...jection-r2dbc/src/it/scala/akka/projection/r2dbc/R2dbcTimestampOffsetProjectionSpec.scala b/...jection-r2dbc/src/it/scala/akka/projection/r2dbc/R2dbcTimestampOffsetProjectionSpec.scala
@@ -9,14 +9,12 @@ import java.time.{ Duration => JDuration }
 import java.util.UUID
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicInteger
-
 import scala.annotation.tailrec
 import scala.collection.immutable
 import scala.concurrent.Await
 import scala.concurrent.ExecutionContext
 import scala.concurrent.Future
 import scala.concurrent.duration._
-
 import akka.Done
 import akka.NotUsed
 import akka.actor.testkit.typed.TestException

diff --git a/akka-projection-r2dbc/src/main/scala/akka/projection/r2dbc/internal/R2dbcOffsetStore.scala b/akka-projection-r2dbc/src/main/scala/akka/projection/r2dbc/internal/R2dbcOffsetStore.scala
@@ -576,7 +576,6 @@ private[projection] class R2dbcOffsetStore(
             case Some(r) => r.seqNr < inflightSeqNr
             case None    => true
           }
-        case _ => true
       }
     if (newInflight.size >= 10000) {
       throw new IllegalStateException(

diff --git a/akka-projection-r2dbc/src/test/scala/docs/home/projection/R2dbcProjectionDocExample.scala b/akka-projection-r2dbc/src/test/scala/docs/home/projection/R2dbcProjectionDocExample.scala
@@ -99,7 +99,7 @@ object R2dbcProjectionDocExample {
   }
   //#grouped-handler
 
-  implicit val system = ActorSystem[Nothing](Behaviors.empty, "Example")
+  implicit val system: ActorSystem[Nothing] = ActorSystem(Behaviors.empty, "Example")
   implicit val ec: ExecutionContext = system.executionContext
 
   object IllustrateInit {

diff --git a/build.sbt b/build.sbt
@@ -140,14 +140,13 @@ lazy val grpcTests =
 // provides offset storage backed by akka-persistence-r2dbc
 lazy val r2dbc =
   Project(id = "akka-projection-r2dbc", base = file("akka-projection-r2dbc"))
-    .configs(IntegrationTest)
-    // .settings(Scala3.settings) FIXME can be done once r2dbc 1.1.0 is out
+    .configs(IntegrationTest.extend(Test))
+    .settings(Scala3.settings)
     .settings(headerSettings(IntegrationTest))
     .settings(Defaults.itSettings)
     .settings(Dependencies.r2dbc)
     .dependsOn(core, grpc, eventsourced, `durable-state`)
     .dependsOn(testkit % Test)
-    .dependsOn(slick % "test->test;it->it")
 
 lazy val examples = project
   .configs(IntegrationTest.extend(Test))