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

bump: Akka 2.9.6 #1989

Merged
merged 3 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .jvmopts-ghactions
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@

-Dfile.encoding=UTF8
-Dsbt.color=always
-Dakka.warn-on-no-license-key=false
2 changes: 1 addition & 1 deletion plugin-tester-java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ repositories {

def scalaVersion = org.gradle.util.VersionNumber.parse(System.getenv("TRAVIS_SCALA_VERSION") ?: "2.13")
def scalaBinaryVersion = "${scalaVersion.major}.${scalaVersion.minor}"
def akkaVersion = "2.9.3"
def akkaVersion = "2.9.6"

tasks.named("processResources") {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
Expand Down
2 changes: 1 addition & 1 deletion plugin-tester-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
<maven-exec-plugin.version>3.0.0</maven-exec-plugin.version>
<akka.http.cors.version>1.1.0</akka.http.cors.version>
<akka.version>2.9.3</akka.version>
<akka.version>2.9.6</akka.version>
<grpc.version>1.63.2</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
<project.encoding>UTF-8</project.encoding>
<build-helper-maven-plugin>3.3.0</build-helper-maven-plugin>
Expand Down
2 changes: 1 addition & 1 deletion plugin-tester-scala/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ repositories {

def scalaVersion = org.gradle.util.VersionNumber.parse(System.getenv("TRAVIS_SCALA_VERSION") ?: "2.13")
def scalaBinaryVersion = "${scalaVersion.major}.${scalaVersion.minor}"
def akkaVersion = "2.9.3"
def akkaVersion = "2.9.6"
def protoGoogleCommonVersion = "2.22.0"

tasks.named("processResources") {
Expand Down
2 changes: 1 addition & 1 deletion plugin-tester-scala/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<properties>
<maven.compiler.release>11</maven.compiler.release>
<akka.version>2.9.3</akka.version>
<akka.version>2.9.6</akka.version>
<akka.http.cors.version>0.4.2</akka.http.cors.version>
<grpc.version>1.63.2</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
<project.encoding>UTF-8</project.encoding>
Expand Down
3 changes: 2 additions & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ object Dependencies {
// We don't force Akka updates because downstream projects can upgrade
// themselves. For more information see
// https://doc.akka.io//docs/akka/current/project/downstream-upgrade-strategy.html
val akka = "2.9.3"
val akka = "2.9.6"
val akkaBinary = "2.9"
val akkaHttp = "10.6.3"
val akkaHttpBinary = "10.6"
Expand Down Expand Up @@ -114,6 +114,7 @@ object Dependencies {
Compile.akkaHttpCore,
Compile.akkaHttp,
Compile.akkaDiscovery,
Compile.akkaPki,
Test.akkaTestkit,
Test.akkaStreamTestkit,
Test.scalaTest,
Expand Down
2 changes: 1 addition & 1 deletion samples/akka-grpc-quickstart-java/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name := "akka-grpc-quickstart-java"
version := "1.0"
scalaVersion := "2.13.14"

val akkaVersion = "2.9.3"
val akkaVersion = "2.9.6"
lazy val akkaGrpcVersion = sys.props.getOrElse("akka-grpc.version", "2.4.3")

enablePlugins(AkkaGrpcPlugin)
Expand Down
2 changes: 1 addition & 1 deletion samples/akka-grpc-quickstart-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<akka.version>2.9.3</akka.version>
<akka.version>2.9.6</akka.version>
<akka-grpc.version>2.4.3</akka-grpc.version>
<scala.binary.version>2.13</scala.binary.version>
<project.encoding>UTF-8</project.encoding>
Expand Down
2 changes: 1 addition & 1 deletion samples/akka-grpc-quickstart-scala/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name := "akka-grpc-quickstart-scala"
version := "1.0"
scalaVersion := "2.13.14"

val akkaVersion = "2.9.3"
val akkaVersion = "2.9.6"
lazy val akkaGrpcVersion = sys.props.getOrElse("akka-grpc.version", "2.4.3")

enablePlugins(AkkaGrpcPlugin)
Expand Down
2 changes: 1 addition & 1 deletion samples/akka-grpc-quickstart-scala/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<akka.version>2.9.3</akka.version>
<akka.version>2.9.6</akka.version>
<akka-grpc.version>2.4.3</akka-grpc.version>
<scala.binary.version>2.13</scala.binary.version>
<project.encoding>UTF-8</project.encoding>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ resolvers += "Akka library repository".at("https://repo.akka.io/maven")

enablePlugins(AkkaGrpcPlugin)

dependencyOverrides += "com.typesafe.akka" %% "akka-stream" % "2.9.3"
dependencyOverrides += "com.typesafe.akka" %% "akka-stream" % "2.9.6"

assembly / assemblyMergeStrategy := {
// https://github.com/akka/akka/issues/29456
Expand Down
Loading