Skip to content

Commit 6357a22

Browse files
authored
Merge pull request #157 from fluxcd/go-1.18
Update go.mod to Go 1.18
2 parents e04bfec + 5f798c0 commit 6357a22

File tree

3 files changed

+34
-348
lines changed

3 files changed

+34
-348
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ TEST_STOP_ON_ERROR?=
55
all: test
66

77
tidy:
8-
go mod tidy
8+
go mod tidy -compat=1.18
99

1010
fmt:
1111
go fmt ./...

go.mod

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module github.com/fluxcd/go-git-providers
22

3-
go 1.17
3+
go 1.18
44

55
require (
6-
github.com/ProtonMail/go-crypto v0.0.0-20220517143526-88bb52951d5b
6+
github.com/ProtonMail/go-crypto v0.0.0-20220714114130-e85cedf506cd
77
github.com/go-git/go-billy/v5 v5.3.1
88
github.com/go-git/go-git/v5 v5.4.2
99
github.com/go-logr/logr v1.2.3
@@ -14,14 +14,14 @@ require (
1414
github.com/hashicorp/go-cleanhttp v0.5.2
1515
github.com/hashicorp/go-multierror v1.1.1
1616
github.com/hashicorp/go-retryablehttp v0.7.1
17-
github.com/ktrysmt/go-bitbucket v0.9.46
17+
github.com/ktrysmt/go-bitbucket v0.9.48
1818
github.com/onsi/ginkgo v1.16.5
19-
github.com/onsi/gomega v1.19.0
20-
github.com/xanzy/go-gitlab v0.68.0
19+
github.com/onsi/gomega v1.20.0
20+
github.com/xanzy/go-gitlab v0.69.0
2121
go.uber.org/zap v1.21.0
22-
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
23-
golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401
24-
golang.org/x/time v0.0.0-20220411224347-583f2d630306
22+
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
23+
golang.org/x/oauth2 v0.0.0-20220722155238-128564f6959c
24+
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9
2525
)
2626

2727
// Fix CVE-2022-28948
@@ -47,12 +47,13 @@ require (
4747
github.com/xanzy/ssh-agent v0.3.0 // indirect
4848
go.uber.org/atomic v1.7.0 // indirect
4949
go.uber.org/multierr v1.6.0 // indirect
50-
golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
51-
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
50+
golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e // indirect
51+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
5252
golang.org/x/text v0.3.7 // indirect
5353
google.golang.org/appengine v1.6.7 // indirect
5454
google.golang.org/protobuf v1.28.0 // indirect
5555
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
5656
gopkg.in/warnings.v0 v0.1.2 // indirect
5757
gopkg.in/yaml.v2 v2.4.0 // indirect
58+
gopkg.in/yaml.v3 v3.0.1 // indirect
5859
)

0 commit comments

Comments
 (0)