Skip to content

Commit 60e9004

Browse files
Create v2 branch and module
1 parent 55d3577 commit 60e9004

File tree

104 files changed

+245
-245
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+245
-245
lines changed

BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ buildifier(
1313
# gazelle:exclude third_party
1414
# gazelle:exclude vendor
1515
# gazelle:exclude _output
16-
# gazelle:prefix github.com/grpc-ecosystem/grpc-gateway
16+
# gazelle:prefix github.com/grpc-ecosystem/grpc-gateway/v2
1717

1818
gazelle(name = "gazelle")
1919

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ RUNTIME_GO=$(RUNTIME_PROTO:.proto=.pb.go)
5050
OPENAPIV2_PROTO=protoc-gen-swagger/options/openapiv2.proto protoc-gen-swagger/options/annotations.proto
5151
OPENAPIV2_GO=$(OPENAPIV2_PROTO:.proto=.pb.go)
5252

53-
PKGMAP=Mgoogle/protobuf/field_mask.proto=google.golang.org/genproto/protobuf/field_mask,Mgoogle/protobuf/descriptor.proto=$(GO_PLUGIN_PKG)/descriptor,Mexamples/internal/proto/sub/message.proto=github.com/grpc-ecosystem/grpc-gateway/examples/internal/proto/sub
53+
PKGMAP=Mgoogle/protobuf/field_mask.proto=google.golang.org/genproto/protobuf/field_mask,Mgoogle/protobuf/descriptor.proto=$(GO_PLUGIN_PKG)/descriptor,Mexamples/internal/proto/sub/message.proto=github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/proto/sub
5454
ADDITIONAL_GW_FLAGS=
5555
ifneq "$(GATEWAY_PLUGIN_FLAGS)" ""
5656
ADDITIONAL_GW_FLAGS=,$(GATEWAY_PLUGIN_FLAGS)

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# grpc-gateway
22

3-
[![release](https://img.shields.io/github/release/grpc-ecosystem/grpc-gateway.svg?style=flat-square)](https://github.com/grpc-ecosystem/grpc-gateway/releases) [![CircleCI](https://img.shields.io/circleci/project/github/grpc-ecosystem/grpc-gateway/master.svg?style=flat-square)](https://circleci.com/gh/grpc-ecosystem/grpc-gateway) [![fuzzit](https://app.fuzzit.dev/badge?org_id=grpc-gateway)](https://app.fuzzit.dev/orgs/grpc-gateway/dashboard) [![coverage](https://img.shields.io/codecov/c/github/grpc-ecosystem/grpc-gateway/master.svg?style=flat-square)](https://codecov.io/gh/grpc-ecosystem/grpc-gateway) [![license](https://img.shields.io/github/license/grpc-ecosystem/grpc-gateway.svg?style=flat-square)](LICENSE.txt)
3+
[![release](https://img.shields.io/github/release/grpc-ecosystem/grpc-gateway.svg?style=flat-square)](https://github.com/grpc-ecosystem/grpc-gateway/releases) [![CircleCI](https://img.shields.io/circleci/project/github/grpc-ecosystem/grpc-gateway/v2.svg?style=flat-square)](https://circleci.com/gh/grpc-ecosystem/grpc-gateway) [![fuzzit](https://app.fuzzit.dev/badge?org_id=grpc-gateway)](https://app.fuzzit.dev/orgs/grpc-gateway/dashboard) [![coverage](https://img.shields.io/codecov/c/github/grpc-ecosystem/grpc-gateway/v2.svg?style=flat-square)](https://codecov.io/gh/grpc-ecosystem/grpc-gateway) [![license](https://img.shields.io/github/license/grpc-ecosystem/grpc-gateway.svg?style=flat-square)](LICENSE.txt)
44

55
The grpc-gateway is a plugin of the Google protocol buffers compiler
66
[protoc](https://github.com/protocolbuffers/protobuf).
@@ -48,8 +48,8 @@ to track the versions of the following executable packages:
4848
package tools
4949

5050
import (
51-
_ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway"
52-
_ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger"
51+
_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway"
52+
_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-swagger"
5353
_ "github.com/golang/protobuf/protoc-gen-go"
5454
)
5555
```
@@ -58,8 +58,8 @@ Run `go mod tidy` to resolve the versions. Install by running
5858

5959
```sh
6060
$ go install \
61-
github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway \
62-
github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger \
61+
github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway \
62+
github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-swagger \
6363
github.com/golang/protobuf/protoc-gen-go
6464
```
6565

@@ -172,7 +172,7 @@ annotation to your .proto file
172172
"net/http"
173173
174174
"github.com/golang/glog"
175-
"github.com/grpc-ecosystem/grpc-gateway/runtime"
175+
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
176176
"google.golang.org/grpc"
177177
178178
gw "github.com/yourorg/yourrepo/proto/gen/go/your/service/v1/your_service" // Update

codegenerator/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ go_library(
88
"doc.go",
99
"parse_req.go",
1010
],
11-
importpath = "github.com/grpc-ecosystem/grpc-gateway/codegenerator",
11+
importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/codegenerator",
1212
deps = [
1313
"@com_github_golang_protobuf//proto:go_default_library",
1414
"@io_bazel_rules_go//proto/wkt:compiler_plugin_go_proto",

codegenerator/parse_req_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
"github.com/golang/protobuf/proto"
1212
plugin "github.com/golang/protobuf/protoc-gen-go/plugin"
13-
"github.com/grpc-ecosystem/grpc-gateway/codegenerator"
13+
"github.com/grpc-ecosystem/grpc-gateway/v2/codegenerator"
1414
)
1515

1616
var parseReqTests = []struct {

examples/internal/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $ dep init
88
Follow the guides from this [README.md](./browser/README.md) to run the server and gateway.
99
```bash
1010
# Make sure you are in the correct directory:
11-
# $GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/examples
11+
# $GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/v2/examples
1212
$ cd examples/internal/browser
1313
$ pwd
1414

examples/internal/browser/gulpfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ gulp.task('bower', function () {
1616
});
1717

1818
gulp.task('server', shell.task([
19-
'go build -o bin/example-server github.com/grpc-ecosystem/grpc-gateway/examples/internal/cmd/example-grpc-server',
19+
'go build -o bin/example-server github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/cmd/example-grpc-server',
2020
]));
2121

2222
gulp.task('gateway', shell.task([
23-
'go build -o bin/example-gw github.com/grpc-ecosystem/grpc-gateway/examples/internal/cmd/example-gateway-server',
23+
'go build -o bin/example-gw github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/cmd/example-gateway-server',
2424
]));
2525

2626
gulp.task('serve-server', ['server'], function () {

examples/internal/clients/abe/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ go_library(
2626
"model_sub_string_message.go",
2727
"response.go",
2828
],
29-
importpath = "github.com/grpc-ecosystem/grpc-gateway/examples/internal/clients/abe",
29+
importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/clients/abe",
3030
deps = [
3131
"//examples/internal/proto/examplepb:go_default_library",
3232
"//examples/internal/proto/pathenum:go_default_library",

examples/internal/clients/abe/enum_helper.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package abe
22

33
import (
4-
pbexamplepb "github.com/grpc-ecosystem/grpc-gateway/examples/internal/proto/examplepb"
5-
pbpathenum "github.com/grpc-ecosystem/grpc-gateway/examples/internal/proto/pathenum"
6-
"github.com/grpc-ecosystem/grpc-gateway/runtime"
4+
pbexamplepb "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/proto/examplepb"
5+
pbpathenum "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/proto/pathenum"
6+
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
77
)
88

99
// String returns a string representation of "NumericEnum"

examples/internal/clients/echo/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ go_library(
1414
"model_runtime_error.go",
1515
"response.go",
1616
],
17-
importpath = "github.com/grpc-ecosystem/grpc-gateway/examples/internal/clients/echo",
17+
importpath = "github.com/grpc-ecosystem/grpc-gateway/v2/examples/internal/clients/echo",
1818
deps = [
1919
"@com_github_antihax_optional//:go_default_library",
2020
"@org_golang_x_oauth2//:go_default_library",

0 commit comments

Comments
 (0)