diff --git a/build.sbt b/build.sbt index df1565c1ec..66677b9d4f 100644 --- a/build.sbt +++ b/build.sbt @@ -198,7 +198,6 @@ lazy val googleCloudPubSubGrpc = alpakkaProject( akkaGrpcCodeGeneratorSettings ~= { _.filterNot(_ == "flat_package") }, akkaGrpcGeneratedSources := Seq(AkkaGrpc.Client), akkaGrpcGeneratedLanguages := Seq(AkkaGrpc.Scala, AkkaGrpc.Java), - Compile / PB.protoSources += (Compile / PB.externalIncludePath).value, // for the ExampleApp in the tests connectInput in run := true, Compile / scalacOptions ++= Seq( diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b3c4dad3cf..d796031f19 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -240,9 +240,9 @@ object Dependencies { // see Akka gRPC version in plugins.sbt libraryDependencies ++= Seq( // https://github.com/googleapis/java-pubsub/tree/master/proto-google-cloud-pubsub-v1/ - "com.google.api.grpc" % "grpc-google-cloud-pubsub-v1" % "1.85.1" % "protobuf-src", // ApacheV2 + "com.google.cloud" % "google-cloud-pubsub" % "1.112.5" % "protobuf-src", // ApacheV2 "io.grpc" % "grpc-auth" % akka.grpc.gen.BuildInfo.grpcVersion, // ApacheV2 - "com.google.auth" % "google-auth-library-oauth2-http" % "0.20.0", // BSD 3-clause + "com.google.auth" % "google-auth-library-oauth2-http" % "0.22.2", // BSD 3-clause // pull in Akka Discovery for our Akka version "com.typesafe.akka" %% "akka-discovery" % AkkaVersion ) ++ Silencer diff --git a/project/plugins.sbt b/project/plugins.sbt index f19b85cbc4..809ad9d134 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -15,6 +15,6 @@ addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1") // Akka gRPC -- sync with version in Dependencies.scala -addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "1.0.0") +addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.0.0-M1") // templating addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.6.1")