You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by nv...@apache.org on 2023/03/06 10:01:57 UTC
[incubator-pekko-persistence-cassandra] branch main updated: Aligns dependencies with other Pekko projects (#21)
This is an automated email from the ASF dual-hosted git repository.
nvollmar pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-persistence-cassandra.git
The following commit(s) were added to refs/heads/main by this push:
new ea2f09f Aligns dependencies with other Pekko projects (#21)
ea2f09f is described below
commit ea2f09f7720c0fbc45ad8f761a21ab60e27ff39f
Author: Nicolas Vollmar <nv...@gmail.com>
AuthorDate: Mon Mar 6 11:01:52 2023 +0100
Aligns dependencies with other Pekko projects (#21)
---
.github/workflows/unit-tests.yml | 14 ++++-----
build.sbt | 18 +++++------
project/Common.scala | 4 +--
project/Dependencies.scala | 67 ++++++++++++++++++++--------------------
4 files changed, 52 insertions(+), 51 deletions(-)
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 3553c50..7738df1 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -20,11 +20,11 @@ jobs:
fail-fast: false
matrix:
include:
- - { jdk: '8', container: "cassandra-latest", scalaVersion: "++2.13.10", test: "test" }
- - { jdk: '11', container: "cassandra-latest", scalaVersion: "++2.12.17", test: "test" }
- - { jdk: '11', container: "cassandra-latest", scalaVersion: "++2.13.10", test: "test" }
- - { jdk: '11', container: "cassandra2", scalaVersion: "++2.13.10", test: "'testOnly -- -l RequiresCassandraThree'"}
- - { jdk: '11', container: "cassandra3", scalaVersion: "++2.13.10", test: "test" }
+ - { javaVersion: '8', container: "cassandra-latest", scalaVersion: "++2.13.10", test: "test" }
+ - { javaVersion: '11', container: "cassandra-latest", scalaVersion: "++2.12.17", test: "test" }
+ - { javaVersion: '11', container: "cassandra-latest", scalaVersion: "++2.13.10", test: "test" }
+ - { javaVersion: '11', container: "cassandra2", scalaVersion: "++2.13.10", test: "'testOnly -- -l RequiresCassandraThree'"}
+ - { javaVersion: '11', container: "cassandra3", scalaVersion: "++2.13.10", test: "test" }
env:
JAVA_OPTS: -Xms2G -Xmx2G -Xss2M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
@@ -41,11 +41,11 @@ jobs:
git fetch origin pull/${{ github.event.pull_request.number }}/merge:scratch
git checkout scratch
- - name: Setup Java ${{ matrix.jdk }}
+ - name: Setup Java ${{ matrix.javaVersion }}
uses: actions/setup-java@v3
with:
distribution: temurin
- java-version: ${{ matrix.jdk }}
+ java-version: ${{ matrix.javaVersion }}
- name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0
diff --git a/build.sbt b/build.sbt
index a53f5da..ef96039 100644
--- a/build.sbt
+++ b/build.sbt
@@ -111,22 +111,22 @@ lazy val docs = project
Compile / paradoxProperties ++= Map(
"project.url" -> "https://doc.akka.io/docs/akka-persistence-cassandra/current/",
"canonical.base_url" -> "https://doc.akka.io/docs/akka-persistence-cassandra/current",
- "akka.version" -> Dependencies.AkkaVersion,
+ "akka.version" -> Dependencies.akkaVersion,
// Akka
- "extref.akka.base_url" -> s"https://doc.akka.io/docs/akka/${Dependencies.AkkaVersionInDocs}/%s",
- "scaladoc.akka.base_url" -> s"https://doc.akka.io/api/akka/${Dependencies.AkkaVersionInDocs}/",
- "javadoc.akka.base_url" -> s"https://doc.akka.io/japi/akka/${Dependencies.AkkaVersionInDocs}/",
+ "extref.akka.base_url" -> s"https://doc.akka.io/docs/akka/${Dependencies.akkaVersionInDocs}/%s",
+ "scaladoc.akka.base_url" -> s"https://doc.akka.io/api/akka/${Dependencies.akkaVersionInDocs}/",
+ "javadoc.akka.base_url" -> s"https://doc.akka.io/japi/akka/${Dependencies.akkaVersionInDocs}/",
// Alpakka
- "extref.alpakka.base_url" -> s"https://doc.akka.io/docs/alpakka/${Dependencies.AlpakkaVersionInDocs}/%s",
- "scaladoc.akka.stream.alpakka.base_url" -> s"https://doc.akka.io/api/alpakka/${Dependencies.AlpakkaVersionInDocs}/",
+ "extref.alpakka.base_url" -> s"https://doc.akka.io/docs/alpakka/${Dependencies.alpakkaVersionInDocs}/%s",
+ "scaladoc.akka.stream.alpakka.base_url" -> s"https://doc.akka.io/api/alpakka/${Dependencies.alpakkaVersionInDocs}/",
"javadoc.akka.stream.alpakka.base_url" -> "",
// APC 0.x
"extref.apc-0.x.base_url" -> s"https://doc.akka.io/docs/akka-persistence-cassandra/0.103/%s",
// Cassandra
- "extref.cassandra.base_url" -> s"https://cassandra.apache.org/doc/${Dependencies.CassandraVersionInDocs}/%s",
+ "extref.cassandra.base_url" -> s"https://cassandra.apache.org/doc/${Dependencies.cassandraVersionInDocs}/%s",
// Datastax Java driver
- "extref.java-driver.base_url" -> s"https://docs.datastax.com/en/developer/java-driver/${Dependencies.DriverVersionInDocs}/%s",
- "javadoc.com.datastax.oss.base_url" -> s"https://docs.datastax.com/en/drivers/java/${Dependencies.DriverVersionInDocs}/",
+ "extref.java-driver.base_url" -> s"https://docs.datastax.com/en/developer/java-driver/${Dependencies.driverVersionInDocs}/%s",
+ "javadoc.com.datastax.oss.base_url" -> s"https://docs.datastax.com/en/drivers/java/${Dependencies.driverVersionInDocs}/",
// Java
"javadoc.base_url" -> "https://docs.oracle.com/javase/8/docs/api/",
// Scala
diff --git a/project/Common.scala b/project/Common.scala
index 1c051ed..d424666 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -44,8 +44,8 @@ object Common extends AutoPlugin {
override lazy val projectSettings = Seq(
projectInfoVersion := (if (isSnapshot.value) "snapshot" else version.value),
crossVersion := CrossVersion.binary,
- crossScalaVersions := Dependencies.ScalaVersions,
- scalaVersion := Dependencies.Scala213,
+ crossScalaVersions := Dependencies.scalaVersions,
+ scalaVersion := Dependencies.scala213Version,
scalacOptions ++= Seq("-encoding", "UTF-8", "-feature", "-unchecked", "-Xlint", "-Ywarn-dead-code", "-deprecation"),
Compile / console / scalacOptions --= Seq("-deprecation", "-Xfatal-warnings", "-Xlint", "-Ywarn-unused:imports"),
Compile / doc / scalacOptions := scalacOptions.value ++ Seq(
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 0268226..e3095b7 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -11,27 +11,28 @@ import sbt._
import Keys._
object Dependencies {
- val Scala212 = "2.12.17"
- // update even in check-build-test.yml
- val Scala213 = "2.13.10"
- val ScalaVersions = Seq(Scala212, Scala213)
+ // keep in sync with .github/workflows/unit-tests.yml
+ val scala212Version = "2.12.17"
+ val scala213Version = "2.13.10"
+ val scala3Version = "3.1.2" // not yet enabled - missing pekko-http/pekko-management Scala 3 artifacts
+ val scalaVersions = Seq(scala212Version, scala213Version)
- val AkkaVersion = System.getProperty("override.akka.version", "2.6.20")
- val AkkaVersionInDocs = AkkaVersion.take(3)
- val CassandraVersionInDocs = "4.0"
+ val akkaVersion = System.getProperty("override.akka.version", "2.6.20")
+ val akkaVersionInDocs = akkaVersion.take(3)
+ val cassandraVersionInDocs = "4.0"
// Should be sync with the version of the driver in Alpakka Cassandra
- val DriverVersionInDocs = "4.6"
+ val driverVersionInDocs = "4.6"
- val AlpakkaVersion = "3.0.4"
- val AlpakkaVersionInDocs = AlpakkaVersion.take(3)
+ val alpakkaVersion = "3.0.4"
+ val alpakkaVersionInDocs = alpakkaVersion.take(3)
// for example
- val AkkaManagementVersion = "1.1.4"
+ val akkaManagementVersion = "1.1.4"
- val Logback = "ch.qos.logback" % "logback-classic" % "1.2.10"
+ val logback = "ch.qos.logback" % "logback-classic" % "1.2.10"
val reconcilerDependencies = Seq(
- "com.typesafe.akka" %% "akka-actor-testkit-typed" % AkkaVersion % Test,
- "com.typesafe.akka" %% "akka-stream-testkit" % AkkaVersion % Test)
+ "com.typesafe.akka" %% "akka-actor-testkit-typed" % akkaVersion % Test,
+ "com.typesafe.akka" %% "akka-stream-testkit" % akkaVersion % Test)
val akkaTestDeps = Seq(
"com.typesafe.akka" %% "akka-persistence",
@@ -45,32 +46,32 @@ object Dependencies {
"com.typesafe.akka" %% "akka-cluster-sharding")
val akkaPersistenceCassandraDependencies = Seq(
- "com.lightbend.akka" %% "akka-stream-alpakka-cassandra" % AlpakkaVersion,
- "com.typesafe.akka" %% "akka-persistence" % AkkaVersion,
- "com.typesafe.akka" %% "akka-persistence-query" % AkkaVersion,
- "com.typesafe.akka" %% "akka-cluster-tools" % AkkaVersion,
+ "com.lightbend.akka" %% "akka-stream-alpakka-cassandra" % alpakkaVersion,
+ "com.typesafe.akka" %% "akka-persistence" % akkaVersion,
+ "com.typesafe.akka" %% "akka-persistence-query" % akkaVersion,
+ "com.typesafe.akka" %% "akka-cluster-tools" % akkaVersion,
"org.scala-lang.modules" %% "scala-collection-compat" % "2.7.0",
- Logback % Test,
+ logback % Test,
"org.scalatest" %% "scalatest" % "3.2.14" % Test,
"org.pegdown" % "pegdown" % "1.6.0" % Test,
- "org.osgi" % "org.osgi.core" % "5.0.0" % Provided) ++ akkaTestDeps.map(_ % AkkaVersion % Test)
+ "org.osgi" % "org.osgi.core" % "5.0.0" % Provided) ++ akkaTestDeps.map(_ % akkaVersion % Test)
val exampleDependencies = Seq(
- Logback,
- "com.typesafe.akka" %% "akka-persistence-typed" % AkkaVersion,
- "com.typesafe.akka" %% "akka-discovery" % AkkaVersion,
- "com.typesafe.akka" %% "akka-serialization-jackson" % AkkaVersion,
- "com.typesafe.akka" %% "akka-cluster-sharding-typed" % AkkaVersion,
- "com.lightbend.akka.management" %% "akka-management" % AkkaManagementVersion,
- "com.lightbend.akka.management" %% "akka-management-cluster-bootstrap" % AkkaManagementVersion,
- "com.lightbend.akka.management" %% "akka-management-cluster-http" % AkkaManagementVersion,
- "com.lightbend.akka.discovery" %% "akka-discovery-kubernetes-api" % AkkaManagementVersion,
+ logback,
+ "com.typesafe.akka" %% "akka-persistence-typed" % akkaVersion,
+ "com.typesafe.akka" %% "akka-discovery" % akkaVersion,
+ "com.typesafe.akka" %% "akka-serialization-jackson" % akkaVersion,
+ "com.typesafe.akka" %% "akka-cluster-sharding-typed" % akkaVersion,
+ "com.lightbend.akka.management" %% "akka-management" % akkaManagementVersion,
+ "com.lightbend.akka.management" %% "akka-management-cluster-bootstrap" % akkaManagementVersion,
+ "com.lightbend.akka.management" %% "akka-management-cluster-http" % akkaManagementVersion,
+ "com.lightbend.akka.discovery" %% "akka-discovery-kubernetes-api" % akkaManagementVersion,
"org.hdrhistogram" % "HdrHistogram" % "2.1.12")
val dseTestDependencies = Seq(
"com.datastax.dse" % "dse-java-driver-core" % "2.3.0" % Test,
- "com.typesafe.akka" %% "akka-persistence-tck" % AkkaVersion % Test,
- "com.typesafe.akka" %% "akka-actor-testkit-typed" % AkkaVersion % Test,
- "com.typesafe.akka" %% "akka-stream-testkit" % AkkaVersion % Test,
- Logback % Test)
+ "com.typesafe.akka" %% "akka-persistence-tck" % akkaVersion % Test,
+ "com.typesafe.akka" %% "akka-actor-testkit-typed" % akkaVersion % Test,
+ "com.typesafe.akka" %% "akka-stream-testkit" % akkaVersion % Test,
+ logback % Test)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org