Properly upgrade gRPC to 1.41.0 (#11858)

CHANGELOG_BEGIN CHANGELOG_END
digital-asset · Nov 25, 2021 · 6356f13 · 6356f13
1 parent f6accd3
commit 6356f13
Show file tree

Hide file tree

Showing 4 changed files with 329 additions and 353 deletions.
diff --git a/bazel-java-deps.bzl b/bazel-java-deps.bzl
@@ -30,7 +30,7 @@ netty_version = "4.1.67.Final"
 # <tcnative.version>2.0.42.Final</tcnative.version>
 # ```
 netty_tcnative_version = "2.0.40.Final"
-grpc_version = "1.35.0"
+grpc_version = "1.41.0"
 akka_version = "2.6.13"
 gatling_version = "3.5.1"
 

diff --git a/libs-scala/grpc-test-utils/src/main/scala/com/daml/grpc/test/GrpcServer.scala b/libs-scala/grpc-test-utils/src/main/scala/com/daml/grpc/test/GrpcServer.scala
@@ -13,7 +13,7 @@ import io.grpc.reflection.v1alpha.{
   ServerReflectionRequest,
   ServerReflectionResponse,
 }
-import io.grpc.services.HealthStatusManager
+import io.grpc.protobuf.services.HealthStatusManager
 import io.grpc.stub.StreamObserver
 import io.grpc.{BindableService, Channel, ClientInterceptor}
 import org.scalatest.Assertion

diff --git a/libs-scala/resources-grpc/src/test/scala/com/daml/resources/grpc/GrpcResourceOwnerSpec.scala b/libs-scala/resources-grpc/src/test/scala/com/daml/resources/grpc/GrpcResourceOwnerSpec.scala
@@ -7,7 +7,7 @@ import com.daml.resources.grpc.{GrpcResourceOwnerFactories => Resources}
 import io.grpc.health.v1.{HealthCheckRequest, HealthGrpc}
 import io.grpc.inprocess.{InProcessChannelBuilder, InProcessServerBuilder}
 import io.grpc.netty.{NettyChannelBuilder, NettyServerBuilder}
-import io.grpc.services.HealthStatusManager
+import io.grpc.protobuf.services.HealthStatusManager
 import io.netty.util.concurrent.DefaultThreadFactory
 import org.scalatest.flatspec.AsyncFlatSpec
 import org.scalatest.matchers.should.Matchers