From 14599754e1435ee393c4107ed7451452042a6a04 Mon Sep 17 00:00:00 2001 From: Yuki Yugui Sonoda Date: Thu, 2 Jun 2016 10:18:37 +0900 Subject: [PATCH 1/2] Update dependencies --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 443cf069d3e..53c2f252adf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,13 @@ branches: language: go sudo: false go: -- 1.5 +- 1.6.2 - tip cache: directories: - $HOME/local before_install: -- ./.travis.build-protoc.sh 3.0.0-beta-2 +- ./.travis.build-protoc.sh 3.0.0-beta-3 - go get github.com/golang/lint/golint install: - go get github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway From 04e4f1e821086be6d0dff781c557420073b15a68 Mon Sep 17 00:00:00 2001 From: Yuki Yugui Sonoda Date: Thu, 2 Jun 2016 10:34:44 +0900 Subject: [PATCH 2/2] Regenerate files with the latest protoc-gen-go --- examples/examplepb/echo_service.pb.go | 4 +++- examples/sub/message.pb.go | 4 +++- examples/sub2/message.pb.go | 4 +++- runtime/stream_chunk.pb.go | 4 +++- third_party/googleapis/google/api/annotations.pb.go | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/examples/examplepb/echo_service.pb.go b/examples/examplepb/echo_service.pb.go index fb676c649f4..1eadb59e9d9 100644 --- a/examples/examplepb/echo_service.pb.go +++ b/examples/examplepb/echo_service.pb.go @@ -44,7 +44,9 @@ var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. -const _ = proto.ProtoPackageIsVersion1 +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package // SimpleMessage represents a simple message sent to the Echo service. type SimpleMessage struct { diff --git a/examples/sub/message.pb.go b/examples/sub/message.pb.go index 841d9401588..dc117712bb7 100644 --- a/examples/sub/message.pb.go +++ b/examples/sub/message.pb.go @@ -24,7 +24,9 @@ var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. -const _ = proto.ProtoPackageIsVersion1 +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type StringMessage struct { Value *string `protobuf:"bytes,1,req,name=value" json:"value,omitempty"` diff --git a/examples/sub2/message.pb.go b/examples/sub2/message.pb.go index 44550d528d8..20e67f637db 100644 --- a/examples/sub2/message.pb.go +++ b/examples/sub2/message.pb.go @@ -24,7 +24,9 @@ var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. -const _ = proto.ProtoPackageIsVersion1 +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type IdMessage struct { Uuid string `protobuf:"bytes,1,opt,name=uuid" json:"uuid,omitempty"` diff --git a/runtime/stream_chunk.pb.go b/runtime/stream_chunk.pb.go index bdd065f910a..f45504e2291 100644 --- a/runtime/stream_chunk.pb.go +++ b/runtime/stream_chunk.pb.go @@ -24,7 +24,9 @@ var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. -const _ = proto.ProtoPackageIsVersion1 +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type StreamError struct { GrpcCode int32 `protobuf:"varint,1,opt,name=grpc_code,json=grpcCode" json:"grpc_code,omitempty"` diff --git a/third_party/googleapis/google/api/annotations.pb.go b/third_party/googleapis/google/api/annotations.pb.go index 1243ecca485..21fca4856a2 100644 --- a/third_party/googleapis/google/api/annotations.pb.go +++ b/third_party/googleapis/google/api/annotations.pb.go @@ -27,7 +27,9 @@ var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. -const _ = proto.ProtoPackageIsVersion1 +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package var E_Http = &proto.ExtensionDesc{ ExtendedType: (*google_protobuf.MethodOptions)(nil),