chore: bumped grpc-gateway version to v2

petomalina · May 19, 2021 · 0f00d2b · 0f00d2b
1 parent 926d2d7
commit 0f00d2b
Show file tree

Hide file tree

Showing 13 changed files with 577 additions and 149 deletions.
diff --git a/Makefile b/Makefile
@@ -3,6 +3,7 @@ PROTOC_INCLUDES= -Iproto -Iproto/3rdparty/api-common-protos -Iproto/3rdparty/pro
 
 gen:
 	@$(foreach SERVICE,$(SERVICES), protoc $(PROTOC_INCLUDES)\
-		--go_out=Mgoogle/protobuf/wrappers.proto,plugins=grpc,paths=source_relative:examples/api \
+		--go_out=Mgoogle/protobuf/wrappers.proto,paths=source_relative:examples/api \
+		--go-grpc_out=paths=source_relative:examples/api \
 		--grpc-gateway_out=logtostderr=true,allow_patch_feature=false,paths=source_relative:examples/api \
 		"proto/$(SERVICE)".proto;)
diff --git a/examples/api/echo.pb.go b/examples/api/echo.pb.go
diff --git a/examples/api/echo.pb.gw.go b/examples/api/echo.pb.gw.go
diff --git a/examples/api/echo_grpc.pb.go b/examples/api/echo_grpc.pb.go
diff --git a/examples/grpc-http-pubsub/main.go b/examples/grpc-http-pubsub/main.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"github.com/blendle/zapdriver"
 	"github.com/grpc-ecosystem/go-grpc-middleware/util/metautils"
-	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/petomalina/xrpc/examples/api"
 	"github.com/petomalina/xrpc/pkg/multiplexer"
 	"go.uber.org/zap"

diff --git a/examples/grpc-http-server/main.go b/examples/grpc-http-server/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"context"
 	"github.com/grpc-ecosystem/go-grpc-middleware/util/metautils"
-	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/petomalina/xrpc/examples/api"
 	"github.com/petomalina/xrpc/pkg/multiplexer"
 	"go.uber.org/zap"

diff --git a/examples/grpc-http/main.go b/examples/grpc-http/main.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"github.com/blendle/zapdriver"
 	"github.com/grpc-ecosystem/go-grpc-middleware/util/metautils"
-	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/petomalina/xrpc/examples/api"
 	"github.com/petomalina/xrpc/pkg/multiplexer"
 	"go.uber.org/zap"

diff --git a/go.mod b/go.mod
@@ -5,17 +5,16 @@ go 1.15
 require (
 	github.com/blendle/zapdriver v1.3.1
 	github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
-	github.com/golang/protobuf v1.4.1
-	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/golang/protobuf v1.5.2
 	github.com/grpc-ecosystem/go-grpc-middleware v1.2.2
-	github.com/grpc-ecosystem/grpc-gateway v1.15.0
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.4.0
 	github.com/improbable-eng/grpc-web v0.13.0
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
 	github.com/rs/cors v1.7.0 // indirect
-	github.com/stretchr/testify v1.6.1
+	github.com/stretchr/testify v1.7.0
 	go.uber.org/zap v1.16.0
-	golang.org/x/net v0.0.0-20200904194848-62affa334b73
-	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013
-	google.golang.org/grpc v1.32.0
-	google.golang.org/protobuf v1.25.0
+	golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4
+	google.golang.org/genproto v0.0.0-20210426193834-eac7f76ac494
+	google.golang.org/grpc v1.37.0
+	google.golang.org/protobuf v1.26.0
 )