From 01b853a2b030cab94e30940f54c96641fae30b05 Mon Sep 17 00:00:00 2001 From: Dominic Evans <8060970+dnwe@users.noreply.github.com> Date: Tue, 7 Nov 2023 14:16:53 +0000 Subject: [PATCH] feat: update go directive to 1.18 (#2713) Bumping minimum Go version to 1.18, aligning with compress and other dependencies which now require 1.18 ``` go get go@1.18 go mod tidy go fix ./... ``` Signed-off-by: Dominic Evans --- .github/workflows/ci.yml | 2 +- encoder_decoder_fuzz_test.go | 1 - functional_admin_test.go | 1 - functional_client_test.go | 1 - functional_consumer_follower_fetch_test.go | 1 - functional_consumer_group_test.go | 1 - functional_consumer_staticmembership_test.go | 1 - functional_consumer_test.go | 1 - functional_offset_manager_test.go | 1 - functional_producer_test.go | 1 - functional_test.go | 1 - go.mod | 2 +- go.sum | 9 --------- sarama_test.go | 1 - 14 files changed, 2 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0c98e9701..c9fe298db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: strategy: fail-fast: false matrix: - go-version: [1.17.x, 1.20.x, 1.21.x] + go-version: [1.18.x, 1.20.x, 1.21.x] env: DEBUG: true GOFLAGS: -trimpath diff --git a/encoder_decoder_fuzz_test.go b/encoder_decoder_fuzz_test.go index ee65887e5..968fb1a29 100644 --- a/encoder_decoder_fuzz_test.go +++ b/encoder_decoder_fuzz_test.go @@ -1,5 +1,4 @@ //go:build go1.18 -// +build go1.18 package sarama diff --git a/functional_admin_test.go b/functional_admin_test.go index 7bc72a03e..9962bce95 100644 --- a/functional_admin_test.go +++ b/functional_admin_test.go @@ -1,5 +1,4 @@ //go:build functional -// +build functional package sarama diff --git a/functional_client_test.go b/functional_client_test.go index da9ad7b54..5120d4204 100644 --- a/functional_client_test.go +++ b/functional_client_test.go @@ -1,5 +1,4 @@ //go:build functional -// +build functional package sarama diff --git a/functional_consumer_follower_fetch_test.go b/functional_consumer_follower_fetch_test.go index 09329daf5..daac03aed 100644 --- a/functional_consumer_follower_fetch_test.go +++ b/functional_consumer_follower_fetch_test.go @@ -1,5 +1,4 @@ //go:build functional -// +build functional package sarama diff --git a/functional_consumer_group_test.go b/functional_consumer_group_test.go index 5589ad195..64ce5cf9a 100644 --- a/functional_consumer_group_test.go +++ b/functional_consumer_group_test.go @@ -1,5 +1,4 @@ //go:build functional -// +build functional package sarama diff --git a/functional_consumer_staticmembership_test.go b/functional_consumer_staticmembership_test.go index 83066a54f..2cab56cc3 100644 --- a/functional_consumer_staticmembership_test.go +++ b/functional_consumer_staticmembership_test.go @@ -1,5 +1,4 @@ //go:build functional -// +build functional package sarama diff --git a/functional_consumer_test.go b/functional_consumer_test.go index 16e035152..53dd11879 100644 --- a/functional_consumer_test.go +++ b/functional_consumer_test.go @@ -1,5 +1,4 @@ //go:build functional -// +build functional package sarama diff --git a/functional_offset_manager_test.go b/functional_offset_manager_test.go index e3bfbd6f9..76b6d7818 100644 --- a/functional_offset_manager_test.go +++ b/functional_offset_manager_test.go @@ -1,5 +1,4 @@ //go:build functional -// +build functional package sarama diff --git a/functional_producer_test.go b/functional_producer_test.go index 96272d0fb..1a89ac603 100644 --- a/functional_producer_test.go +++ b/functional_producer_test.go @@ -1,5 +1,4 @@ //go:build functional -// +build functional package sarama diff --git a/functional_test.go b/functional_test.go index fd953ec7c..291c8ac9a 100644 --- a/functional_test.go +++ b/functional_test.go @@ -1,5 +1,4 @@ //go:build functional -// +build functional package sarama diff --git a/go.mod b/go.mod index d6f5c26ea..560d71324 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/IBM/sarama -go 1.17 +go 1.18 require ( github.com/davecgh/go-spew v1.1.1 diff --git a/go.sum b/go.sum index d693289b1..41f65bdf5 100644 --- a/go.sum +++ b/go.sum @@ -73,19 +73,16 @@ golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58 golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -94,25 +91,19 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/sarama_test.go b/sarama_test.go index 5ab84cf23..3ec484bd3 100644 --- a/sarama_test.go +++ b/sarama_test.go @@ -1,5 +1,4 @@ //go:build !functional -// +build !functional package sarama