Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Akka 2.7.0-M1 dependency #1072

Merged
merged 3 commits into from
Sep 20, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/integration-tests-maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,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"
10 changes: 5 additions & 5 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ 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, scala-version: 2.12, sbt-opts: '' }
- { java-version: adopt@1.11.0-9, scala-version: 2.12, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
- { java-version: adopt@1.8, scala-version: 2.13, sbt-opts: '' }
- { java-version: adopt@1.11.0-9, scala-version: 2.13, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
steps:
- name: Checkout
uses: actions/checkout@v2
Expand All @@ -48,7 +48,7 @@ jobs:
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 }}
run: sbt "+~ ${{ matrix.scala-version }} test" ${{ matrix.sbt-opts }}

- name: Print logs on failure
if: ${{ failure() }}
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/paradox/index.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion integration-test/kubernetes-api-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down