Skip to content

Commit c0cc178

Browse files
committed
Fully qualify references to the io root package.
Revert this commit once scala/scala3#2860 is merged.
1 parent f113c57 commit c0cc178

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

scalapb-runtime-grpc/src/main/scala/com/trueaccord/scalapb/grpc/Grpc.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.trueaccord.scalapb.grpc
22

33
import com.google.common.util.concurrent.{FutureCallback, Futures, ListenableFuture}
4-
import io.grpc.{Status, StatusException}
5-
import io.grpc.stub.StreamObserver
4+
import _root_.io.grpc.{Status, StatusException}
5+
import _root_.io.grpc.stub.StreamObserver
66

77
import scala.concurrent.{Future, Promise}
88
import scala.util.Try

scalapb-runtime-grpc/src/main/scala/com/trueaccord/scalapb/grpc/Marshaller.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import java.io.{ByteArrayInputStream, InputStream}
44

55
import com.trueaccord.scalapb.{GeneratedMessage, GeneratedMessageCompanion, Message}
66

7-
class Marshaller[T <: GeneratedMessage with Message[T]](companion: GeneratedMessageCompanion[T]) extends io.grpc.MethodDescriptor.Marshaller[T] {
7+
class Marshaller[T <: GeneratedMessage with Message[T]](companion: GeneratedMessageCompanion[T]) extends _root_.io.grpc.MethodDescriptor.Marshaller[T] {
88
override def stream(t: T): InputStream = new ByteArrayInputStream(t.toByteArray)
99

1010
override def parse(inputStream: InputStream): T =

scalapb-runtime-grpc/src/main/scala/com/trueaccord/scalapb/grpc/ProtoUtils.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.trueaccord.scalapb.grpc
22

33
import com.google.protobuf.InvalidProtocolBufferException
44
import com.trueaccord.scalapb.{GeneratedMessage, GeneratedMessageCompanion, Message}
5-
import io.grpc.Metadata
5+
import _root_.io.grpc.Metadata
66

77
object ProtoUtils {
88
class ScalaPbMetadataMarshaller[T <: GeneratedMessage with Message[T]](companion: GeneratedMessageCompanion[T]) extends Metadata.BinaryMarshaller[T] {

0 commit comments

Comments
 (0)