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.

Sign up for GitHub

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

Jump to bottom

bump: Akka 2.9.3, Akka HTTP 10.6.3 #1945

Merged
merged 1 commit into from
May 8, 2024
Merged

bump: Akka 2.9.3, Akka HTTP 10.6.3 #1945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion native-image-tests/grpc-scala/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version := "1.0"

scalaVersion := "2.13.13"

lazy val akkaVersion = sys.props.getOrElse("akka.version", "2.9.2")
lazy val akkaVersion = sys.props.getOrElse("akka.version", "2.9.3")
lazy val akkaGrpcVersion = sys.props.getOrElse("akka.grpc.version", "2.4.0")

enablePlugins(AkkaGrpcPlugin)
Expand Down
2 changes: 1 addition & 1 deletion plugin-tester-java/build.gradle
View file
Open in desktop
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.2"
def akkaVersion = "2.9.3"

tasks.named("processResources") {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
Expand Down
2 changes: 1 addition & 1 deletion plugin-tester-java/pom.xml
View file
Open in desktop
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.2</akka.version>
<akka.version>2.9.3</akka.version>
<grpc.version>1.63.0</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
View file
Open in desktop
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.2"
def akkaVersion = "2.9.3"
def protoGoogleCommonVersion = "2.22.0"

tasks.named("processResources") {
Expand Down
2 changes: 1 addition & 1 deletion plugin-tester-scala/pom.xml
View file
Open in desktop
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.2</akka.version>
<akka.version>2.9.3</akka.version>
<akka.http.cors.version>0.4.2</akka.http.cors.version>
<grpc.version>1.63.0</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
<project.encoding>UTF-8</project.encoding>
Expand Down
4 changes: 2 additions & 2 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ 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.2"
val akka = "2.9.3"
val akkaBinary = "2.9"
val akkaHttp = "10.6.2"
val akkaHttp = "10.6.3"
val akkaHttpBinary = "10.6"

val grpc = "1.63.0" // checked synced by VersionSyncCheckPlugin
Expand Down
12 changes: 6 additions & 6 deletions samples/akka-grpc-quickstart-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ repositories {
dependencies {
implementation 'org.scala-lang:scala-library:2.13.13'

implementation 'com.typesafe.akka:akka-actor-typed_2.13:2.9.2'
implementation 'com.typesafe.akka:akka-discovery_2.13:2.9.2'
implementation 'com.typesafe.akka:akka-stream_2.13:2.9.2'
implementation 'com.typesafe.akka:akka-pki_2.13:2.9.2'
implementation 'com.typesafe.akka:akka-actor-typed_2.13:2.9.3'
implementation 'com.typesafe.akka:akka-discovery_2.13:2.9.3'
implementation 'com.typesafe.akka:akka-stream_2.13:2.9.3'
implementation 'com.typesafe.akka:akka-pki_2.13:2.9.3'

implementation 'ch.qos.logback:logback-classic:1.2.13'

testImplementation 'com.typesafe.akka:akka-actor-testkit-typed_2.13:2.9.2'
testImplementation 'com.typesafe.akka:akka-stream-testkit_2.13:2.9.2'
testImplementation 'com.typesafe.akka:akka-actor-testkit-typed_2.13:2.9.3'
testImplementation 'com.typesafe.akka:akka-stream-testkit_2.13:2.9.3'
testImplementation 'junit:junit:4.13'
}

Expand Down
2 changes: 1 addition & 1 deletion samples/akka-grpc-quickstart-java/build.sbt
View file
Open in desktop
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.13"

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

enablePlugins(AkkaGrpcPlugin)
Expand Down
2 changes: 1 addition & 1 deletion samples/akka-grpc-quickstart-java/pom.xml
View file
Open in desktop
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.2</akka.version>
<akka.version>2.9.3</akka.version>
<akka-grpc.version>2.4.2</akka-grpc.version>
<scala.binary.version>2.13</scala.binary.version>
<project.encoding>UTF-8</project.encoding>
Expand Down
12 changes: 6 additions & 6 deletions samples/akka-grpc-quickstart-scala/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ repositories {
dependencies {
implementation 'org.scala-lang:scala-library:2.13.13'

implementation 'com.typesafe.akka:akka-actor-typed_2.13:2.9.2'
implementation 'com.typesafe.akka:akka-discovery_2.13:2.9.2'
implementation 'com.typesafe.akka:akka-stream_2.13:2.9.2'
implementation 'com.typesafe.akka:akka-pki_2.13:2.9.2'
implementation 'com.typesafe.akka:akka-actor-typed_2.13:2.9.3'
implementation 'com.typesafe.akka:akka-discovery_2.13:2.9.3'
implementation 'com.typesafe.akka:akka-stream_2.13:2.9.3'
implementation 'com.typesafe.akka:akka-pki_2.13:2.9.3'

implementation 'ch.qos.logback:logback-classic:1.2.13'

testImplementation 'com.typesafe.akka:akka-actor-testkit-typed_2.13:2.9.2'
testImplementation 'com.typesafe.akka:akka-stream-testkit_2.13:2.9.2'
testImplementation 'com.typesafe.akka:akka-actor-testkit-typed_2.13:2.9.3'
testImplementation 'com.typesafe.akka:akka-stream-testkit_2.13:2.9.3'
testImplementation 'org.scalatest:scalatest_2.13:3.2.12'
// optional in Scalatest
testRuntimeOnly 'com.vladsch.flexmark:flexmark-all:0.62.2'
Expand Down
2 changes: 1 addition & 1 deletion samples/akka-grpc-quickstart-scala/build.sbt
View file
Open in desktop
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.13"

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

enablePlugins(AkkaGrpcPlugin)
Expand Down
2 changes: 1 addition & 1 deletion samples/akka-grpc-quickstart-scala/pom.xml
View file
Open in desktop
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.2</akka.version>
<akka.version>2.9.3</akka.version>
<akka-grpc.version>2.4.2</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 sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-akka-27/build.sbt
View file
Open in desktop
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.2"
dependencyOverrides += "com.typesafe.akka" %% "akka-stream" % "2.9.3"

assembly / assemblyMergeStrategy := {
// https://github.com/akka/akka/issues/29456
Expand Down
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/scala-2_13/01-basic-client-server/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ enablePlugins(AkkaGrpcPlugin)

libraryDependencies ++= Seq(
// just to make sure it works with Scala 3 artifacts
"com.typesafe.akka" %% "akka-http" % "10.6.2",
"com.typesafe.akka" %% "akka-http" % "10.6.3",
"org.scalatest" %% "scalatest" % "3.2.12" % "test")
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/scala3/01-basic-client-server/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ enablePlugins(AkkaGrpcPlugin)

libraryDependencies ++= Seq(
// just to make sure it works with Scala 3 artifacts
"com.typesafe.akka" %% "akka-http" % "10.6.2",
"com.typesafe.akka" %% "akka-http" % "10.6.3",
"org.scalatest" %% "scalatest" % "3.2.12" % "test")
Loading