Skip to content
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
10 changes: 1 addition & 9 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,7 @@ ThisBuild / javacOptions ++= List(
ThisBuild / javafmtFormatterCompatibleJavaVersion := 17
ThisBuild / Test / fork := true

ThisBuild / resolvers ++= Seq(
Resolver.sonatypeCentralSnapshots,
Resolver.ApacheMavenSnapshotsRepo,
)

ThisBuild / dependencyOverrides ++= Seq(
Dependencies.Compile.pekkoStream,
Dependencies.Compile.pekkoDiscovery,
)
ThisBuild / resolvers += Resolver.sonatypeCentralSnapshots

val playGrpc = Project("play-grpc", file("."))
aggregateProjects(
Expand Down
2 changes: 1 addition & 1 deletion docs/antora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ nav:
- modules/ROOT/nav.adoc
asciidoc:
attributes:
pekko-grpc-version: 2.0.0-M2 # Sync with `sbt-pekko-grpc` in project/plugins.sbt
pekko-grpc-version: 2.0.0 # Sync with `sbt-pekko-grpc` in project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ class PlayJavaRouterSpec extends AnyWordSpec with Matchers with BeforeAndAfterAl
.single(msg)
.map(serializer.serialize)
.map(DataFrame(_))
.via(GrpcProtocolNative.newWriter(Identity).frameEncoder),
.map(GrpcProtocolNative.newWriter(Identity).encodeFrame),
),
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class PlayScalaRouterSpec extends AnyWordSpec with Matchers with BeforeAndAfterA
.single(msg)
.map(serializer.serialize)
.map(DataFrame(_))
.via(GrpcProtocolNative.newWriter(Identity).frameEncoder),
.map(GrpcProtocolNative.newWriter(Identity).encodeFrame),
),
)
}
Expand Down
8 changes: 4 additions & 4 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ object Dependencies {

// Don't use PekkoGrpcBuildInfo.pekkoHttpVersion or PekkoGrpcBuildInfo.pekkoVersion and prioritize
// aligning with versions transitively brought in via Play.
val pekko = "2.0.0-M4"
val pekkoHttp = "2.0.0-M1+314-958943d2-SNAPSHOT"
val pekko = "2.0.0"
val pekkoHttp = "2.0.0"

val pekkoGrpc: String = PekkoGrpcBuildInfo.version
val grpc: String = PekkoGrpcBuildInfo.grpcVersion

val play = sys.props.getOrElse("play.version", "3.1.0-M10-e1f3c2a9-SNAPSHOT")
val play = sys.props.getOrElse("play.version", "3.1.0-M10-de32fcb4-SNAPSHOT")

val scalaTest = "3.2.20"
val scalaTestPlusPlay = "8.0.0-M2+86-ba513f60-SNAPSHOT"
val scalaTestPlusPlay = "8.0.0-M2+91-0f24d96f-SNAPSHOT"

val macwire = "2.6.5"
}
Expand Down
6 changes: 2 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@ addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % "2.1.0-M9+129
addSbtPlugin("com.github.sbt" % "sbt-header" % "5.11.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.6.2")
addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.14.0")
addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % "2.0.0-M2") // Sync with docs/antora.yml
// Remove this explicit dependency when upgrading pekko-grpc-sbt-plugin to 2.0.0-M3 or later.
addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.1.0-RC2")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.12.1")
addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % "2.0.0") // Sync with docs/antora.yml
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.12.1")