Skip to content

Commit cea3507

Browse files
pymqpymq
authored
Merge pull request #158 from anywherelan/update-deps
all: update to go 1.24, update dependencies
2 parents 6ccea73 + ded3f05 commit cea3507

File tree

10 files changed

+378
-466
lines changed

10 files changed

+378
-466
lines changed

‎.github/workflows/build-manual.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Install Go
3333
uses: actions/setup-go@v5
3434
with:
35-
go-version: 1.23.x
35+
go-version: 1.24.x
3636
cache: true
3737
cache-dependency-path: |
3838
awl/go.sum
@@ -79,8 +79,8 @@ jobs:
7979
go install golang.org/x/mobile/cmd/gomobile@latest
8080
go get golang.org/x/mobile/cmd/gomobile
8181
gomobile init
82-
go mod tidy -compat=1.23
83-
cd cmd/awl-tray && go mod tidy -compat=1.23 && cd ../..
82+
go mod tidy -compat=1.24
83+
cd cmd/awl-tray && go mod tidy -compat=1.24 && cd ../..
8484
echo "check go mod tidy and git dirty"
8585
test -z "$(git status --porcelain)" || (git status; git diff && false)
8686
echo "start building"
@@ -130,7 +130,7 @@ jobs:
130130
- name: Install Go
131131
uses: actions/setup-go@v5
132132
with:
133-
go-version: 1.23.x
133+
go-version: 1.24.x
134134
cache: true
135135
cache-dependency-path: |
136136
awl/go.sum

‎.github/workflows/golangci-lint.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
- name: Install Go
1313
uses: actions/setup-go@v5
1414
with:
15-
go-version: 1.23.x
15+
go-version: 1.24.x
1616
- name: Create stub embed files
1717
run: mkdir static && touch static/index.html && touch embeds/wintun.dll
1818
- name: golangci-lint
1919
uses: golangci/golangci-lint-action@v6
2020
with:
21-
version: v1.63
21+
version: v1.64

‎.github/workflows/test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Install Go
1616
uses: actions/setup-go@v5
1717
with:
18-
go-version: 1.23.x
18+
go-version: 1.24.x
1919
cache: true
2020
- name: Create stub static/
2121
run: mkdir static && touch static/index.html
@@ -25,8 +25,8 @@ jobs:
2525
- name: gofmt && go mod tidy
2626
if: matrix.os == 'ubuntu-latest'
2727
run: |
28-
go mod tidy -compat=1.23
29-
cd cmd/awl-tray && go mod tidy -compat=1.23 && cd ../..
28+
go mod tidy -compat=1.24
29+
cd cmd/awl-tray && go mod tidy -compat=1.24 && cd ../..
3030
test -z "$(gofmt -d .)" || (gofmt -d . && false)
3131
test -z "$(git status --porcelain)" || (git status; git diff && false)
3232
- name: Test

‎.golangci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
run:
22
timeout: 5m
3-
go: "1.23"
3+
go: "1.24"
44

55
linters:
66
disable-all: true

‎BUILDING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Dependencies
44

5-
* Go (1.23)
5+
* Go (1.24)
66
* Git
77
* gomobile and Android Studio for Android ([see more](https://pkg.go.dev/golang.org/x/mobile/cmd/gomobile))
88
* Flutter (3.27)

‎build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ build-android-lib() {
121121
# about `-checklinkname=0` https://github.com/wlynxg/anet#how-to-build-with-go-1230-or-later
122122
gomobile bind -trimpath -ldflags "-s -w -checklinkname=0 -X github.com/anywherelan/awl/config.Version=${VERSION}" -o anywherelan.aar -target=android .
123123
go mod edit -droprequire=golang.org/x/mobile
124-
go mod tidy -compat=1.23
124+
go mod tidy -compat=1.24
125125
mkdir -p "$awlflutterdir/android/app/src/main/libs"
126126
mv anywherelan.aar "$awlflutterdir/android/app/src/main/libs/"
127127
}

‎cmd/awl-tray/go.mod

+54-58
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module awl-tray
22

3-
go 1.23.0
3+
go 1.24.0
44

55
require (
66
fyne.io/systray v1.11.1-0.20240917165310-0f99d4d0758b
@@ -10,7 +10,7 @@ require (
1010
github.com/gen2brain/beeep v0.0.0-20240516210008-9c006672e7f4
1111
github.com/godbus/dbus/v5 v5.1.1-0.20230522191255-76236955d466
1212
github.com/ipfs/go-log/v2 v2.5.1
13-
github.com/libp2p/go-libp2p v0.38.2
13+
github.com/libp2p/go-libp2p v0.41.0
1414
github.com/ncruces/zenity v0.10.8
1515
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
1616
)
@@ -31,11 +31,10 @@ require (
3131
github.com/containerd/cgroups v1.1.0 // indirect
3232
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
3333
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
34-
github.com/davecgh/go-spew v1.1.1 // indirect
3534
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
3635
github.com/dblohm7/wingoes v0.0.0-20240119213807-a09d6be7affa // indirect
3736
github.com/dchest/jsmin v0.0.0-20220218165748-59f39799265f // indirect
38-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
37+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
3938
github.com/docker/go-units v0.5.0 // indirect
4039
github.com/docker/libcontainer v2.2.1+incompatible // indirect
4140
github.com/elastic/gosigar v0.14.3 // indirect
@@ -46,64 +45,61 @@ require (
4645
github.com/go-logr/stdr v1.2.2 // indirect
4746
github.com/go-playground/locales v0.14.1 // indirect
4847
github.com/go-playground/universal-translator v0.18.1 // indirect
49-
github.com/go-playground/validator/v10 v10.24.0 // indirect
48+
github.com/go-playground/validator/v10 v10.25.0 // indirect
5049
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
5150
github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4 // indirect
5251
github.com/gogo/protobuf v1.3.2 // indirect
5352
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
5453
github.com/google/go-querystring v1.1.0 // indirect
5554
github.com/google/gopacket v1.1.19 // indirect
56-
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
55+
github.com/google/pprof v0.0.0-20250208200701-d0013a598941 // indirect
5756
github.com/google/uuid v1.6.0 // indirect
5857
github.com/gorilla/websocket v1.5.3 // indirect
59-
github.com/hashicorp/errwrap v1.1.0 // indirect
60-
github.com/hashicorp/go-multierror v1.1.1 // indirect
6158
github.com/hashicorp/golang-lru v1.0.2 // indirect
6259
github.com/haxii/socks5 v1.0.0 // indirect
6360
github.com/huin/goupnp v1.3.0 // indirect
6461
github.com/illarion/gonotify v1.0.1 // indirect
65-
github.com/ipfs/boxo v0.24.3 // indirect
66-
github.com/ipfs/go-cid v0.4.1 // indirect
67-
github.com/ipfs/go-datastore v0.6.0 // indirect
62+
github.com/ipfs/boxo v0.28.0 // indirect
63+
github.com/ipfs/go-cid v0.5.0 // indirect
64+
github.com/ipfs/go-datastore v0.8.2 // indirect
65+
github.com/ipfs/go-log v1.0.5 // indirect
6866
github.com/ipld/go-ipld-prime v0.21.0 // indirect
6967
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
7068
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
71-
github.com/jbenet/goprocess v0.1.4 // indirect
7269
github.com/josephspurrier/goversioninfo v1.4.0 // indirect
7370
github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86 // indirect
74-
github.com/klauspost/compress v1.17.11 // indirect
75-
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
76-
github.com/koron/go-ssdp v0.0.4 // indirect
71+
github.com/klauspost/compress v1.18.0 // indirect
72+
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
73+
github.com/koron/go-ssdp v0.0.5 // indirect
7774
github.com/labstack/echo/v4 v4.12.0 // indirect
7875
github.com/labstack/gommon v0.4.2 // indirect
7976
github.com/leodido/go-urn v1.4.0 // indirect
8077
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
8178
github.com/libp2p/go-cidranger v1.1.0 // indirect
8279
github.com/libp2p/go-flow-metrics v0.2.0 // indirect
8380
github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect
84-
github.com/libp2p/go-libp2p-kad-dht v0.28.2 // indirect
85-
github.com/libp2p/go-libp2p-kbucket v0.6.4 // indirect
86-
github.com/libp2p/go-libp2p-record v0.2.0 // indirect
87-
github.com/libp2p/go-libp2p-routing-helpers v0.7.4 // indirect
81+
github.com/libp2p/go-libp2p-kad-dht v0.30.2 // indirect
82+
github.com/libp2p/go-libp2p-kbucket v0.6.5 // indirect
83+
github.com/libp2p/go-libp2p-record v0.3.1 // indirect
84+
github.com/libp2p/go-libp2p-routing-helpers v0.7.5 // indirect
8885
github.com/libp2p/go-msgio v0.3.0 // indirect
89-
github.com/libp2p/go-nat v0.2.0 // indirect
9086
github.com/libp2p/go-netroute v0.2.2 // indirect
9187
github.com/libp2p/go-reuseport v0.4.0 // indirect
92-
github.com/libp2p/go-yamux/v4 v4.0.1 // indirect
88+
github.com/libp2p/go-yamux/v5 v5.0.0 // indirect
9389
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
94-
github.com/mattn/go-colorable v0.1.13 // indirect
90+
github.com/mattn/go-colorable v0.1.14 // indirect
9591
github.com/mattn/go-isatty v0.0.20 // indirect
9692
github.com/mattn/go-runewidth v0.0.9 // indirect
97-
github.com/mdp/qrterminal/v3 v3.2.0 // indirect
98-
github.com/miekg/dns v1.1.63 // indirect
93+
github.com/mdp/qrterminal/v3 v3.2.1 // indirect
94+
github.com/miekg/dns v1.1.64 // indirect
9995
github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
10096
github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
10197
github.com/milosgajdos/tenus v0.0.3 // indirect
10298
github.com/minio/sha256-simd v1.0.1 // indirect
10399
github.com/mr-tron/base58 v1.2.0 // indirect
104100
github.com/multiformats/go-base32 v0.1.0 // indirect
105101
github.com/multiformats/go-base36 v0.2.0 // indirect
106-
github.com/multiformats/go-multiaddr v0.14.0 // indirect
102+
github.com/multiformats/go-multiaddr v0.15.0 // indirect
107103
github.com/multiformats/go-multiaddr-dns v0.4.1 // indirect
108104
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
109105
github.com/multiformats/go-multibase v0.2.0 // indirect
@@ -114,76 +110,76 @@ require (
114110
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
115111
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
116112
github.com/olekukonko/tablewriter v0.0.5 // indirect
117-
github.com/onsi/ginkgo/v2 v2.22.0 // indirect
113+
github.com/onsi/ginkgo/v2 v2.22.2 // indirect
118114
github.com/opencontainers/runtime-spec v1.2.0 // indirect
115+
github.com/opentracing/opentracing-go v1.2.0 // indirect
119116
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
120117
github.com/pion/datachannel v1.5.10 // indirect
121118
github.com/pion/dtls/v2 v2.2.12 // indirect
122-
github.com/pion/ice/v2 v2.3.37 // indirect
119+
github.com/pion/dtls/v3 v3.0.4 // indirect
120+
github.com/pion/ice/v4 v4.0.6 // indirect
123121
github.com/pion/interceptor v0.1.37 // indirect
124-
github.com/pion/logging v0.2.2 // indirect
125-
github.com/pion/mdns v0.0.12 // indirect
122+
github.com/pion/logging v0.2.3 // indirect
123+
github.com/pion/mdns/v2 v2.0.7 // indirect
126124
github.com/pion/randutil v0.1.0 // indirect
127125
github.com/pion/rtcp v1.2.15 // indirect
128-
github.com/pion/rtp v1.8.10 // indirect
129-
github.com/pion/sctp v1.8.35 // indirect
130-
github.com/pion/sdp/v3 v3.0.9 // indirect
131-
github.com/pion/srtp/v2 v2.0.20 // indirect
126+
github.com/pion/rtp v1.8.11 // indirect
127+
github.com/pion/sctp v1.8.36 // indirect
128+
github.com/pion/sdp/v3 v3.0.10 // indirect
129+
github.com/pion/srtp/v3 v3.0.4 // indirect
132130
github.com/pion/stun v0.6.1 // indirect
131+
github.com/pion/stun/v3 v3.0.0 // indirect
133132
github.com/pion/transport/v2 v2.2.10 // indirect
134133
github.com/pion/transport/v3 v3.0.7 // indirect
135-
github.com/pion/turn/v2 v2.1.6 // indirect
136-
github.com/pion/webrtc/v3 v3.3.5 // indirect
134+
github.com/pion/turn/v4 v4.0.0 // indirect
135+
github.com/pion/webrtc/v4 v4.0.10 // indirect
137136
github.com/pkg/errors v0.9.1 // indirect
138-
github.com/pmezard/go-difflib v1.0.0 // indirect
139137
github.com/polydawn/refmt v0.89.0 // indirect
140-
github.com/prometheus/client_golang v1.20.5 // indirect
138+
github.com/prometheus/client_golang v1.21.0 // indirect
141139
github.com/prometheus/client_model v0.6.1 // indirect
142-
github.com/prometheus/common v0.61.0 // indirect
140+
github.com/prometheus/common v0.62.0 // indirect
143141
github.com/prometheus/procfs v0.15.1 // indirect
144142
github.com/quic-go/qpack v0.5.1 // indirect
145-
github.com/quic-go/quic-go v0.48.2 // indirect
143+
github.com/quic-go/quic-go v0.50.0 // indirect
146144
github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66 // indirect
147145
github.com/randall77/makefat v0.0.0-20210315173500-7ddd0e42c844 // indirect
148146
github.com/raulk/go-watchdog v1.3.0 // indirect
149147
github.com/russross/blackfriday/v2 v2.1.0 // indirect
150148
github.com/spaolacci/murmur3 v1.1.0 // indirect
151-
github.com/stretchr/testify v1.10.0 // indirect
152149
github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af // indirect
153-
github.com/urfave/cli/v2 v2.27.5 // indirect
150+
github.com/urfave/cli/v2 v2.27.6 // indirect
154151
github.com/valyala/bytebufferpool v1.0.0 // indirect
155152
github.com/valyala/fasttemplate v1.2.2 // indirect
156153
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
157154
github.com/wlynxg/anet v0.0.5 // indirect
158155
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
159-
go.opencensus.io v0.24.0 // indirect
160-
go.opentelemetry.io/otel v1.31.0 // indirect
161-
go.opentelemetry.io/otel/metric v1.31.0 // indirect
162-
go.opentelemetry.io/otel/trace v1.31.0 // indirect
156+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
157+
go.opentelemetry.io/otel v1.34.0 // indirect
158+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
159+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
163160
go.uber.org/dig v1.18.0 // indirect
164161
go.uber.org/fx v1.23.0 // indirect
165162
go.uber.org/mock v0.5.0 // indirect
166163
go.uber.org/multierr v1.11.0 // indirect
167164
go.uber.org/zap v1.27.0 // indirect
168165
go4.org/mem v0.0.0-20220726221520-4f986261bf13 // indirect
169166
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
170-
golang.org/x/crypto v0.32.0 // indirect
171-
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
167+
golang.org/x/crypto v0.36.0 // indirect
168+
golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa // indirect
172169
golang.org/x/image v0.23.0 // indirect
173-
golang.org/x/mod v0.22.0 // indirect
174-
golang.org/x/net v0.34.0 // indirect
175-
golang.org/x/sync v0.10.0 // indirect
176-
golang.org/x/sys v0.29.0 // indirect
177-
golang.org/x/term v0.28.0 // indirect
178-
golang.org/x/text v0.21.0 // indirect
170+
golang.org/x/mod v0.24.0 // indirect
171+
golang.org/x/net v0.37.0 // indirect
172+
golang.org/x/sync v0.12.0 // indirect
173+
golang.org/x/sys v0.31.0 // indirect
174+
golang.org/x/term v0.30.0 // indirect
175+
golang.org/x/text v0.23.0 // indirect
179176
golang.org/x/time v0.5.0 // indirect
180-
golang.org/x/tools v0.29.0 // indirect
177+
golang.org/x/tools v0.31.0 // indirect
181178
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
182179
golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b // indirect
183180
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect
184-
gonum.org/v1/gonum v0.15.0 // indirect
185-
google.golang.org/protobuf v1.36.0 // indirect
186-
gopkg.in/yaml.v3 v3.0.1 // indirect
187-
lukechampine.com/blake3 v1.3.0 // indirect
181+
gonum.org/v1/gonum v0.15.1 // indirect
182+
google.golang.org/protobuf v1.36.5 // indirect
183+
lukechampine.com/blake3 v1.4.0 // indirect
188184
rsc.io/qr v0.2.0 // indirect
189185
)

0 commit comments

Comments
 (0)