From f7b7e99fb40177d50062f303fa947c67457fe2d3 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Fri, 2 Aug 2019 16:17:21 +0300 Subject: [PATCH 1/2] Fix go.mod file for Go 1.13 --- go.mod | 3 ++- go.sum | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2202828a..bb30ab35 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,10 @@ module github.com/jhump/protoreflect require ( + github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect github.com/golang/protobuf v1.3.1 golang.org/x/net v0.0.0-20180530234432-1e491301e022 golang.org/x/text v0.3.0 // indirect - google.golang.org/genproto v0.0.0-20170818100345-ee236bd376b0 + google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0 google.golang.org/grpc v1.8.0 ) diff --git a/go.sum b/go.sum index 2a2f1113..7f113272 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,12 @@ +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= golang.org/x/net v0.0.0-20180530234432-1e491301e022 h1:MVYFTUmVD3/+ERcvRRI+P/C2+WOUimXh+Pd8LVsklZ4= golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -google.golang.org/genproto v0.0.0-20170818100345-ee236bd376b0 h1:jgaHBfsPDMBDKsth1hPtI1HcOyecWndWOFSGW21VgaM= -google.golang.org/genproto v0.0.0-20170818100345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0 h1:ZvI3lsq5AIkr7axxmT3tfwFlJVRFLqe6Fp0W03+MJ38= +google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/grpc v1.8.0 h1:HN69LlNA/SpyBIRxTfuU0QOntYfdeEeBWlVhRHRCOyw= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= From bcee28a8875a05bb488e1147b6d1d22315b15e52 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Fri, 2 Aug 2019 17:37:54 +0300 Subject: [PATCH 2/2] remove optional indirect dependency go mod tidy pulls in glog indirect dependency from grpc logger package. protoreflect does not use grpclog/glogger, so it's ok to omit glog from go.mod. --- go.mod | 1 - go.sum | 2 -- 2 files changed, 3 deletions(-) diff --git a/go.mod b/go.mod index bb30ab35..816dd645 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,6 @@ module github.com/jhump/protoreflect require ( - github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect github.com/golang/protobuf v1.3.1 golang.org/x/net v0.0.0-20180530234432-1e491301e022 golang.org/x/text v0.3.0 // indirect diff --git a/go.sum b/go.sum index 7f113272..c1b89715 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= golang.org/x/net v0.0.0-20180530234432-1e491301e022 h1:MVYFTUmVD3/+ERcvRRI+P/C2+WOUimXh+Pd8LVsklZ4=