Skip to content

Commit 9bf85db

Browse files
committed
Update core
Fix some issues
1 parent 58acd9c commit 9bf85db

File tree

17 files changed

+179
-179
lines changed

17 files changed

+179
-179
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
- name: Setup Flutter
6868
uses: subosito/flutter-action@v2
6969
with:
70-
flutter-version: '3.x'
70+
flutter-version: pubspec.yaml
7171
channel: 'stable'
7272
cache: true
7373

android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,7 @@
6464
</intent-filter>
6565
</activity>
6666

67-
<!-- <meta-data-->
68-
<!-- android:name="io.flutter.embedding.android.EnableImpeller"-->
69-
<!-- android:value="true" />-->
67+
<meta-data android:name="io.flutter.embedding.android.EnableImpeller" android:value="false" />
7068

7169
<activity
7270
android:name=".TempActivity"

core/Clash.Meta

Submodule Clash.Meta updated 61 files

core/common.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"github.com/samber/lo"
2626
"os"
2727
"path/filepath"
28-
"runtime"
2928
"strings"
3029
"sync"
3130
)
@@ -352,8 +351,6 @@ func applyConfig(rawConfig *config.RawConfig) error {
352351
if configParams.IsPatch {
353352
patchConfig()
354353
} else {
355-
handleCloseConnectionsUnLock()
356-
runtime.GC()
357354
hub.ApplyConfig(currentConfig)
358355
patchSelectGroup()
359356
}

core/go.mod

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
module core
22

3-
go 1.21
3+
go 1.20
44

55
replace github.com/metacubex/mihomo => ./Clash.Meta
66

7-
require github.com/metacubex/mihomo v1.17.1
8-
97
require (
10-
github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab // indirect
11-
github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 // indirect
12-
github.com/sagernet/cors v1.2.1 // indirect
13-
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
14-
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
8+
github.com/metacubex/mihomo v0.0.0-00010101000000-000000000000
9+
github.com/samber/lo v1.47.0
1510
)
1611

17-
replace github.com/sagernet/sing => github.com/metacubex/sing v0.0.0-20240724044459-6f3cf5896297
18-
1912
require (
2013
github.com/3andne/restls-client-go v0.1.6 // indirect
2114
github.com/RyuaNerin/go-krypto v1.2.4 // indirect
@@ -27,47 +20,51 @@ require (
2720
github.com/cloudflare/circl v1.3.7 // indirect
2821
github.com/coreos/go-iptables v0.8.0 // indirect
2922
github.com/dlclark/regexp2 v1.11.4 // indirect
23+
github.com/ebitengine/purego v0.8.1 // indirect
24+
github.com/enfein/mieru/v3 v3.10.0 // indirect
3025
github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 // indirect
3126
github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 // indirect
3227
github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 // indirect
3328
github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 // indirect
3429
github.com/fsnotify/fsnotify v1.7.0 // indirect
3530
github.com/gaukas/godicttls v0.0.4 // indirect
36-
github.com/go-chi/chi/v5 v5.1.0 // indirect
31+
github.com/go-chi/chi/v5 v5.2.0 // indirect
3732
github.com/go-chi/render v1.0.3 // indirect
3833
github.com/go-ole/go-ole v1.3.0 // indirect
3934
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
4035
github.com/gobwas/httphead v0.1.0 // indirect
4136
github.com/gobwas/pool v0.2.1 // indirect
4237
github.com/gobwas/ws v1.4.0 // indirect
4338
github.com/gofrs/uuid/v5 v5.3.0 // indirect
44-
github.com/google/btree v1.1.2 // indirect
39+
github.com/google/btree v1.1.3 // indirect
4540
github.com/google/go-cmp v0.6.0 // indirect
4641
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
47-
github.com/hashicorp/yamux v0.1.1 // indirect
48-
github.com/insomniacslk/dhcp v0.0.0-20240829085014-a3a4c1f04475 // indirect
42+
github.com/hashicorp/yamux v0.1.2 // indirect
43+
github.com/insomniacslk/dhcp v0.0.0-20241224095048-b56fa0d5f25d // indirect
4944
github.com/josharian/native v1.1.0 // indirect
5045
github.com/klauspost/compress v1.17.9 // indirect
51-
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
46+
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
5247
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
5348
github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect
5449
github.com/mailru/easyjson v0.7.7 // indirect
5550
github.com/mdlayher/netlink v1.7.2 // indirect
5651
github.com/mdlayher/socket v0.4.1 // indirect
52+
github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab // indirect
5753
github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 // indirect
5854
github.com/metacubex/chacha v0.1.0 // indirect
5955
github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // indirect
60-
github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec // indirect
61-
github.com/metacubex/quic-go v0.47.1-0.20240909010619-6b38f24bfcc4 // indirect
56+
github.com/metacubex/gvisor v0.0.0-20241126021258-5b028898cc5a // indirect
57+
github.com/metacubex/quic-go v0.48.3-0.20241126053724-b69fea3888da // indirect
6258
github.com/metacubex/randv2 v0.2.0 // indirect
6359
github.com/metacubex/sing-quic v0.0.0-20240827003841-cd97758ed8b4 // indirect
6460
github.com/metacubex/sing-shadowsocks v0.2.8 // indirect
6561
github.com/metacubex/sing-shadowsocks2 v0.2.2 // indirect
66-
github.com/metacubex/sing-tun v0.2.7-0.20240729131039-ed03f557dee1 // indirect
62+
github.com/metacubex/sing-tun v0.4.5 // indirect
6763
github.com/metacubex/sing-vmess v0.1.9-0.20240719134745-1df6fb20bbf9 // indirect
68-
github.com/metacubex/sing-wireguard v0.0.0-20240924052438-b0976fc59ea3 // indirect
69-
github.com/metacubex/tfo-go v0.0.0-20241006021335-daedaf0ca7aa // indirect
64+
github.com/metacubex/sing-wireguard v0.0.0-20241126021510-0827d417b589 // indirect
65+
github.com/metacubex/tfo-go v0.0.0-20241231083714-66613d49c422 // indirect
7066
github.com/metacubex/utls v1.6.6 // indirect
67+
github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 // indirect
7168
github.com/miekg/dns v1.1.62 // indirect
7269
github.com/mroth/weightedrand/v2 v2.1.0 // indirect
7370
github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 // indirect
@@ -79,16 +76,15 @@ require (
7976
github.com/puzpuzpuz/xsync/v3 v3.4.0 // indirect
8077
github.com/quic-go/qpack v0.4.0 // indirect
8178
github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
79+
github.com/sagernet/cors v1.2.1 // indirect
8280
github.com/sagernet/fswatch v0.1.1 // indirect
8381
github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a // indirect
8482
github.com/sagernet/nftables v0.3.0-beta.4 // indirect
85-
github.com/sagernet/sing v0.5.0-alpha.13 // indirect
86-
github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6 // indirect
87-
github.com/sagernet/sing-shadowtls v0.1.4 // indirect
83+
github.com/sagernet/sing v0.5.1 // indirect
84+
github.com/sagernet/sing-mux v0.2.1 // indirect
85+
github.com/sagernet/sing-shadowtls v0.1.5 // indirect
8886
github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 // indirect
89-
github.com/samber/lo v1.47.0
90-
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
91-
github.com/shoenig/go-m1cpu v0.1.6 // indirect
87+
github.com/shirou/gopsutil/v4 v4.24.11 // indirect
9288
github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b // indirect
9389
github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c // indirect
9490
github.com/sina-ghaderi/rabbitio v0.0.0-20220730151941-9ce26f4f872e // indirect
@@ -97,22 +93,24 @@ require (
9793
github.com/tklauser/numcpus v0.6.1 // indirect
9894
github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect
9995
github.com/vishvananda/netns v0.0.4 // indirect
96+
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
97+
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
10098
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
10199
github.com/yusufpapurcu/wmi v1.2.4 // indirect
102100
gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7 // indirect
103101
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
104102
go.uber.org/mock v0.4.0 // indirect
105103
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
106-
golang.org/x/crypto v0.28.0 // indirect
104+
golang.org/x/crypto v0.31.0 // indirect
107105
golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect
108106
golang.org/x/mod v0.20.0 // indirect
109-
golang.org/x/net v0.30.0 // indirect
110-
golang.org/x/sync v0.8.0 // indirect
111-
golang.org/x/sys v0.26.0 // indirect
112-
golang.org/x/text v0.19.0 // indirect
113-
golang.org/x/time v0.5.0 // indirect
107+
golang.org/x/net v0.33.0 // indirect
108+
golang.org/x/sync v0.10.0 // indirect
109+
golang.org/x/sys v0.28.0 // indirect
110+
golang.org/x/text v0.21.0 // indirect
111+
golang.org/x/time v0.7.0 // indirect
114112
golang.org/x/tools v0.24.0 // indirect
115113
google.golang.org/protobuf v1.34.2 // indirect
116-
gopkg.in/yaml.v3 v3.0.1 // indirect; indirect`
114+
gopkg.in/yaml.v3 v3.0.1 // indirect
117115
lukechampine.com/blake3 v1.3.0 // indirect
118116
)

0 commit comments

Comments
 (0)