Skip to content

Commit 20a487c

Browse files
committed
chore(deps): relax go directive to permit 1.22.x
Setting the go directive to 1.23.0 requires all consumers of the module to be building with 1.23.0 or newer release of Go 1.23 and to update their own go.mod accordingly — this seems unnecessarily restrictive for a library module, particularly as the code itself doesn't currently use any modern language constructs and builds fine even with older Go versions. Instead set the go directive to 1.22.0 and use the toolchain directive to recommend the latest 1.23.x when building locally. Note: this also includes a run of `hack/bump-deps.sh` to ensure all deps are compatible with go1.22.0 as well Fixes google#2045 Signed-off-by: Dominic Evans <[email protected]>
1 parent c4dd792 commit 20a487c

File tree

28 files changed

+586
-293
lines changed

28 files changed

+586
-293
lines changed

cmd/krane/go.mod

+20-18
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
module github.com/google/go-containerregistry/cmd/krane
22

3-
go 1.23.0
3+
go 1.22.0
4+
5+
toolchain go1.23.5
46

57
replace github.com/google/go-containerregistry => ../../
68

79
require (
8-
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20250115170608-608f37feb051
10+
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20250123200327-cce4a4abc80d
911
github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589
10-
github.com/google/go-containerregistry v0.20.2
12+
github.com/google/go-containerregistry v0.20.3
1113
)
1214

1315
require (
@@ -21,24 +23,24 @@ require (
2123
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
2224
github.com/Azure/go-autorest/logger v0.2.1 // indirect
2325
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
24-
github.com/aws/aws-sdk-go-v2 v1.32.8 // indirect
25-
github.com/aws/aws-sdk-go-v2/config v1.28.11 // indirect
26-
github.com/aws/aws-sdk-go-v2/credentials v1.17.52 // indirect
27-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23 // indirect
28-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.27 // indirect
29-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27 // indirect
26+
github.com/aws/aws-sdk-go-v2 v1.33.0 // indirect
27+
github.com/aws/aws-sdk-go-v2/config v1.29.1 // indirect
28+
github.com/aws/aws-sdk-go-v2/credentials v1.17.54 // indirect
29+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.24 // indirect
30+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.28 // indirect
31+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.28 // indirect
3032
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
31-
github.com/aws/aws-sdk-go-v2/service/ecr v1.38.4 // indirect
32-
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.29.2 // indirect
33+
github.com/aws/aws-sdk-go-v2/service/ecr v1.38.6 // indirect
34+
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.29.4 // indirect
3335
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
34-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8 // indirect
35-
github.com/aws/aws-sdk-go-v2/service/sso v1.24.9 // indirect
36-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8 // indirect
37-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.7 // indirect
38-
github.com/aws/smithy-go v1.22.1 // indirect
36+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.9 // indirect
37+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.11 // indirect
38+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.10 // indirect
39+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.9 // indirect
40+
github.com/aws/smithy-go v1.22.2 // indirect
3941
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
4042
github.com/dimchansky/utfbom v1.1.1 // indirect
41-
github.com/docker/cli v27.5.0+incompatible // indirect
43+
github.com/docker/cli v27.5.1+incompatible // indirect
4244
github.com/docker/distribution v2.8.3+incompatible // indirect
4345
github.com/docker/docker-credential-helpers v0.8.2 // indirect
4446
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
@@ -53,7 +55,7 @@ require (
5355
github.com/sirupsen/logrus v1.9.3 // indirect
5456
github.com/spf13/cobra v1.8.1 // indirect
5557
github.com/spf13/pflag v1.0.5 // indirect
56-
github.com/vbatts/tar-split v0.11.6 // indirect
58+
github.com/vbatts/tar-split v0.11.7 // indirect
5759
golang.org/x/crypto v0.32.0 // indirect
5860
golang.org/x/oauth2 v0.25.0 // indirect
5961
golang.org/x/sync v0.10.0 // indirect

cmd/krane/go.sum

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

go.mod

+15-12
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
module github.com/google/go-containerregistry
22

3-
go 1.23.0
3+
go 1.22.0
4+
5+
toolchain go1.23.5
46

57
require (
68
github.com/containerd/stargz-snapshotter/estargz v0.16.3
7-
github.com/docker/cli v27.5.0+incompatible
9+
github.com/docker/cli v27.5.1+incompatible
810
github.com/docker/distribution v2.8.3+incompatible
9-
github.com/docker/docker v27.5.0+incompatible
11+
github.com/docker/docker v27.5.1+incompatible
1012
github.com/google/go-cmp v0.6.0
1113
github.com/klauspost/compress v1.17.11
1214
github.com/mitchellh/go-homedir v1.1.0
@@ -23,6 +25,7 @@ require (
2325
github.com/Microsoft/go-winio v0.6.2 // indirect
2426
github.com/containerd/log v0.1.0 // indirect
2527
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
28+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2629
github.com/distribution/reference v0.6.0 // indirect
2730
github.com/docker/docker-credential-helpers v0.8.2 // indirect
2831
github.com/docker/go-connections v0.5.0 // indirect
@@ -36,21 +39,21 @@ require (
3639
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
3740
github.com/morikuni/aec v1.0.0 // indirect
3841
github.com/pkg/errors v0.9.1 // indirect
42+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
3943
github.com/russross/blackfriday/v2 v2.1.0 // indirect
4044
github.com/sirupsen/logrus v1.9.3 // indirect
4145
github.com/spf13/pflag v1.0.5 // indirect
42-
github.com/vbatts/tar-split v0.11.6 // indirect
46+
github.com/vbatts/tar-split v0.11.7 // indirect
4347
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
44-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
45-
go.opentelemetry.io/otel v1.33.0 // indirect
46-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0 // indirect
47-
go.opentelemetry.io/otel/metric v1.33.0 // indirect
48-
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
49-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
48+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
49+
go.opentelemetry.io/otel v1.34.0 // indirect
50+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0 // indirect
51+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
52+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
53+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
5054
golang.org/x/mod v0.22.0 // indirect
5155
golang.org/x/sys v0.29.0 // indirect
52-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
53-
google.golang.org/protobuf v1.36.3 // indirect
56+
golang.org/x/time v0.3.0 // indirect
5457
gopkg.in/yaml.v3 v3.0.1 // indirect
5558
gotest.tools/v3 v3.0.3 // indirect
5659
)

0 commit comments

Comments
 (0)