From 20ed87d83338d5b86d51b64429fa9d6e8379a771 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 8 Apr 2022 16:15:24 -0700 Subject: Upgrade honnef.co/go/tools to latest version The version of 'staticcheck' (part of honnef.co/go/tools) we were pinning is incompatible with Go 1.18, as per https://github.com/dominikh/go-tools/issues/1165. To allow 'make lint' to work with Go 1.18 and later, upgrade honnef.co/go/tools to the latest version. This requires that several other modules be upgraded too. --- go.mod | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'go.mod') diff --git a/go.mod b/go.mod index ff71171..eba0720 100644 --- a/go.mod +++ b/go.mod @@ -5,13 +5,16 @@ go 1.16 require ( github.com/client9/misspell v0.3.4 github.com/golang/protobuf v1.2.0 + github.com/google/renameio v0.1.0 // indirect + github.com/kisielk/gotool v1.0.0 // indirect github.com/pkg/errors v0.8.0 + github.com/rogpeppe/go-internal v1.3.0 // indirect github.com/urfave/cli v1.20.0 github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad - golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529 + golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 golang.org/x/lint v0.0.0-20190930215403-16217165b5de - golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 + golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 golang.org/x/term v0.0.0-20210422114643-f5beecf764ed - golang.org/x/tools v0.0.0-20191025023517-2077df36852e - honnef.co/go/tools v0.0.1-2019.2.3 + golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a + honnef.co/go/tools v0.3.0 ) -- cgit v1.2.3 From 8cb1b12197186bdafea5ff90a2a9a7a0d66faaf2 Mon Sep 17 00:00:00 2001 From: Joe Richey Date: Fri, 8 Apr 2022 16:32:57 -0700 Subject: Regenerate go.mod and go.sum with go 1.16 Signed-off-by: Joe Richey --- go.mod | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'go.mod') diff --git a/go.mod b/go.mod index eba0720..860b33f 100644 --- a/go.mod +++ b/go.mod @@ -4,17 +4,14 @@ go 1.16 require ( github.com/client9/misspell v0.3.4 - github.com/golang/protobuf v1.2.0 - github.com/google/renameio v0.1.0 // indirect - github.com/kisielk/gotool v1.0.0 // indirect - github.com/pkg/errors v0.8.0 - github.com/rogpeppe/go-internal v1.3.0 // indirect - github.com/urfave/cli v1.20.0 + github.com/golang/protobuf v1.5.2 + github.com/pkg/errors v0.9.1 + github.com/urfave/cli v1.22.5 github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad - golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 - golang.org/x/lint v0.0.0-20190930215403-16217165b5de - golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 - golang.org/x/term v0.0.0-20210422114643-f5beecf764ed + golang.org/x/crypto v0.0.0-20220408190544-5352b0902921 + golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 + golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a honnef.co/go/tools v0.3.0 ) -- cgit v1.2.3 From ca7a84b8aea203025acbda193f78ea98946236b5 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 8 Apr 2022 23:16:59 -0700 Subject: Switch to google.golang.org/protobuf/proto github.com/golang/protobuf/proto has been deprecated in favor of google.golang.org/protobuf/proto, so migrate to the non-deprecated one. --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'go.mod') diff --git a/go.mod b/go.mod index 860b33f..8087d79 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.16 require ( github.com/client9/misspell v0.3.4 - github.com/golang/protobuf v1.5.2 github.com/pkg/errors v0.9.1 github.com/urfave/cli v1.22.5 github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad @@ -13,5 +12,6 @@ require ( golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a + google.golang.org/protobuf v1.28.0 honnef.co/go/tools v0.3.0 ) -- cgit v1.2.3