Bump golang/protobuf version to 1.1.0

johanbrandhorst · Jul 25, 2018 · 227432c · 227432c
1 parent aab3fa1
commit 227432c
Show file tree

Hide file tree

Showing 41 changed files with 8,718 additions and 4,140 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -11,7 +11,7 @@ required = [
 
 [[constraint]]
   name = "github.com/golang/protobuf"
-  version = "=1.0.0"
+  version = "1.1.0"
 
 [[constraint]]
   branch = "master"

diff --git a/proto/gopherjs.pb.go b/proto/gopherjs.pb.go
diff --git a/protoc-gen-gopherjs/test/multi/multi1.proto b/protoc-gen-gopherjs/test/multi/multi1.proto
@@ -39,6 +39,7 @@ package multitest;
 import "github.com/johanbrandhorst/protobuf/proto/gopherjs.proto";
 
 option (gopherjs.gopherjs_package) = "github.com/johanbrandhorst/protobuf/protoc-gen-gopherjs/test/multi";
+option go_package = "github.com/johanbrandhorst/protobuf/test/server/proto/multi";
 
 message Multi1 {
   Multi2 multi2 = 1;

diff --git a/protoc-gen-gopherjs/test/multi/multi2.proto b/protoc-gen-gopherjs/test/multi/multi2.proto
@@ -36,6 +36,7 @@ package multitest;
 import "github.com/johanbrandhorst/protobuf/proto/gopherjs.proto";
 
 option (gopherjs.gopherjs_package) = "github.com/johanbrandhorst/protobuf/protoc-gen-gopherjs/test/multi";
+option go_package = "github.com/johanbrandhorst/protobuf/test/server/proto/multi";
 
 message Multi2 {
   int32 required_value = 1;

diff --git a/protoc-gen-gopherjs/test/multi/multi3.proto b/protoc-gen-gopherjs/test/multi/multi3.proto
@@ -36,6 +36,7 @@ package multitest;
 import "github.com/johanbrandhorst/protobuf/proto/gopherjs.proto";
 
 option (gopherjs.gopherjs_package) = "github.com/johanbrandhorst/protobuf/protoc-gen-gopherjs/test/multi";
+option go_package = "github.com/johanbrandhorst/protobuf/test/server/proto/multi";
 
 message Multi3 {
   enum HatType {

diff --git a/test/Makefile b/test/Makefile
@@ -7,7 +7,7 @@ regenerate:
 		../protoc-gen-gopherjs/test/multi/multi1.proto \
 		../protoc-gen-gopherjs/test/multi/multi2.proto \
 		../protoc-gen-gopherjs/test/multi/multi3.proto \
-		--go_out=plugins=grpc,Mmulti/multi1.proto=github.com/johanbrandhorst/protobuf/protoc-gen-gopherjs/test/multi:./server/proto
+		--go_out=plugins=grpc:${GOPATH}/src
 	protoc -I. -I${GOPATH}/src -I../protoc-gen-gopherjs/test \
 		../protoc-gen-gopherjs/test/types/types.proto \
 		--go_out=plugins=grpc,Mmulti/multi1.proto=github.com/johanbrandhorst/protobuf/test/server/proto/multi:./server/proto

diff --git a/test/server/proto/multi/multi1.pb.go b/test/server/proto/multi/multi1.pb.go
diff --git a/test/server/proto/multi/multi2.pb.go b/test/server/proto/multi/multi2.pb.go