diff options
author | Joe Tsai <joetsai@digital-static.net> | 2018-11-05 12:10:48 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-05 12:10:48 -0800 |
commit | 75dceb112b174be156fa9952e66d3e99945572b4 (patch) | |
tree | 9cb61fe6b130e3a62d0d94927321f78756322cf4 | |
parent | 1918e1ff6ffd2be7bed0553df8650672c3bfe80d (diff) | |
download | golang-protobuf-75dceb112b174be156fa9952e66d3e99945572b4.tar.gz |
all: increase minimum supported version to go1.9 (#742)
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | protoc-gen-go/grpc/grpc.go | 2 | ||||
-rw-r--r-- | protoc-gen-go/testdata/deprecated/deprecated.pb.go | 2 | ||||
-rw-r--r-- | protoc-gen-go/testdata/grpc/grpc.pb.go | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 3992e8c3..101feb29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ sudo: false language: go go: -- 1.6.x +- 1.9.x - 1.10.x - 1.11.x - 1.x @@ -7,7 +7,7 @@ Google's data interchange format. Copyright 2010 The Go Authors. https://github.com/golang/protobuf -This package and the code it generates requires at least Go 1.6. +This package and the code it generates requires at least Go 1.9. This software implements Go bindings for protocol buffers. For information about protocol buffers themselves, see diff --git a/protoc-gen-go/grpc/grpc.go b/protoc-gen-go/grpc/grpc.go index 58a1fcab..1ddfe836 100644 --- a/protoc-gen-go/grpc/grpc.go +++ b/protoc-gen-go/grpc/grpc.go @@ -52,7 +52,7 @@ const generatedCodeVersion = 4 // Paths for packages used by code generated in this file, // relative to the import_prefix of the generator.Generator. const ( - contextPkgPath = "golang.org/x/net/context" + contextPkgPath = "context" grpcPkgPath = "google.golang.org/grpc" ) diff --git a/protoc-gen-go/testdata/deprecated/deprecated.pb.go b/protoc-gen-go/testdata/deprecated/deprecated.pb.go index 3d943cbf..54a2707f 100644 --- a/protoc-gen-go/testdata/deprecated/deprecated.pb.go +++ b/protoc-gen-go/testdata/deprecated/deprecated.pb.go @@ -6,9 +6,9 @@ package deprecated import ( + context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" - context "golang.org/x/net/context" grpc "google.golang.org/grpc" math "math" ) diff --git a/protoc-gen-go/testdata/grpc/grpc.pb.go b/protoc-gen-go/testdata/grpc/grpc.pb.go index 79ab3622..5c30c4e5 100644 --- a/protoc-gen-go/testdata/grpc/grpc.pb.go +++ b/protoc-gen-go/testdata/grpc/grpc.pb.go @@ -4,9 +4,9 @@ package testing import ( + context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" - context "golang.org/x/net/context" grpc "google.golang.org/grpc" math "math" ) |