Skip to content

Commit 92956ab

Browse files
authored
Merge pull request #225 from anywherelan/update-deps
all: update to Go 1.26, update dependencies
2 parents eeed5f0 + e32c336 commit 92956ab

12 files changed

Lines changed: 1337 additions & 299 deletions

File tree

.github/workflows/build-manual.yml

Lines changed: 12 additions & 12 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.25.x
45+
go-version: 1.26.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.25
96-
cd cmd/awl-tray && go mod tidy -compat=1.25 && cd ../..
95+
go mod tidy -compat=1.26
96+
cd cmd/awl-tray && go mod tidy -compat=1.26 && 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"
@@ -104,13 +104,13 @@ jobs:
104104
run: |
105105
df -h
106106
- name: Upload build artifacts
107-
uses: actions/upload-artifact@v5
107+
uses: actions/upload-artifact@v7
108108
with:
109109
name: awl-release-build
110110
path: awl/build/*
111111
if-no-files-found: error
112112
- name: Upload flutter web artifacts
113-
uses: actions/upload-artifact@v5
113+
uses: actions/upload-artifact@v7
114114
with:
115115
name: awl-release-static
116116
path: awl/static/
@@ -138,15 +138,15 @@ jobs:
138138
ref: ${{ github.event.inputs.awl_ref }}
139139
path: 'awl'
140140
- name: Retrieve saved static/ build
141-
uses: actions/download-artifact@v6
141+
uses: actions/download-artifact@v8
142142
with:
143143
name: awl-release-static
144144
path: awl/static
145145

146146
- name: Install Go
147147
uses: actions/setup-go@v6
148148
with:
149-
go-version: 1.25.x
149+
go-version: 1.26.x
150150
cache: true
151151
cache-dependency-path: |
152152
awl/go.sum
@@ -160,7 +160,7 @@ jobs:
160160
echo "ls build"
161161
ls -lah build
162162
- name: Upload build artifacts
163-
uses: actions/upload-artifact@v5
163+
uses: actions/upload-artifact@v7
164164
with:
165165
name: awl-release-build-macos
166166
path: awl/build/*
@@ -180,16 +180,16 @@ jobs:
180180
ref: ${{ github.event.inputs.awl_ref }}
181181
path: 'awl'
182182
- name: Retrieve saved static/ build
183-
uses: actions/download-artifact@v6
183+
uses: actions/download-artifact@v8
184184
with:
185185
name: awl-release-static
186186
path: awl/static
187187

188188
- name: Download and setup go-legacy-win7
189189
run: |
190190
mkdir -p /tmp/go-legacy-setup
191-
wget -P /tmp/go-legacy-setup https://github.com/thongtech/go-legacy-win7/releases/download/v1.25.7-1/go-legacy-win7-1.25.7-1.linux_amd64.tar.gz
192-
tar -xzf /tmp/go-legacy-setup/go-legacy-win7-1.25.7-1.linux_amd64.tar.gz -C /tmp/go-legacy-setup
191+
wget -P /tmp/go-legacy-setup https://github.com/thongtech/go-legacy-win7/releases/download/v1.26.1-1/go-legacy-win7-1.26.1-1.linux_amd64.tar.gz
192+
tar -xzf /tmp/go-legacy-setup/go-legacy-win7-1.26.1-1.linux_amd64.tar.gz -C /tmp/go-legacy-setup
193193
export GOROOT=/tmp/go-legacy-setup/go-legacy-win7
194194
export PATH=$GOROOT/bin:$PATH
195195
go version
@@ -204,7 +204,7 @@ jobs:
204204
echo "ls build"
205205
ls -lah build
206206
- name: Upload build artifacts
207-
uses: actions/upload-artifact@v5
207+
uses: actions/upload-artifact@v7
208208
with:
209209
name: awl-release-build-windows7
210210
path: awl/build/*

.github/workflows/golangci-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
- name: Install Go
1313
uses: actions/setup-go@v6
1414
with:
15-
go-version: 1.25.x
15+
go-version: 1.26.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@v9
2020
with:
21-
version: v2.11.3
21+
version: v2.11.4

.github/workflows/test.yml

Lines changed: 5 additions & 5 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.25.x
18+
go-version: 1.26.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.25
29-
cd cmd/awl-tray && go mod tidy -compat=1.25 && cd ../..
28+
go mod tidy -compat=1.26
29+
cd cmd/awl-tray && go mod tidy -compat=1.26 && cd ../..
3030
test -z "$(gofmt -d .)" || (gofmt -d . && false)
3131
test -z "$(git status --porcelain)" || (git status; git diff && false)
3232
- name: Test
@@ -36,7 +36,7 @@ jobs:
3636
- name: Build cmd/awl
3737
run: go build github.com/anywherelan/awl/cmd/awl
3838
- name: Upload cmd/awl build
39-
uses: actions/upload-artifact@v5
39+
uses: actions/upload-artifact@v7
4040
with:
4141
name: awl-build-${{ runner.os }}
4242
path: |
@@ -58,7 +58,7 @@ jobs:
5858
shell: bash
5959
steps:
6060
- name: Retrieve saved cmd/awl build
61-
uses: actions/download-artifact@v6
61+
uses: actions/download-artifact@v8
6262
with:
6363
name: awl-build-${{ runner.os }}
6464
- name: Download librespeed-cli

.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.25"
3+
go: "1.26"
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.25)
5+
* Go (1.26)
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) for Web and Android

application_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ func TestUpdateUseAsExitNodeConfig(t *testing.T) {
337337
return peer1Config.AllowedUsingAsExitNode && peer1Config.WeAllowUsingAsExitNode
338338
}, 15*time.Second, 100*time.Millisecond)
339339

340-
ts.Equal(peer1.PeerID(), peer2.app.Conf.SOCKS5.UsingPeerID)
340+
ts.Equal(peer1.PeerID(), peer2.app.SOCKS5.GetProxyPeerID())
341341

342342
// disallow from peer2, check that peer1 got our new config
343343
err = peer2.api.UpdatePeerSettings(entity.UpdatePeerSettingsRequest{

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ build-android-lib() {
139139
# about `-checklinkname=0` https://github.com/wlynxg/anet#how-to-build-with-go-1230-or-later
140140
gomobile bind -trimpath -ldflags "-s -w -checklinkname=0 -X github.com/anywherelan/awl/config.Version=${VERSION}" -o anywherelan.aar -target=android .
141141
go mod edit -droprequire=golang.org/x/mobile
142-
go mod tidy -compat=1.25
142+
go mod tidy -compat=1.26
143143
mkdir -p "$awlflutterdir/android/app/src/main/libs"
144144
mv anywherelan.aar "$awlflutterdir/android/app/src/main/libs/"
145145
}

cmd/awl-tray/go.mod

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

3-
go 1.25.0
3+
go 1.26.0
44

55
replace (
66
github.com/anywherelan/awl => ../../
@@ -17,12 +17,14 @@ require (
1717
github.com/gen2brain/beeep v0.11.2
1818
github.com/godbus/dbus/v5 v5.2.2
1919
github.com/ipfs/go-log/v2 v2.9.1
20-
github.com/libp2p/go-libp2p v0.47.0
20+
github.com/libp2p/go-libp2p v0.48.0
2121
github.com/ncruces/zenity v0.10.8
2222
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
2323
)
2424

2525
require (
26+
filippo.io/bigmod v0.1.1-0.20260103110540-f8a47775ebe5 // indirect
27+
filippo.io/keygen v0.0.0-20260114151900-8e2790ea4c5b // indirect
2628
git.sr.ht/~jackmordaunt/go-toast v1.1.2 // indirect
2729
github.com/akavel/rsrc v0.10.2 // indirect
2830
github.com/anywherelan/ts-dns v0.0.0-20240721135326-6d6b7b811853 // indirect
@@ -34,19 +36,19 @@ require (
3436
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
3537
github.com/dblohm7/wingoes v0.0.0-20240119213807-a09d6be7affa // indirect
3638
github.com/dchest/jsmin v0.0.0-20220218165748-59f39799265f // indirect
37-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
39+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.1 // indirect
3840
github.com/docker/libcontainer v2.2.1+incompatible // indirect
3941
github.com/dunglas/httpsfv v1.1.0 // indirect
4042
github.com/esiqveland/notify v0.13.3 // indirect
4143
github.com/filecoin-project/go-clock v0.1.0 // indirect
4244
github.com/flynn/noise v1.1.0 // indirect
43-
github.com/gabriel-vasile/mimetype v1.4.12 // indirect
45+
github.com/gabriel-vasile/mimetype v1.4.13 // indirect
4446
github.com/go-logr/logr v1.4.3 // indirect
4547
github.com/go-logr/stdr v1.2.2 // indirect
4648
github.com/go-ole/go-ole v1.3.0 // indirect
4749
github.com/go-playground/locales v0.14.1 // indirect
4850
github.com/go-playground/universal-translator v0.18.1 // indirect
49-
github.com/go-playground/validator/v10 v10.30.1 // indirect
51+
github.com/go-playground/validator/v10 v10.30.2 // indirect
5052
github.com/google/go-querystring v1.2.0 // indirect
5153
github.com/google/gopacket v1.1.19 // indirect
5254
github.com/google/uuid v1.6.0 // indirect
@@ -55,10 +57,10 @@ require (
5557
github.com/haxii/socks5 v1.0.0 // indirect
5658
github.com/huin/goupnp v1.3.0 // indirect
5759
github.com/illarion/gonotify v1.0.1 // indirect
58-
github.com/ipfs/boxo v0.35.2 // indirect
60+
github.com/ipfs/boxo v0.37.0 // indirect
5961
github.com/ipfs/go-cid v0.6.0 // indirect
60-
github.com/ipfs/go-datastore v0.9.0 // indirect
61-
github.com/ipld/go-ipld-prime v0.21.0 // indirect
62+
github.com/ipfs/go-datastore v0.9.1 // indirect
63+
github.com/ipld/go-ipld-prime v0.22.0 // indirect
6264
github.com/jackmordaunt/icns/v3 v3.0.1 // indirect
6365
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
6466
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
@@ -67,14 +69,14 @@ require (
6769
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
6870
github.com/koron/go-ssdp v0.0.6 // indirect
6971
github.com/labstack/echo-contrib v0.50.1 // indirect
70-
github.com/labstack/echo/v4 v4.15.0 // indirect
72+
github.com/labstack/echo/v4 v4.15.1 // indirect
7173
github.com/labstack/gommon v0.4.2 // indirect
7274
github.com/leodido/go-urn v1.4.0 // indirect
7375
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
7476
github.com/libp2p/go-cidranger v1.1.0 // indirect
7577
github.com/libp2p/go-flow-metrics v0.3.0 // indirect
7678
github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect
77-
github.com/libp2p/go-libp2p-kad-dht v0.37.1 // indirect
79+
github.com/libp2p/go-libp2p-kad-dht v0.39.0 // indirect
7880
github.com/libp2p/go-libp2p-kbucket v0.8.0 // indirect
7981
github.com/libp2p/go-libp2p-record v0.3.1 // indirect
8082
github.com/libp2p/go-libp2p-routing-helpers v0.7.5 // indirect
@@ -96,7 +98,7 @@ require (
9698
github.com/multiformats/go-base32 v0.1.0 // indirect
9799
github.com/multiformats/go-base36 v0.2.0 // indirect
98100
github.com/multiformats/go-multiaddr v0.16.1 // indirect
99-
github.com/multiformats/go-multiaddr-dns v0.4.1 // indirect
101+
github.com/multiformats/go-multiaddr-dns v0.5.0 // indirect
100102
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
101103
github.com/multiformats/go-multibase v0.2.0 // indirect
102104
github.com/multiformats/go-multicodec v0.10.0 // indirect
@@ -108,29 +110,27 @@ require (
108110
github.com/olekukonko/tablewriter v0.0.5 // indirect
109111
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
110112
github.com/pion/datachannel v1.5.10 // indirect
111-
github.com/pion/dtls/v2 v2.2.12 // indirect
112-
github.com/pion/dtls/v3 v3.0.6 // indirect
113+
github.com/pion/dtls/v3 v3.1.2 // indirect
113114
github.com/pion/ice/v4 v4.0.10 // indirect
114115
github.com/pion/interceptor v0.1.40 // indirect
115-
github.com/pion/logging v0.2.3 // indirect
116+
github.com/pion/logging v0.2.4 // indirect
116117
github.com/pion/mdns/v2 v2.0.7 // indirect
117118
github.com/pion/randutil v0.1.0 // indirect
118-
github.com/pion/rtcp v1.2.15 // indirect
119+
github.com/pion/rtcp v1.2.16 // indirect
119120
github.com/pion/rtp v1.8.19 // indirect
120121
github.com/pion/sctp v1.8.39 // indirect
121-
github.com/pion/sdp/v3 v3.0.13 // indirect
122+
github.com/pion/sdp/v3 v3.0.18 // indirect
122123
github.com/pion/srtp/v3 v3.0.6 // indirect
123-
github.com/pion/stun v0.6.1 // indirect
124-
github.com/pion/stun/v3 v3.0.0 // indirect
125-
github.com/pion/transport/v2 v2.2.10 // indirect
124+
github.com/pion/stun/v3 v3.1.1 // indirect
126125
github.com/pion/transport/v3 v3.0.7 // indirect
126+
github.com/pion/transport/v4 v4.0.1 // indirect
127127
github.com/pion/turn/v4 v4.0.2 // indirect
128128
github.com/pion/webrtc/v4 v4.1.2 // indirect
129-
github.com/polydawn/refmt v0.89.0 // indirect
129+
github.com/polydawn/refmt v0.89.1-0.20231129105047-37766d95467a // indirect
130130
github.com/prometheus/client_golang v1.23.2 // indirect
131131
github.com/prometheus/client_model v0.6.2 // indirect
132132
github.com/prometheus/common v0.67.5 // indirect
133-
github.com/prometheus/procfs v0.19.2 // indirect
133+
github.com/prometheus/procfs v0.20.1 // indirect
134134
github.com/quic-go/qpack v0.6.0 // indirect
135135
github.com/quic-go/quic-go v0.59.0 // indirect
136136
github.com/quic-go/webtransport-go v0.10.0 // indirect
@@ -147,29 +147,29 @@ require (
147147
github.com/wlynxg/anet v0.0.5 // indirect
148148
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
149149
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
150-
go.opentelemetry.io/otel v1.39.0 // indirect
151-
go.opentelemetry.io/otel/metric v1.39.0 // indirect
152-
go.opentelemetry.io/otel/trace v1.39.0 // indirect
150+
go.opentelemetry.io/otel v1.42.0 // indirect
151+
go.opentelemetry.io/otel/metric v1.42.0 // indirect
152+
go.opentelemetry.io/otel/trace v1.42.0 // indirect
153153
go.uber.org/dig v1.19.0 // indirect
154154
go.uber.org/fx v1.24.0 // indirect
155155
go.uber.org/mock v0.5.2 // indirect
156156
go.uber.org/multierr v1.11.0 // indirect
157157
go.uber.org/zap v1.27.1 // indirect
158-
go.yaml.in/yaml/v2 v2.4.3 // indirect
158+
go.yaml.in/yaml/v2 v2.4.4 // indirect
159159
go4.org/mem v0.0.0-20220726221520-4f986261bf13 // indirect
160160
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
161-
golang.org/x/crypto v0.48.0 // indirect
162-
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect
161+
golang.org/x/crypto v0.49.0 // indirect
162+
golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90 // indirect
163163
golang.org/x/image v0.25.0 // indirect
164-
golang.org/x/mod v0.33.0 // indirect
165-
golang.org/x/net v0.50.0 // indirect
166-
golang.org/x/sync v0.19.0 // indirect
167-
golang.org/x/sys v0.41.0 // indirect
168-
golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4 // indirect
169-
golang.org/x/term v0.40.0 // indirect
170-
golang.org/x/text v0.34.0 // indirect
164+
golang.org/x/mod v0.34.0 // indirect
165+
golang.org/x/net v0.52.0 // indirect
166+
golang.org/x/sync v0.20.0 // indirect
167+
golang.org/x/sys v0.43.0 // indirect
168+
golang.org/x/telemetry v0.0.0-20260311193753-579e4da9a98c // indirect
169+
golang.org/x/term v0.41.0 // indirect
170+
golang.org/x/text v0.35.0 // indirect
171171
golang.org/x/time v0.14.0 // indirect
172-
golang.org/x/tools v0.42.0 // indirect
172+
golang.org/x/tools v0.43.0 // indirect
173173
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
174174
golang.zx2c4.com/wireguard v0.0.0-20250521234502-f333402bd9cb // indirect
175175
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect

0 commit comments

Comments
 (0)