This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-pekko-persistence-dynamodb.git
The following commit(s) were added to refs/heads/main by this push:
new beb1378 get scala 3 build working (#35)
beb1378 is described below
commit beb13789eefcab14a851e815d225596c5dee9f47
Author: PJ Fanning <[email protected]>
AuthorDate: Fri Apr 28 18:53:11 2023 +0200
get scala 3 build working (#35)
* get scala 3 build working
* scalafmt
---
build.sbt | 11 ++++++++++-
.../persistence/dynamodb/journal/WriteThroughputBench.scala | 0
.../pekko/persistence/dynamodb/journal/DynamoDBUtils.scala | 6 +++---
.../persistence/dynamodb/journal/FailureReportingSpec.scala | 3 ++-
4 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/build.sbt b/build.sbt
index 3b14e95..52ab89a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -3,7 +3,7 @@ import PekkoDependency.pekkoVersion
name := "pekko-persistence-dynamodb"
scalaVersion := "2.13.10"
-crossScalaVersions := Seq("2.12.17", "2.13.10")
+crossScalaVersions := Seq("2.12.17", "2.13.10", "3.3.0-RC4")
crossVersion := CrossVersion.binary
val amzVersion = "1.12.286"
@@ -13,6 +13,15 @@ resolvers += "Apache Nexus
Snapshots".at("https://repository.apache.org/content/
ThisBuild / apacheSonatypeProjectProfile := "pekko"
+Test / unmanagedSourceDirectories ++= {
+ if (scalaVersion.value.startsWith("2.")) {
+ Seq(
+ (LocalRootProject / baseDirectory).value / "src" / "test" / "scala-2")
+ } else {
+ Seq.empty
+ }
+}
+
libraryDependencies ++= Seq(
"com.amazonaws" % "aws-java-sdk-core" % amzVersion,
"com.amazonaws" % "aws-java-sdk-dynamodb" % amzVersion,
diff --git
a/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/WriteThroughputBench.scala
b/src/test/scala-2/org/apache/pekko/persistence/dynamodb/journal/WriteThroughputBench.scala
similarity index 100%
rename from
src/test/scala/org/apache/pekko/persistence/dynamodb/journal/WriteThroughputBench.scala
rename to
src/test/scala-2/org/apache/pekko/persistence/dynamodb/journal/WriteThroughputBench.scala
diff --git
a/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBUtils.scala
b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBUtils.scala
index 217769d..d6d3e1a 100644
---
a/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBUtils.scala
+++
b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/DynamoDBUtils.scala
@@ -26,8 +26,7 @@ import scala.concurrent.duration._
trait DynamoDBUtils extends JournalSettingsProvider with DynamoProvider {
- val system: ActorSystem
- import system.dispatcher
+ def system: ActorSystem
override val journalSettings = {
val c = system.settings.config
@@ -35,7 +34,7 @@ trait DynamoDBUtils extends JournalSettingsProvider with
DynamoProvider {
new DynamoDBJournalConfig(config)
}
- override val dynamo: DynamoDBHelper = dynamoClient(system, journalSettings)
+ override lazy val dynamo: DynamoDBHelper = dynamoClient(system,
journalSettings)
implicit val timeout: Timeout = Timeout(5.seconds)
@@ -44,6 +43,7 @@ trait DynamoDBUtils extends JournalSettingsProvider with
DynamoProvider {
schema
.withTableName(journalSettings.JournalTable)
.withProvisionedThroughput(new ProvisionedThroughput(read, write))
+ implicit val dispatcher = system.dispatcher
var names = Vector.empty[String]
lazy val complete: ListTablesResult => Future[Vector[String]] = aws =>
diff --git
a/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/FailureReportingSpec.scala
b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/FailureReportingSpec.scala
index 1f143ef..0afa40b 100644
---
a/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/FailureReportingSpec.scala
+++
b/src/test/scala/org/apache/pekko/persistence/dynamodb/journal/FailureReportingSpec.scala
@@ -203,7 +203,8 @@ pekko.loggers =
["org.apache.pekko.testkit.TestEventListener"]
}
"have sensible error messages" when {
- import dynamo._
+ val evaluatedDynamo = dynamo
+ import evaluatedDynamo._
def desc[T](aws: T)(implicit d: Describe[_ >: T]): String = d.desc(aws)
val keyItem = Map(Key -> S("TheKey"), Sort -> N("42")).asJava
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
