-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Pull request: all: upd go, tools, deps
Updates #2275. Updates #3057. Squashed commit of the following: commit da22ad2 Merge: dbd7e20 779fbe7 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 22 16:26:46 2021 +0300 Merge branch 'master' into 2275-upd-go commit dbd7e20 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 22 15:04:17 2021 +0300 all: upd docker img commit 269796e Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 21 21:04:25 2021 +0300 all: upd go, tools, deps
- Loading branch information
Showing
15 changed files
with
287 additions
and
131 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
'name': 'build' | ||
|
||
'env': | ||
'GO_VERSION': '1.16' | ||
'GO_VERSION': '1.17' | ||
'NODE_VERSION': '14' | ||
|
||
'on': | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
'name': 'lint' | ||
|
||
'env': | ||
'GO_VERSION': '1.16' | ||
'GO_VERSION': '1.17' | ||
|
||
'on': | ||
'push': | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,42 +1,69 @@ | ||
module github.com/AdguardTeam/AdGuardHome | ||
|
||
go 1.16 | ||
go 1.17 | ||
|
||
require ( | ||
github.com/AdguardTeam/dnsproxy v0.39.13 | ||
github.com/AdguardTeam/golibs v0.10.3 | ||
github.com/AdguardTeam/urlfilter v0.15.1 | ||
github.com/NYTimes/gziphandler v1.1.1 | ||
github.com/ameshkov/dnscrypt/v2 v2.2.2 | ||
github.com/ameshkov/dnscrypt/v2 v2.2.3 | ||
github.com/digineo/go-ipset/v2 v2.2.1 | ||
github.com/fsnotify/fsnotify v1.4.9 | ||
github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020 | ||
github.com/google/go-cmp v0.5.5 | ||
github.com/fsnotify/fsnotify v1.5.1 | ||
github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534 | ||
github.com/google/go-cmp v0.5.6 | ||
github.com/google/gopacket v1.1.19 | ||
github.com/google/renameio v1.0.1 | ||
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2 | ||
github.com/insomniacslk/dhcp v0.0.0-20211214070828-5297eed8f489 | ||
github.com/kardianos/service v1.2.0 | ||
github.com/lucas-clemente/quic-go v0.21.1 | ||
github.com/lucas-clemente/quic-go v0.24.0 | ||
github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 | ||
github.com/mdlayher/netlink v1.4.0 | ||
github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf | ||
github.com/mdlayher/netlink v1.5.0 | ||
github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b | ||
github.com/miekg/dns v1.1.43 | ||
github.com/satori/go.uuid v1.2.0 | ||
github.com/stretchr/testify v1.7.0 | ||
github.com/ti-mo/netfilter v0.4.0 | ||
go.etcd.io/bbolt v1.3.6 | ||
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 | ||
golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6 | ||
golang.org/x/sys v0.0.0-20210909193231-528a39cd75f3 | ||
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 | ||
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f | ||
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e | ||
gopkg.in/natefinch/lumberjack.v2 v2.0.0 | ||
gopkg.in/yaml.v2 v2.4.0 | ||
howett.net/plist v0.0.0-20201203080718-1454fab16a06 | ||
howett.net/plist v1.0.0 | ||
) | ||
|
||
require github.com/stretchr/objx v0.1.1 // indirect | ||
|
||
// TODO(e.burkov): Get rid of the fork in v0.108.0. | ||
replace github.com/insomniacslk/dhcp => github.com/AdguardTeam/dhcp v0.0.0-20210519141215-51808c73c0bf | ||
require ( | ||
github.com/BurntSushi/toml v0.4.1 // indirect | ||
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect | ||
github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 // indirect | ||
github.com/ameshkov/dnsstamps v1.0.3 // indirect | ||
github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect | ||
github.com/cheekybits/genny v1.0.0 // indirect | ||
github.com/davecgh/go-spew v1.1.1 // indirect | ||
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect | ||
github.com/google/uuid v1.3.0 // indirect | ||
github.com/joomcode/errorx v1.0.3 // indirect | ||
github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect | ||
github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect | ||
github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect | ||
github.com/mdlayher/socket v0.1.1 // indirect | ||
github.com/nxadm/tail v1.4.8 // indirect | ||
github.com/onsi/ginkgo v1.16.5 // indirect | ||
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect | ||
github.com/pkg/errors v0.9.1 // indirect | ||
github.com/pmezard/go-difflib v1.0.0 // indirect | ||
github.com/stretchr/objx v0.1.1 // indirect | ||
github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7 // indirect | ||
golang.org/x/mod v0.5.1 // indirect | ||
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect | ||
golang.org/x/text v0.3.7 // indirect | ||
golang.org/x/tools v0.1.8 // indirect | ||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect | ||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect | ||
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect | ||
honnef.co/go/tools v0.2.2 // indirect | ||
) | ||
|
||
// TODO(a.garipov): Return to the main repo once miekg/dns#1317 is merged. | ||
replace github.com/miekg/dns => github.com/ameshkov/dns v1.1.32-0.20211214123418-7a5e0dc5f1b0 |
Oops, something went wrong.