Update java-driver-core to 4.14.1, Alpakka 5.0.0-M1, Akka 2.7.0-M1 (#984

) * Update java-driver-core to 4.14.1 * Update Paradox * sbt 1.7.1 * reduce test matrix * Alpakka 5.0.0-M1, Akka 2.7.0-M1
akka · Sep 21, 2022 · d77a87b · d77a87b
1 parent daf8791
commit d77a87b
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 18 deletions.
diff --git a/.github/workflows/check-build-test.yml b/.github/workflows/check-build-test.yml
@@ -35,7 +35,7 @@ jobs:
         uses: coursier/cache-action@v6.3
 
       - name: "Code style, compile tests"
-        run: sbt "verifyCodeStyle; Test/compile"
+        run: sbt "verifyCodeStyle; +Test/compile"
 
 
   documentation:
@@ -77,11 +77,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { jdk: 'adopt:8',  container: "cassandra-latest",  scalaVersion: "++2.13.8", test: "test" }
-          - { jdk: 'adopt:11', container: "cassandra-latest",  scalaVersion: "++2.12.14", test: "test" }
-          - { jdk: 'adopt:11', container: "cassandra-latest",  scalaVersion: "++2.13.8", test: "test" }
-          - { jdk: 'adopt:11', container: "cassandra2",        scalaVersion: "++2.13.8", test: "'testOnly -- -l RequiresCassandraThree'"}
-          - { jdk: 'adopt:11', container: "cassandra3",        scalaVersion: "++2.13.8", test: "test" }
+          - { jdk: 'adopt:8',  container: "cassandra-latest", test: "test" }
+          - { jdk: 'adopt:11', container: "cassandra-latest", test: "test" }
+          - { jdk: 'adopt:11', container: "cassandra2",       test: "'testOnly -- -l RequiresCassandraThree'"}
+          - { jdk: 'adopt:11', container: "cassandra3",       test: "test" }
 
     env:
       JAVA_OPTS: -Xms2G -Xmx2G -Xss2M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
@@ -108,4 +107,4 @@ jobs:
 
       - name: Test against ${{ matrix.container }}
         run: |-
-          docker-compose up -d ${{ matrix.container }} && sbt ${{ matrix.scalaVersion }} ${{matrix.test}}
+          docker-compose up -d ${{ matrix.container }} && sbt ${{matrix.test}}
diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml
@@ -9,6 +9,7 @@ jobs:
   fossa:
     name: Fossa
     runs-on: ubuntu-latest
+    if: github.repository == 'akka/akka-persistence-cassandra'
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -26,10 +26,13 @@ jobs:
           # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
           fetch-depth: 0
 
-      - name: Set up JDK 8
-        uses: coursier/setup-action@v1.1.2
+      - name: Setup Scala with JDK 8
+        uses: olafurpg/setup-scala@v10
         with:
-          jvm: adopt:8
+          java-version: adopt@1.8.0-275
+
+      - name: Cache Coursier cache
+        uses: coursier/cache-action@v5
 
       - name: Publish artifacts for all Scala versions
         env:
@@ -39,6 +42,29 @@ jobs:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
         run: sbt ci-release
 
+  documentation:
+    # runs on main repo only
+    if: github.repository == 'akka/akka-persistence-cassandra'
+    name: Documentation
+    environment: release
+    runs-on: ubuntu-20.04
+    env:
+      JAVA_OPTS: -Xms2G -Xmx2G -Xss2M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
+          fetch-depth: 0
+
+      - name: Setup Scala with JDK 11
+        uses: olafurpg/setup-scala@v10
+        with:
+          java-version: adopt@1.11.0-9
+
+      - name: Cache Coursier cache
+        uses: coursier/cache-action@v5
+
       - name: Publish API and reference documentation
         env:
           GUSTAV_KEY: ${{ secrets.GUSTAV_KEY }}

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -5,20 +5,21 @@ object Dependencies {
   val Scala212 = "2.12.16"
   // update even in check-build-test.yml
   val Scala213 = "2.13.8"
-  val ScalaVersions = Seq(Scala212, Scala213)
+  val ScalaVersions = Seq(Scala213, Scala212)
 
-  val AkkaVersion = System.getProperty("override.akka.version", "2.6.9")
+  val AkkaVersion = System.getProperty("override.akka.version", "2.7.0-M1")
   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 CassandraDriverVersion = "4.14.1"
+  val DriverVersionInDocs = "4.14"
 
-  val AlpakkaVersion = "2.0.2"
+  val AlpakkaVersion = "5.0.0-M1"
   val AlpakkaVersionInDocs = AlpakkaVersion.take(3)
   // for example
-  val AkkaManagementVersion = "1.0.6"
+  val AkkaManagementVersion = "1.1.4"
 
-  val Logback = "ch.qos.logback" % "logback-classic" % "1.2.10"
+  val Logback = "ch.qos.logback" % "logback-classic" % "1.2.11"
 
   val reconcilerDependencies = Seq(
     "com.typesafe.akka" %% "akka-actor-testkit-typed" % AkkaVersion % Test,
@@ -40,6 +41,7 @@ object Dependencies {
       "com.typesafe.akka" %% "akka-persistence" % AkkaVersion,
       "com.typesafe.akka" %% "akka-persistence-query" % AkkaVersion,
       "com.typesafe.akka" %% "akka-cluster-tools" % AkkaVersion,
+      "com.datastax.oss" % "java-driver-core" % CassandraDriverVersion,
       "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.4",
       Logback % Test,
       "org.scalatest" %% "scalatest" % "3.2.11" % Test,

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.1
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -6,7 +6,7 @@ addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
 
 // Documentation
-addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.42")
+addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.45")
 addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-dependencies" % "0.2.2")
 addSbtPlugin("com.lightbend.sbt" % "sbt-publish-rsync" % "0.2")
 addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3")