Skip to content

Commit b1a841e

Browse files
authored
Merge pull request #821 from andyzhangx/fix-text-lib
chore: remove dependency on golang.org/x/text specific version
2 parents d70e6c9 + 8789fdf commit b1a841e

File tree

12 files changed

+22
-75
lines changed

12 files changed

+22
-75
lines changed

go.mod

+1-2
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ require (
113113
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
114114
golang.org/x/sys v0.4.0 // indirect
115115
golang.org/x/term v0.4.0 // indirect
116-
golang.org/x/text v0.6.0 // indirect
116+
golang.org/x/text v0.7.0 // indirect
117117
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
118118
google.golang.org/appengine v1.6.7 // indirect
119119
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
@@ -134,7 +134,6 @@ replace (
134134
github.com/niemeyer/pretty => github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e
135135
github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.4.0
136136
go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20200410171415-59f5fb25a533
137-
golang.org/x/text => golang.org/x/text v0.3.8
138137
k8s.io/api => k8s.io/api v0.26.0
139138
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.0
140139
k8s.io/apimachinery => k8s.io/apimachinery v0.26.0

go.sum

+13-2
Original file line numberDiff line numberDiff line change
@@ -625,13 +625,24 @@ golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
625625
golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
626626
golang.org/x/term v0.4.0 h1:O7UWfv5+A2qiuulQk30kVinPoMtoIPeVaKLEgLpVkvg=
627627
golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
628-
golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
629-
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
628+
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
629+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
630+
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
631+
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
632+
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
633+
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
634+
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
635+
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
636+
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
637+
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
638+
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
639+
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
630640
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
631641
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
632642
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
633643
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=
634644
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
645+
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
635646
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
636647
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
637648
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=

vendor/golang.org/x/text/internal/language/compact/language.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/golang.org/x/text/internal/language/language.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/golang.org/x/text/internal/language/lookup.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/golang.org/x/text/language/go1_1.go

-39
This file was deleted.

vendor/golang.org/x/text/language/go1_2.go

-12
This file was deleted.

vendor/golang.org/x/text/language/language.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/golang.org/x/text/language/parse.go

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/golang.org/x/text/runes/runes.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/golang.org/x/text/unicode/bidi/trieval.go

-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ golang.org/x/sys/windows/registry
467467
# golang.org/x/term v0.4.0
468468
## explicit; go 1.17
469469
golang.org/x/term
470-
# golang.org/x/text v0.6.0 => golang.org/x/text v0.3.8
470+
# golang.org/x/text v0.7.0
471471
## explicit; go 1.17
472472
golang.org/x/text/encoding
473473
golang.org/x/text/encoding/charmap
@@ -1288,7 +1288,6 @@ sigs.k8s.io/yaml
12881288
# github.com/niemeyer/pretty => github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e
12891289
# github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.4.0
12901290
# go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20200410171415-59f5fb25a533
1291-
# golang.org/x/text => golang.org/x/text v0.3.8
12921291
# k8s.io/api => k8s.io/api v0.26.0
12931292
# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.0
12941293
# k8s.io/apimachinery => k8s.io/apimachinery v0.26.0

0 commit comments

Comments
 (0)