diff --git a/build.sbt b/build.sbt index 718fda4e..557779e1 100644 --- a/build.sbt +++ b/build.sbt @@ -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( diff --git a/docs/antora.yml b/docs/antora.yml index 79dfaf31..2003a68e 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -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 diff --git a/play-interop-test-java/src/test/scala/play/grpc/PlayJavaRouterSpec.scala b/play-interop-test-java/src/test/scala/play/grpc/PlayJavaRouterSpec.scala index 911a3729..5d34fb59 100644 --- a/play-interop-test-java/src/test/scala/play/grpc/PlayJavaRouterSpec.scala +++ b/play-interop-test-java/src/test/scala/play/grpc/PlayJavaRouterSpec.scala @@ -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), ), ) } diff --git a/play-interop-test-scala/src/test/scala/play/grpc/PlayScalaRouterSpec.scala b/play-interop-test-scala/src/test/scala/play/grpc/PlayScalaRouterSpec.scala index 8286ea1a..4af26e87 100644 --- a/play-interop-test-scala/src/test/scala/play/grpc/PlayScalaRouterSpec.scala +++ b/play-interop-test-scala/src/test/scala/play/grpc/PlayScalaRouterSpec.scala @@ -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), ), ) } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 20a632a6..aa3e4ba9 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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" } diff --git a/project/plugins.sbt b/project/plugins.sbt index 464a6301..6077329a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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")