Skip to content

Commit ac7b59e

Browse files
authored
Merge pull request #186 from anywherelan/update-deps
all: update to go 1.25, update dependencies
2 parents 39cab25 + df582fd commit ac7b59e

15 files changed

Lines changed: 308 additions & 271 deletions

File tree

.github/workflows/build-manual.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: Install Go
4343
uses: actions/setup-go@v6
4444
with:
45-
go-version: 1.24.x
45+
go-version: 1.25.x
4646
cache: true
4747
cache-dependency-path: |
4848
awl/go.sum
@@ -92,8 +92,8 @@ jobs:
9292
go install golang.org/x/mobile/cmd/gomobile@latest
9393
go get golang.org/x/mobile/cmd/gomobile
9494
gomobile init
95-
go mod tidy -compat=1.24
96-
cd cmd/awl-tray && go mod tidy -compat=1.24 && cd ../..
95+
go mod tidy -compat=1.25
96+
cd cmd/awl-tray && go mod tidy -compat=1.25 && cd ../..
9797
echo "check go mod tidy and git dirty"
9898
test -z "$(git status --porcelain)" || (git status; git diff && false)
9999
echo "start building"
@@ -146,7 +146,7 @@ jobs:
146146
- name: Install Go
147147
uses: actions/setup-go@v6
148148
with:
149-
go-version: 1.24.x
149+
go-version: 1.25.x
150150
cache: true
151151
cache-dependency-path: |
152152
awl/go.sum

.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Install Go
1313
uses: actions/setup-go@v6
1414
with:
15-
go-version: 1.24.x
15+
go-version: 1.25.x
1616
- name: Create stub embed files
1717
run: mkdir static && touch static/index.html && touch embeds/wintun.dll
1818
- name: golangci-lint

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Install Go
1616
uses: actions/setup-go@v6
1717
with:
18-
go-version: 1.24.x
18+
go-version: 1.25.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.24
29-
cd cmd/awl-tray && go mod tidy -compat=1.24 && cd ../..
28+
go mod tidy -compat=1.25
29+
cd cmd/awl-tray && go mod tidy -compat=1.25 && 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: "2"
22
run:
3-
go: "1.24"
3+
go: "1.25"
44

55
linters:
66
default: none

BUILDING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Dependencies
44

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

api/debug.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ func (h *Handler) GetP2pDebugInfo(c echo.Context) (err error) {
2828
bandwidthByProtocol[string(key)] = makeBandwidthInfo(val)
2929
}
3030

31+
reachableAddrs, unreachableAddrs, unknownAddrs := h.p2p.ConfirmedAddrs()
32+
3133
debugInfo := entity.P2pDebugInfo{
3234
General: entity.GeneralDebugInfo{
3335
Version: config.Version,
@@ -39,7 +41,9 @@ func (h *Handler) GetP2pDebugInfo(c echo.Context) (err error) {
3941
Reachability: h.p2p.Reachability().String(),
4042
ListenAddress: maToStrings(h.p2p.AnnouncedAs()),
4143
PeersWithAddrsCount: h.p2p.PeersWithAddrsCount(),
42-
ObservedAddrs: maToStrings(h.p2p.OwnObservedAddrs()),
44+
ReachableAddrs: maToStrings(reachableAddrs),
45+
UnreachableAddrs: maToStrings(unreachableAddrs),
46+
UnknownAddrs: maToStrings(unknownAddrs),
4347
BootstrapPeers: h.p2p.BootstrapPeersStatsDetailed(),
4448
},
4549
Connections: entity.ConnectionsDebugInfo{

application_test.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ import (
4545
)
4646

4747
func init() {
48+
// TODO: move to config
4849
useAwldns = false
4950
config.DefaultBootstrapPeers = nil
5051
}
@@ -56,11 +57,6 @@ func TestMakeFriends(t *testing.T) {
5657
peer2 := ts.newTestPeer(false)
5758

5859
ts.makeFriends(peer2, peer1)
59-
60-
p1Ping := peer1.app.P2p.GetPeerLatency(peer2.app.P2p.PeerID())
61-
ts.NotEmpty(p1Ping)
62-
p2Ping := peer2.app.P2p.GetPeerLatency(peer1.app.P2p.PeerID())
63-
ts.NotEmpty(p2Ping)
6460
}
6561

6662
func TestRemovePeer(t *testing.T) {
@@ -112,6 +108,12 @@ func TestRemovePeer(t *testing.T) {
112108

113109
ts.Len(peer1.app.AuthStatus.GetIngoingAuthRequests(), 0)
114110
ts.Len(peer2.app.AuthStatus.GetIngoingAuthRequests(), 0)
111+
112+
// test ping
113+
p1Ping := peer1.app.P2p.GetPeerLatency(peer2.app.P2p.PeerID())
114+
ts.NotEmpty(p1Ping)
115+
p2Ping := peer2.app.P2p.GetPeerLatency(peer1.app.P2p.PeerID())
116+
ts.NotEmpty(p2Ping)
115117
}
116118

117119
func TestDeclinePeerFriendRequest(t *testing.T) {

build.sh

Lines changed: 1 addition & 1 deletion
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.24
124+
go mod tidy -compat=1.25
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

Lines changed: 46 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
module awl-tray
22

3-
go 1.24.0
3+
go 1.25.0
44

55
require (
66
fyne.io/systray v1.11.1-0.20250812065214-4856ac3adc3c
77
github.com/GrigoryKrasnochub/updaterini v0.1.0
88
github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9
99
github.com/anywherelan/awl v0.0.0-00010101000000-000000000000
10-
github.com/gen2brain/beeep v0.0.0-20240516210008-9c006672e7f4
11-
github.com/godbus/dbus/v5 v5.1.1-0.20230522191255-76236955d466
12-
github.com/ipfs/go-log/v2 v2.8.0
13-
github.com/libp2p/go-libp2p v0.43.0
10+
github.com/gen2brain/beeep v0.11.2
11+
github.com/godbus/dbus/v5 v5.2.0
12+
github.com/ipfs/go-log/v2 v2.9.0
13+
github.com/libp2p/go-libp2p v0.45.0
1414
github.com/ncruces/zenity v0.10.8
1515
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
1616
)
@@ -22,6 +22,7 @@ replace (
2222
)
2323

2424
require (
25+
git.sr.ht/~jackmordaunt/go-toast v1.1.2 // indirect
2526
github.com/akavel/rsrc v0.10.2 // indirect
2627
github.com/anywherelan/ts-dns v0.0.0-20240721135326-6d6b7b811853 // indirect
2728
github.com/benbjohnson/clock v1.3.5 // indirect
@@ -34,16 +35,17 @@ require (
3435
github.com/dchest/jsmin v0.0.0-20220218165748-59f39799265f // indirect
3536
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
3637
github.com/docker/libcontainer v2.2.1+incompatible // indirect
38+
github.com/esiqveland/notify v0.13.3 // indirect
3739
github.com/filecoin-project/go-clock v0.1.0 // indirect
3840
github.com/flynn/noise v1.1.0 // indirect
3941
github.com/francoispqt/gojay v1.2.13 // indirect
40-
github.com/gabriel-vasile/mimetype v1.4.9 // indirect
42+
github.com/gabriel-vasile/mimetype v1.4.11 // indirect
4143
github.com/go-logr/logr v1.4.3 // indirect
4244
github.com/go-logr/stdr v1.2.2 // indirect
45+
github.com/go-ole/go-ole v1.3.0 // indirect
4346
github.com/go-playground/locales v0.14.1 // indirect
4447
github.com/go-playground/universal-translator v0.18.1 // indirect
45-
github.com/go-playground/validator/v10 v10.27.0 // indirect
46-
github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4 // indirect
48+
github.com/go-playground/validator/v10 v10.29.0 // indirect
4749
github.com/google/go-querystring v1.1.0 // indirect
4850
github.com/google/gopacket v1.1.19 // indirect
4951
github.com/google/uuid v1.6.0 // indirect
@@ -52,38 +54,39 @@ require (
5254
github.com/haxii/socks5 v1.0.0 // indirect
5355
github.com/huin/goupnp v1.3.0 // indirect
5456
github.com/illarion/gonotify v1.0.1 // indirect
55-
github.com/ipfs/boxo v0.33.1 // indirect
56-
github.com/ipfs/go-cid v0.5.0 // indirect
57-
github.com/ipfs/go-datastore v0.8.3 // indirect
57+
github.com/ipfs/boxo v0.35.2 // indirect
58+
github.com/ipfs/go-cid v0.6.0 // indirect
59+
github.com/ipfs/go-datastore v0.9.0 // indirect
5860
github.com/ipld/go-ipld-prime v0.21.0 // indirect
61+
github.com/jackmordaunt/icns/v3 v3.0.1 // indirect
5962
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
6063
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
6164
github.com/josephspurrier/goversioninfo v1.4.0 // indirect
6265
github.com/josharian/native v1.1.1-0.20230202152459-5c7d0dd6ab86 // indirect
6366
github.com/klauspost/compress v1.18.0 // indirect
6467
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
6568
github.com/koron/go-ssdp v0.0.6 // indirect
66-
github.com/labstack/echo/v4 v4.13.4 // indirect
69+
github.com/labstack/echo/v4 v4.14.0 // indirect
6770
github.com/labstack/gommon v0.4.2 // indirect
6871
github.com/leodido/go-urn v1.4.0 // indirect
6972
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
7073
github.com/libp2p/go-cidranger v1.1.0 // indirect
7174
github.com/libp2p/go-flow-metrics v0.3.0 // indirect
7275
github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect
73-
github.com/libp2p/go-libp2p-kad-dht v0.34.0 // indirect
74-
github.com/libp2p/go-libp2p-kbucket v0.7.0 // indirect
76+
github.com/libp2p/go-libp2p-kad-dht v0.36.0 // indirect
77+
github.com/libp2p/go-libp2p-kbucket v0.8.0 // indirect
7578
github.com/libp2p/go-libp2p-record v0.3.1 // indirect
7679
github.com/libp2p/go-libp2p-routing-helpers v0.7.5 // indirect
7780
github.com/libp2p/go-msgio v0.3.0 // indirect
78-
github.com/libp2p/go-netroute v0.2.2 // indirect
81+
github.com/libp2p/go-netroute v0.3.0 // indirect
7982
github.com/libp2p/go-reuseport v0.4.0 // indirect
8083
github.com/libp2p/go-yamux/v5 v5.0.1 // indirect
8184
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
8285
github.com/mattn/go-colorable v0.1.14 // indirect
8386
github.com/mattn/go-isatty v0.0.20 // indirect
8487
github.com/mattn/go-runewidth v0.0.9 // indirect
8588
github.com/mdp/qrterminal/v3 v3.2.1 // indirect
86-
github.com/miekg/dns v1.1.68 // indirect
89+
github.com/miekg/dns v1.1.69 // indirect
8790
github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
8891
github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
8992
github.com/milosgajdos/tenus v0.0.3 // indirect
@@ -95,12 +98,12 @@ require (
9598
github.com/multiformats/go-multiaddr-dns v0.4.1 // indirect
9699
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
97100
github.com/multiformats/go-multibase v0.2.0 // indirect
98-
github.com/multiformats/go-multicodec v0.9.2 // indirect
101+
github.com/multiformats/go-multicodec v0.10.0 // indirect
99102
github.com/multiformats/go-multihash v0.2.3 // indirect
100103
github.com/multiformats/go-multistream v0.6.1 // indirect
101-
github.com/multiformats/go-varint v0.0.7 // indirect
104+
github.com/multiformats/go-varint v0.1.0 // indirect
102105
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
103-
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
106+
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
104107
github.com/olekukonko/tablewriter v0.0.5 // indirect
105108
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
106109
github.com/pion/datachannel v1.5.10 // indirect
@@ -123,15 +126,17 @@ require (
123126
github.com/pion/turn/v4 v4.0.2 // indirect
124127
github.com/pion/webrtc/v4 v4.1.2 // indirect
125128
github.com/polydawn/refmt v0.89.0 // indirect
126-
github.com/prometheus/client_golang v1.23.0 // indirect
129+
github.com/prometheus/client_golang v1.23.2 // indirect
127130
github.com/prometheus/client_model v0.6.2 // indirect
128-
github.com/prometheus/common v0.65.0 // indirect
131+
github.com/prometheus/common v0.66.1 // indirect
129132
github.com/prometheus/procfs v0.17.0 // indirect
130133
github.com/quic-go/qpack v0.5.1 // indirect
131-
github.com/quic-go/quic-go v0.54.0 // indirect
134+
github.com/quic-go/quic-go v0.55.0 // indirect
132135
github.com/quic-go/webtransport-go v0.9.0 // indirect
133136
github.com/randall77/makefat v0.0.0-20210315173500-7ddd0e42c844 // indirect
134137
github.com/russross/blackfriday/v2 v2.1.0 // indirect
138+
github.com/sergeymakinen/go-bmp v1.0.0 // indirect
139+
github.com/sergeymakinen/go-ico v1.0.0-beta.0 // indirect
135140
github.com/spaolacci/murmur3 v1.1.0 // indirect
136141
github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af // indirect
137142
github.com/urfave/cli/v2 v2.27.7 // indirect
@@ -140,34 +145,35 @@ require (
140145
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
141146
github.com/wlynxg/anet v0.0.5 // indirect
142147
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
143-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
144-
go.opentelemetry.io/otel v1.37.0 // indirect
145-
go.opentelemetry.io/otel/metric v1.37.0 // indirect
146-
go.opentelemetry.io/otel/trace v1.37.0 // indirect
148+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
149+
go.opentelemetry.io/otel v1.38.0 // indirect
150+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
151+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
147152
go.uber.org/dig v1.19.0 // indirect
148153
go.uber.org/fx v1.24.0 // indirect
149154
go.uber.org/mock v0.5.2 // indirect
150155
go.uber.org/multierr v1.11.0 // indirect
151-
go.uber.org/zap v1.27.0 // indirect
156+
go.uber.org/zap v1.27.1 // indirect
157+
go.yaml.in/yaml/v2 v2.4.3 // indirect
152158
go4.org/mem v0.0.0-20220726221520-4f986261bf13 // indirect
153159
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
154-
golang.org/x/crypto v0.44.0 // indirect
155-
golang.org/x/exp v0.0.0-20250811191247-51f88131bc50 // indirect
160+
golang.org/x/crypto v0.46.0 // indirect
161+
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect
156162
golang.org/x/image v0.25.0 // indirect
157-
golang.org/x/mod v0.30.0 // indirect
158-
golang.org/x/net v0.47.0 // indirect
159-
golang.org/x/sync v0.18.0 // indirect
160-
golang.org/x/sys v0.38.0 // indirect
161-
golang.org/x/telemetry v0.0.0-20251111182119-bc8e575c7b54 // indirect
162-
golang.org/x/term v0.37.0 // indirect
163-
golang.org/x/text v0.31.0 // indirect
164-
golang.org/x/time v0.12.0 // indirect
165-
golang.org/x/tools v0.39.0 // indirect
163+
golang.org/x/mod v0.31.0 // indirect
164+
golang.org/x/net v0.48.0 // indirect
165+
golang.org/x/sync v0.19.0 // indirect
166+
golang.org/x/sys v0.39.0 // indirect
167+
golang.org/x/telemetry v0.0.0-20251203150158-8fff8a5912fc // indirect
168+
golang.org/x/term v0.38.0 // indirect
169+
golang.org/x/text v0.32.0 // indirect
170+
golang.org/x/time v0.14.0 // indirect
171+
golang.org/x/tools v0.40.0 // indirect
166172
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
167-
golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b // indirect
173+
golang.zx2c4.com/wireguard v0.0.0-20250521234502-f333402bd9cb // indirect
168174
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect
169175
gonum.org/v1/gonum v0.16.0 // indirect
170-
google.golang.org/protobuf v1.36.7 // indirect
176+
google.golang.org/protobuf v1.36.10 // indirect
171177
lukechampine.com/blake3 v1.4.1 // indirect
172178
rsc.io/qr v0.2.0 // indirect
173179
)

0 commit comments

Comments
 (0)