Skip to content

Commit 7074b91

Browse files
committed
chore: keep up with syncthing v2 branch
1 parent 886c02e commit 7074b91

File tree

6 files changed

+295
-710
lines changed

6 files changed

+295
-710
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@
44
/localize.sh
55
/Build
66
*.p12
7+
/SushitrainCore/gobind
8+
/SushitrainCore/gomobile

SushitrainCore/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@ deps:
1616
ifndef GO_VERSION
1717
echo Go is not installed!
1818
endif
19-
ifndef GOMOBILE_VERSION
2019
go get golang.org/x/mobile/cmd/gomobile
2120
go get golang.org/x/mobile/cmd/gobind
2221
go build golang.org/x/mobile/cmd/gomobile
2322
go build golang.org/x/mobile/cmd/gobind
24-
endif
2523

2624
notices.html: notices.template.html go.mod go.sum
2725
go install github.com/google/go-licenses@latest

SushitrainCore/go.mod

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@ toolchain go1.24.0
66

77
replace github.com/syncthing/syncthing => /Users/tommy/Repos/syncthing
88

9+
// gopsutil vanilla does not build on iOS. In the below fork some files are removed (iostat_darwin_cgo.go, iostat_drawin.c/.h)
10+
// To update to a newer version, replace the 'v4.2.**' with 'master', then run go mod tidy
11+
replace github.com/shirou/gopsutil/v4 v4.0.0 => github.com/pixelspark/gopsutil/v4 v4.24.9-0.20240922111650-71ae9b06ea66
12+
13+
replace github.com/gobwas/glob v0.2.3 => github.com/calmh/glob v0.0.0-20220615080505-1d823af5017b
14+
915
require (
1016
github.com/gotd/contrib v0.21.0
1117
github.com/miscreant/miscreant.go v0.0.0-20200214223636-26d376326b75
12-
github.com/syncthing/syncthing v1.29.3-rc.1.0.20250207154053-28f0cffdb6ad
18+
github.com/syncthing/syncthing v1.29.3
1319
)
1420

1521
require (
@@ -19,76 +25,65 @@ require (
1925
github.com/calmh/xdr v1.2.0 // indirect
2026
github.com/ccding/go-stun v0.1.5 // indirect
2127
github.com/cespare/xxhash/v2 v2.3.0 // indirect
22-
github.com/chmduquesne/rollinghash v4.0.0+incompatible // indirect
2328
github.com/davecgh/go-spew v1.1.1 // indirect
2429
github.com/dustin/go-humanize v1.0.1 // indirect
30+
github.com/ebitengine/purego v0.8.2 // indirect
2531
github.com/go-asn1-ber/asn1-ber v1.5.7 // indirect
2632
github.com/go-ldap/ldap/v3 v3.4.10 // indirect
2733
github.com/go-ole/go-ole v1.3.0 // indirect
2834
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
2935
github.com/gobwas/glob v0.2.3 // indirect
30-
github.com/golang/snappy v0.0.4 // indirect
31-
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
36+
github.com/golang/snappy v1.0.0 // indirect
37+
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e // indirect
3238
github.com/google/uuid v1.6.0 // indirect
33-
github.com/greatroar/blobloom v0.8.0 // indirect
3439
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
3540
github.com/jackpal/gateway v1.0.16 // indirect
3641
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
3742
github.com/jmoiron/sqlx v1.4.0 // indirect
3843
github.com/julienschmidt/httprouter v1.3.0 // indirect
3944
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
40-
github.com/klauspost/compress v1.17.11 // indirect
41-
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
45+
github.com/klauspost/compress v1.18.0 // indirect
46+
github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 // indirect
4247
github.com/mattn/go-isatty v0.0.20 // indirect
4348
github.com/mattn/go-sqlite3 v1.14.24 // indirect
4449
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
45-
github.com/ncruces/go-sqlite3 v0.24.0 // indirect
4650
github.com/ncruces/go-strftime v0.1.9 // indirect
47-
github.com/ncruces/julianday v1.0.0 // indirect
48-
github.com/onsi/ginkgo/v2 v2.22.2 // indirect
51+
github.com/onsi/ginkgo/v2 v2.23.3 // indirect
4952
github.com/pierrec/lz4/v4 v4.1.22 // indirect
5053
github.com/pmezard/go-difflib v1.0.0 // indirect
5154
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
5255
github.com/prometheus/client_golang v1.21.1 // indirect
5356
github.com/prometheus/client_model v0.6.1 // indirect
54-
github.com/prometheus/common v0.62.0 // indirect
55-
github.com/prometheus/procfs v0.15.1 // indirect
56-
github.com/quic-go/quic-go v0.50.0 // indirect
57+
github.com/prometheus/common v0.63.0 // indirect
58+
github.com/prometheus/procfs v0.16.0 // indirect
59+
github.com/quic-go/quic-go v0.50.1 // indirect
5760
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
5861
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
5962
github.com/shirou/gopsutil/v4 v4.25.2 // indirect
60-
github.com/shoenig/go-m1cpu v0.1.6 // indirect
6163
github.com/stretchr/objx v0.5.2 // indirect
6264
github.com/stretchr/testify v1.10.0 // indirect
6365
github.com/syncthing/notify v0.0.0-20250207082249-f0fa8f99c2bc // indirect
6466
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
65-
github.com/tetratelabs/wazero v1.9.0 // indirect
6667
github.com/thejerf/suture/v4 v4.0.6 // indirect
67-
github.com/tklauser/go-sysconf v0.3.14 // indirect
68-
github.com/tklauser/numcpus v0.9.0 // indirect
68+
github.com/tklauser/go-sysconf v0.3.15 // indirect
69+
github.com/tklauser/numcpus v0.10.0 // indirect
6970
github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0 // indirect
7071
github.com/yusufpapurcu/wmi v1.2.4 // indirect
7172
go.uber.org/mock v0.5.0 // indirect
7273
golang.org/x/crypto v0.36.0 // indirect
73-
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
74+
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
7475
golang.org/x/mobile v0.0.0-20250305212854-3a7bc9f8a4de // indirect
7576
golang.org/x/mod v0.24.0 // indirect
76-
golang.org/x/net v0.37.0 // indirect
77+
golang.org/x/net v0.38.0 // indirect
7778
golang.org/x/sync v0.12.0 // indirect
7879
golang.org/x/sys v0.31.0 // indirect
7980
golang.org/x/text v0.23.0 // indirect
8081
golang.org/x/time v0.11.0 // indirect
8182
golang.org/x/tools v0.31.0 // indirect
82-
google.golang.org/protobuf v1.36.5 // indirect
83+
google.golang.org/protobuf v1.36.6 // indirect
8384
gopkg.in/yaml.v3 v3.0.1 // indirect
84-
modernc.org/libc v1.61.13 // indirect
85+
modernc.org/libc v1.62.1 // indirect
8586
modernc.org/mathutil v1.7.1 // indirect
86-
modernc.org/memory v1.8.2 // indirect
87-
modernc.org/sqlite v1.36.0 // indirect
87+
modernc.org/memory v1.9.1 // indirect
88+
modernc.org/sqlite v1.36.3 // indirect
8889
)
89-
90-
// gopsutil vanilla does not build on iOS. In the below fork some files are removed (iostat_darwin_cgo.go, iostat_drawin.c/.h)
91-
// To update to a newer version, replace the 'v4.2.**' with 'master', then run go mod tidy
92-
replace github.com/shirou/gopsutil/v4 => github.com/pixelspark/gopsutil/v4 v4.24.9-0.20240922111650-71ae9b06ea66
93-
94-
replace github.com/gobwas/glob v0.2.3 => github.com/calmh/glob v0.0.0-20220615080505-1d823af5017b

0 commit comments

Comments
 (0)