Akka 2.7.0-M1 dependency (#1072)

* Akka 2.7.0-M1 dependency * and cleanup of Scala cross building * Reduce test matrix, run tests with Scala 2.13
akka · Sep 20, 2022 · d08829c · d08829c
1 parent 7291e8b
commit d08829c
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 15 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -34,7 +34,7 @@ jobs:
         uses: coursier/cache-action@v5
 
       - name: Code style check, compilation and binary-compatibility check
-        run: sbt "scalafmtCheckAll;headerCheckAll;+IntegrationTest/compile;mimaReportBinaryIssues"
+        run: sbt "scalafmtCheckAll;headerCheckAll;+Test/compile;+IntegrationTest/compile;mimaReportBinaryIssues"
 
   check-docs:
     name: Check Docs

diff --git a/.github/workflows/integration-tests-maven.yml b/.github/workflows/integration-tests-maven.yml
@@ -8,8 +8,6 @@ on:
       - release-*
     tags-ignore: [ v.* ]
     # Different than its sibilings, we don't configure this workflow to run as a cron job.
-    # The cron build compiles against Akka 2.6 and Akka HTTP 10.2, but the Maven example uses 2.5 and 10.1
-    # see https://github.com/akka/akka-management/issues/744
 
 jobs:
    integration-test:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -83,4 +83,4 @@ jobs:
           chmod 600 .github/id_rsa
           ssh-keygen -p -P "$GUSTAV_PASSPHRASE" -N "" -f .github/id_rsa
           ssh-add .github/id_rsa
-          sbt "++2.13.8 docs/publishRsync"
+          sbt "docs/publishRsync"
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -18,10 +18,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { java-version: adopt@1.8,      scala-version: 2.12.16, sbt-opts: '' }
-          - { java-version: adopt@1.11.0-9, scala-version: 2.12.16, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
-          - { java-version: adopt@1.8,      scala-version: 2.13.8,  sbt-opts: '' }
-          - { java-version: adopt@1.11.0-9, scala-version: 2.13.8,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+          - { java-version: adopt@1.8,  sbt-opts: '' }
+          - { java-version: adopt@1.11, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -47,8 +45,8 @@ jobs:
         run: |
           echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
 
-      - name: Run tests with Scala ${{ matrix.scala-version }} and Java ${{ matrix.java-version }}
-        run: sbt "++${{ matrix.scala-version }} test" ${{ matrix.sbt-opts }}
+      - name: Run tests with default Scala and Java ${{ matrix.java-version }}
+        run: sbt "test" ${{ matrix.sbt-opts }}
 
       - name: Print logs on failure
         if: ${{ failure() }}

diff --git a/docs/src/main/paradox/index.md b/docs/src/main/paradox/index.md
@@ -1,7 +1,7 @@
 # Akka Management
 
 Akka Management is a suite of tools for operating Akka Clusters.
-The current version may only be used with Akka 2.6.
+The current version may only be used with Akka 2.7.
 
 ## Overview
 

diff --git a/integration-test/kubernetes-api-java/pom.xml b/integration-test/kubernetes-api-java/pom.xml
@@ -18,7 +18,7 @@
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <encoding>UTF-8</encoding>
-    <akka.version>2.6.14</akka.version>
+    <akka.version>2.7.0-M1</akka.version>
     <akka.http.version>10.2.0</akka.http.version>
     <akka-management.version>1.0.5</akka-management.version>
     <scala.binary.version>2.12</scala.binary.version>

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -5,11 +5,11 @@ object Dependencies {
 
   val Scala212 = "2.12.16"
   val Scala213 = "2.13.8"
-  val CrossScalaVersions = Seq(Dependencies.Scala212, Dependencies.Scala213)
+  val CrossScalaVersions = Seq(Dependencies.Scala213, Dependencies.Scala212)
 
   // Align the versions in integration-test/kubernetes-api-java/pom.xml
-  val AkkaVersion = "2.6.14"
-  val AkkaBinaryVersion = "2.6"
+  val AkkaVersion = "2.7.0-M1"
+  val AkkaBinaryVersion = "2.7"
   // Align the versions in integration-test/kubernetes-api-java/pom.xml
   val AkkaHttpVersion = "10.2.7"
   val AkkaHttpBinaryVersion = "10.2"