From d77a87b65b8398450eca92a66f50eed91a081d66 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Wed, 21 Sep 2022 21:06:33 +0200 Subject: [PATCH] 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 --- .github/workflows/check-build-test.yml | 13 +++++------ .github/workflows/fossa.yml | 1 + .github/workflows/publish.yml | 32 +++++++++++++++++++++++--- project/Dependencies.scala | 14 ++++++----- project/build.properties | 2 +- project/plugins.sbt | 2 +- 6 files changed, 46 insertions(+), 18 deletions(-) diff --git a/.github/workflows/check-build-test.yml b/.github/workflows/check-build-test.yml index fc15d3e4..3e497704 100644 --- 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 index 77264e36..191bb256 100644 --- 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 index 7933045d..65cfe0bf 100644 --- 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 index 6e269826..0ef1c79c 100644 --- 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 index c8fcab54..22af2628 100644 --- 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 index 2d34441e..ce03e805 100644 --- 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")