Skip to content

Commit

Permalink
Update Akka versions (#724)
Browse files Browse the repository at this point in the history 
* Update Akka versions

* More versions in grpc samples
  • Loading branch information
@patriknw
patriknw authored Oct 18, 2022
1 parent c113591 commit 4854088
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 23 deletions.
12 changes: 7 additions & 5 deletions project/Dependencies.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ object Dependencies {
val AkkaPersistenceR2dbcVersionInDocs = Versions.akkaPersistenceR2dbc

object Versions {
val akka = sys.props.getOrElse("build.akka.version", "2.7.0-M3")
val akkaPersistenceJdbc = "5.2.0-M1"
val akka = sys.props.getOrElse("build.akka.version", "2.7.0-M5")
val akkaPersistenceCassandra = "1.1.0-M2"
val akkaPersistenceJdbc = "5.2.0-M2"
val akkaPersistenceR2dbc = "1.0.0-M2"
val alpakka = "5.0.0-M1"
val alpakkaKafka = sys.props.getOrElse("build.alpakka.kafka.version", "3.1.0-M1")
val alpakka = "5.0.0-M2"
val alpakkaKafka = sys.props.getOrElse("build.alpakka.kafka.version", "3.1.0-M2")
val slick = "3.4.1"
val scalaTest = "3.1.1"
val testContainers = "1.15.3"
Expand Down Expand Up @@ -103,7 +104,8 @@ object Dependencies {

val akkaPersistenceTyped = "com.typesafe.akka" %% "akka-persistence-typed" % Versions.akka
val akkaClusterShardingTyped = "com.typesafe.akka" %% "akka-cluster-sharding-typed" % Versions.akka
val akkaPersistenceCassandra = "com.typesafe.akka" %% "akka-persistence-cassandra" % "1.1.0-M1"
val akkaPersistenceCassandra =
"com.typesafe.akka" %% "akka-persistence-cassandra" % Versions.akkaPersistenceCassandra
val akkaPersistenceJdbc = "com.lightbend.akka" %% "akka-persistence-jdbc" % Versions.akkaPersistenceJdbc
val akkaSerializationJackson = "com.typesafe.akka" %% "akka-serialization-jackson" % Versions.akka
}
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.7.0")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")

// remember to bump in samples/grpc/ projects as well if changing
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.2.0-M1")
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.2.0-M2")

// Documentation
addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.45")
Expand Down
4 changes: 2 additions & 2 deletions samples/grpc/shopping-analytics-service-java/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<akka-grpc-maven-plugin.version>2.2.0-M1</akka-grpc-maven-plugin.version>
<akka-grpc-maven-plugin.version>2.2.0-M2</akka-grpc-maven-plugin.version>
<scala.binary.version>2.13</scala.binary.version>
<akka-persistence-r2dbc.version>1.0.0-M2</akka-persistence-r2dbc.version>
<!-- FIXME final release version -->
<akka-projection.version>1.3.0-M2</akka-projection.version>
<akka-projection.version>1.3.0-M3</akka-projection.version>
<!-- needs to be defined to allow for overriding through mvn exec:exec -DAPP_CONFIG=local1.conf -->
<APP_CONFIG>application.conf</APP_CONFIG>
<!-- Version of the Docker image is derived from git commit.
Expand Down
13 changes: 7 additions & 6 deletions samples/grpc/shopping-analytics-service-scala/build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ name := "shopping-analytics-service"

organization := "com.lightbend.akka.samples"
organizationHomepage := Some(url("https://akka.io"))
licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))
licenses := Seq(
("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))

scalaVersion := "2.13.5"
scalaVersion := "2.13.10"

Compile / scalacOptions ++= Seq(
"-target:11",
Expand All @@ -26,13 +27,13 @@ run / javaOptions ++= sys.props
.fold(Seq.empty[String])(res => Seq(s"-Dconfig.resource=$res"))
Global / cancelable := false // ctrl-c

val AkkaVersion = "2.7.0-M3"
val AkkaHttpVersion = "10.4.0-M1"
val AkkaManagementVersion = "1.2.0-M1"
val AkkaVersion = "2.7.0-M5"
val AkkaHttpVersion = "10.4.0-M2"
val AkkaManagementVersion = "1.2.0-M2"
val AkkaPersistenceR2dbcVersion = "1.0.0-M2"
// FIXME final release version
val AkkaProjectionVersion =
sys.props.getOrElse("akka-projection.version", "1.3.0-M2")
sys.props.getOrElse("akka-projection.version", "1.3.0-M3")

enablePlugins(AkkaGrpcPlugin)

Expand Down
2 changes: 1 addition & 1 deletion samples/grpc/shopping-analytics-service-scala/project/plugins.sbt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.2.0-M1")
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.2.0-M2")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1")
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
4 changes: 2 additions & 2 deletions samples/grpc/shopping-cart-service-java/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<akka-grpc-maven-plugin.version>2.2.0-M1</akka-grpc-maven-plugin.version>
<akka-grpc-maven-plugin.version>2.2.0-M2</akka-grpc-maven-plugin.version>
<scala.binary.version>2.13</scala.binary.version>
<akka-persistence-r2dbc.version>1.0.0-M1</akka-persistence-r2dbc.version>
<!-- FIXME final release version -->
<akka-projection.version>1.3.0-M2</akka-projection.version>
<akka-projection.version>1.3.0-M3</akka-projection.version>
<!-- needs to be defined to allow for overriding through mvn exec:exec -DAPP_CONFIG=local1.conf -->
<APP_CONFIG>application.conf</APP_CONFIG>
<!-- Version of the Docker image is derived from git commit.
Expand Down
10 changes: 5 additions & 5 deletions samples/grpc/shopping-cart-service-scala/build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ organizationHomepage := Some(url("https://akka.io"))
licenses := Seq(
("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))

scalaVersion := "2.13.5"
scalaVersion := "2.13.10"

Compile / scalacOptions ++= Seq(
"-target:11",
Expand All @@ -27,13 +27,13 @@ run / javaOptions ++= sys.props
.fold(Seq.empty[String])(res => Seq(s"-Dconfig.resource=$res"))
Global / cancelable := false // ctrl-c

val AkkaVersion = "2.7.0-M3"
val AkkaHttpVersion = "10.4.0-M1"
val AkkaManagementVersion = "1.2.0-M1"
val AkkaVersion = "2.7.0-M5"
val AkkaHttpVersion = "10.4.0-M2"
val AkkaManagementVersion = "1.2.0-M2"
val AkkaPersistenceR2dbcVersion = "1.0.0-M2"
// FIXME final release version
val AkkaProjectionVersion =
sys.props.getOrElse("akka-projection.version", "1.3.0-M2")
sys.props.getOrElse("akka-projection.version", "1.3.0-M3")

enablePlugins(AkkaGrpcPlugin)

Expand Down
2 changes: 1 addition & 1 deletion samples/grpc/shopping-cart-service-scala/project/plugins.sbt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.2.0-M1")
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.2.0-M2")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1")
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")

0 comments on commit 4854088

Please sign in to comment.