Bumps grpc version. Removes deprecated function (#1001)

higherkindness · Aug 26, 2020 · 709ff2a · 709ff2a
1 parent 6f13dd7
commit 709ff2a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/modules/service/src/main/scala/higherkindness/mu/rpc/channel/ManagedChannelConfig.scala b/modules/service/src/main/scala/higherkindness/mu/rpc/channel/ManagedChannelConfig.scala
@@ -30,9 +30,7 @@ final case class AddInterceptor(interceptors: ClientInterceptor*) extends Manage
 final case class UserAgent(userAgent: String) extends ManagedChannelConfig
 final case class OverrideAuthority(authority: String) extends ManagedChannelConfig
 final case class UsePlaintext() extends ManagedChannelConfig
-final case class NameResolverFactory(resolverFactory: NameResolver.Factory)
- extends ManagedChannelConfig
-final case class DefaultLoadBalancingPolicy(policy: String) extends ManagedChannelConfig
+final case class DefaultLoadBalancingPolicy(policy: String) extends ManagedChannelConfig
 final case class SetDecompressorRegistry(registry: DecompressorRegistry)
  extends ManagedChannelConfig
 final case class SetCompressorRegistry(registry: CompressorRegistry) extends ManagedChannelConfig

diff --git a/modules/service/src/main/scala/higherkindness/mu/rpc/channel/package.scala b/modules/service/src/main/scala/higherkindness/mu/rpc/channel/package.scala
@@ -34,7 +34,6 @@ package object channel {
  case UserAgent(userAgent) => mcb.userAgent(userAgent)
  case OverrideAuthority(authority) => mcb.overrideAuthority(authority)
  case UsePlaintext() => mcb.usePlaintext()
- case NameResolverFactory(rf) => mcb.nameResolverFactory(rf)
  case DefaultLoadBalancingPolicy(p) => mcb.defaultLoadBalancingPolicy(p)
  case SetDecompressorRegistry(registry) => mcb.decompressorRegistry(registry)
  case SetCompressorRegistry(registry) => mcb.compressorRegistry(registry)

diff --git a/modules/tests/src/test/scala/higherkindness/mu/rpc/channel/RpcClientTestSuite.scala b/modules/tests/src/test/scala/higherkindness/mu/rpc/channel/RpcClientTestSuite.scala
@@ -17,13 +17,11 @@
 package higherkindness.mu.rpc
 package channel
 
-import java.net.URI
 import java.util.concurrent.{Callable, Executor, Executors, TimeUnit}
 
 import com.google.common.util.concurrent.{ListenableFuture, ListeningExecutorService, MoreExecutors}
 import higherkindness.mu.rpc.channel.utils.StringMarshaller
 import higherkindness.mu.rpc.common.{RpcBaseTestSuite, SC}
-import higherkindness.mu.rpc.testing.client.FakeNameResolverFactory
 import higherkindness.mu.rpc.testing.interceptors.NoopInterceptor
 import io.grpc.internal.testing.TestUtils
 import io.grpc._
@@ -59,9 +57,6 @@ trait RpcClientTestSuite extends RpcBaseTestSuite {
  UserAgent("User-Agent"),
  OverrideAuthority(TestUtils.TEST_SERVER_HOST),
  UsePlaintext(),
- NameResolverFactory(
- FakeNameResolverFactory(new URI("defaultscheme", "", "/[valid]", null).getScheme)
- ),
  DefaultLoadBalancingPolicy("round_robin"),
  SetDecompressorRegistry(DecompressorRegistry.getDefaultInstance),
  SetCompressorRegistry(CompressorRegistry.getDefaultInstance),

diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala
@@ -25,7 +25,7 @@ object ProjectPlugin extends AutoPlugin {
  val fs2: String = "2.4.4"
  val fs2Grpc: String = "0.7.3"
  val fs2Kafka: String = "1.0.0"
- val grpc: String = "1.30.2"
+ val grpc: String = "1.31.1"
  val jodaTime: String = "2.10.6"
  val http4s: String = "0.21.0-M6"
  val kindProjector: String = "0.11.0"
@@ -35,14 +35,13 @@ object ProjectPlugin extends AutoPlugin {
  val scalalogging: String = "3.9.2" // used in tests
  val monix: String = "3.2.2"
  val natchez: String = "0.0.12"
- val nettySSL: String = "2.0.34.Final"
+ val nettySSL: String = "2.0.30.Final"
  val paradise: String = "2.1.1"
  val pbdirect: String = "0.5.2"
  val prometheus: String = "0.9.0"
  val pureconfig: String = "0.13.0"
  val reactiveStreams: String = "1.0.3"
  val scalaCollectionCompat: String = "2.1.6"
- val scalacheck: String = "1.14.3"
  val scalacheckToolbox: String = "0.3.5"
  val scalamock: String = "5.0.0"
  val scalatest: String = "3.2.2"