all: depend on github.com/golang/protobuf@1.4.0-rc1

While this module has no actual dependency on APIv1, we want to ensure
that programs using both APIv1 and APIv2 use a version of APIv1 that
wraps APIv2.

Updates golang/protobuf#1032.

Change-Id: Ie69ce2930c843a7232c79b21ff418c53b28ed1af
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/219382
Reviewed-by: Joe Tsai <joetsai@google.com>
This commit is contained in:
Damien Neil 2020-02-13 15:20:57 -08:00
parent 709e7c8474
commit baf64d5536
3 changed files with 23 additions and 1 deletions

5
go.mod
View File

@ -2,4 +2,7 @@ module google.golang.org/protobuf
go 1.9 go 1.9
require github.com/google/go-cmp v0.3.0 require (
github.com/golang/protobuf v1.4.0-rc.1
github.com/google/go-cmp v0.3.1
)

5
go.sum
View File

@ -1,2 +1,7 @@
github.com/golang/protobuf v1.4.0-rc.1 h1:axiiuL94A9bpjZyKcirx5U62av32UORcixjrwLdzvMo=
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=

14
internal/depv1/depv1.go Normal file
View File

@ -0,0 +1,14 @@
// Copyright 2020 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
// Package depv1 exists to depend on github.com/golang/protobuf.
//
// We include this dependency to ensure that any program using
// APIv2 also uses a sufficiently new version of APIv1. At some
// point in the future when old versions of APIv1 are no longer
// of concern, we may drop this dependency.
package depv1
// TODO: Delete this dependency when it no longer serves a purpose.
import _ "github.com/golang/protobuf/proto"