From 4fe520e550046879c87a5773729e68a9f1dc1e37 Mon Sep 17 00:00:00 2001 From: junya koyama Date: Wed, 27 Mar 2024 23:09:29 +0900 Subject: [PATCH 1/3] Upgrade go version to 1.21 in go.mod Signed-off-by: junya koyama --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 88575f408..33705e0ab 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module go.uber.org/zap -go 1.19 +go 1.21 require ( github.com/stretchr/testify v1.8.1 diff --git a/go.sum b/go.sum index a725757a7..4321f4f77 100644 --- a/go.sum +++ b/go.sum @@ -3,6 +3,7 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -20,6 +21,7 @@ go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From ec6516b094afb0bff7194365674575568ce10507 Mon Sep 17 00:00:00 2001 From: junya koyama Date: Wed, 27 Mar 2024 23:21:14 +0900 Subject: [PATCH 2/3] Upgrade go version to 1.21 in exp/go.mod Signed-off-by: junya koyama --- exp/go.mod | 2 +- exp/go.sum | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/exp/go.mod b/exp/go.mod index 7f4144e9b..6f29c4c11 100644 --- a/exp/go.mod +++ b/exp/go.mod @@ -1,6 +1,6 @@ module go.uber.org/zap/exp -go 1.19 +go 1.21 require ( github.com/stretchr/testify v1.8.1 diff --git a/exp/go.sum b/exp/go.sum index ef3c48f9b..ce473cdc4 100644 --- a/exp/go.sum +++ b/exp/go.sum @@ -11,6 +11,7 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= From 0abe27cbf58096a73ca39ac2b78c40cb3c20ec8f Mon Sep 17 00:00:00 2001 From: junya koyama Date: Wed, 3 Apr 2024 07:30:05 +0900 Subject: [PATCH 3/3] fix: run go mod tidy, upgrade tools. Signed-off-by: junya koyama --- tools/go.mod | 2 +- tools/go.sum | 3 +++ zapgrpc/internal/test/go.mod | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/go.mod b/tools/go.mod index bf851e386..8f036e311 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -9,4 +9,4 @@ require ( golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect ) -go 1.20 +go 1.21 diff --git a/tools/go.sum b/tools/go.sum index ce16f0521..697c65f1b 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -1,6 +1,9 @@ github.com/google/go-cmdtest v0.4.1-0.20220921163831-55ab3332a786 h1:rcv+Ippz6RAtvaGgKxc+8FQIpxHgsF+HBzPyYL2cyVU= +github.com/google/go-cmdtest v0.4.1-0.20220921163831-55ab3332a786/go.mod h1:apVn/GCasLZUVpAJ6oWAuyP7Ne7CEsQbTnc0plM3m+o= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= diff --git a/zapgrpc/internal/test/go.mod b/zapgrpc/internal/test/go.mod index 011bbede3..ea95417f7 100644 --- a/zapgrpc/internal/test/go.mod +++ b/zapgrpc/internal/test/go.mod @@ -1,6 +1,6 @@ module go.uber.org/zap/zapgrpc/internal/test -go 1.17 +go 1.21 require ( github.com/stretchr/testify v1.8.1