Skip to content

Commit 2205a90

Browse files
aylz10Larvan2
aylz10
authored and
Larvan2
committed
核心依赖变更mihomo
1 parent c7666a3 commit 2205a90

33 files changed

Lines changed: 73 additions & 73 deletions

‎core/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ val golangSource = file("src/main/golang/native")
2020
golang {
2121
sourceSets {
2222
create("meta-alpha") {
23-
tags.set(listOf("foss","with_gvisor"))
23+
tags.set(listOf("foss","with_gvisor","cmfa"))
2424
srcDir.set(file("src/foss/golang"))
2525
}
2626
create("meta") {
27-
tags.set(listOf("foss","with_gvisor"))
27+
tags.set(listOf("foss","with_gvisor","cmfa"))
2828
srcDir.set(file("src/foss/golang"))
2929
}
3030
all {

‎core/src/foss/golang/go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require cfa/blob v0.0.0-00010101000000-000000000000 // indirect
88

99
require (
1010
github.com/3andne/restls-client-go v0.1.6 // indirect
11-
github.com/Dreamacro/clash v1.7.0 // indirect
11+
github.com/metacubex/mihomo v1.7.0 // indirect
1212
github.com/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34 // indirect
1313
github.com/RyuaNerin/go-krypto v1.0.2 // indirect
1414
github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 // indirect
@@ -48,7 +48,7 @@ require (
4848
github.com/metacubex/sing-quic v0.0.0-20231008050747-a684db516966 // indirect
4949
github.com/metacubex/sing-shadowsocks v0.2.5 // indirect
5050
github.com/metacubex/sing-shadowsocks2 v0.1.4 // indirect
51-
github.com/metacubex/sing-tun v0.1.15-0.20231102032628-0f8a17217e56 // indirect
51+
github.com/metacubex/sing-tun v0.1.15-0.20231103033938-170591e8d5bd // indirect
5252
github.com/metacubex/sing-vmess v0.1.9-0.20230921005247-a0488d7dac74 // indirect
5353
github.com/metacubex/sing-wireguard v0.0.0-20231001110902-321836559170 // indirect
5454
github.com/miekg/dns v1.1.56 // indirect
@@ -104,10 +104,10 @@ require (
104104
lukechampine.com/blake3 v1.2.1 // indirect
105105
)
106106

107-
replace github.com/sagernet/sing => github.com/metacubex/sing v0.0.0-20231001053806-1230641572b9
107+
replace github.com/sagernet/sing => github.com/metacubex/sing v0.0.0-20240111014253-f1818b6a82b2
108108

109109
replace cfa => ../../main/golang
110110

111-
replace github.com/Dreamacro/clash => ./clash
111+
replace github.com/metacubex/mihomo => ./clash
112112

113113
replace cfa/blob => ../../../build/intermediates/golang_blob

‎core/src/foss/golang/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ github.com/metacubex/sing-shadowsocks v0.2.5 h1:O2RRSHlKGEpAVG/OHJQxyHqDy8uvvdCW
101101
github.com/metacubex/sing-shadowsocks v0.2.5/go.mod h1:Xz2uW9BEYGEoA8B4XEpoxt7ERHClFCwsMAvWaruoyMo=
102102
github.com/metacubex/sing-shadowsocks2 v0.1.4 h1:OOCf8lgsVcpTOJUeaFAMzyKVebaQOBnKirDdUdBoKIE=
103103
github.com/metacubex/sing-shadowsocks2 v0.1.4/go.mod h1:Qz028sLfdY3qxGRm9FDI+IM2Ae3ty2wR7HIzD/56h/k=
104-
github.com/metacubex/sing-tun v0.1.15-0.20231102032628-0f8a17217e56 h1:ietLSuWRlYrNukGEEn/WXioB4OKPebqpZCc93MRKxEU=
105-
github.com/metacubex/sing-tun v0.1.15-0.20231102032628-0f8a17217e56/go.mod h1:Q7zmpJ+qOvMMXyUoYlxGQuWkqALUpXzFSSqO+KLPyzA=
104+
github.com/metacubex/sing-tun v0.1.15-0.20231103033938-170591e8d5bd h1:k0+92eARqyTAovGhg2AxdsMWHjUsdiGCnR5NuXF3CQY=
105+
github.com/metacubex/sing-tun v0.1.15-0.20231103033938-170591e8d5bd/go.mod h1:Q7zmpJ+qOvMMXyUoYlxGQuWkqALUpXzFSSqO+KLPyzA=
106106
github.com/metacubex/sing-vmess v0.1.9-0.20230921005247-a0488d7dac74 h1:FtupiyFkaVjFvRa7B/uDtRWg5BNsoyPC9MTev3sDasY=
107107
github.com/metacubex/sing-vmess v0.1.9-0.20230921005247-a0488d7dac74/go.mod h1:8EWBZpc+qNvf5gmvjAtMHK1/DpcWqzfcBL842K00BsM=
108108
github.com/metacubex/sing-wireguard v0.0.0-20231001110902-321836559170 h1:DBGA0hmrP4pVIwLiXUONdphjcppED+plmVaKf1oqkwk=

‎core/src/main/golang/go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module cfa
33
go 1.20
44

55
require (
6-
github.com/Dreamacro/clash v1.7.0
6+
github.com/metacubex/mihomo v1.7.0
77
github.com/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34
88
github.com/dlclark/regexp2 v1.10.0
99
github.com/miekg/dns v1.1.56
@@ -12,9 +12,9 @@ require (
1212
gopkg.in/yaml.v2 v2.4.0
1313
)
1414

15-
replace github.com/Dreamacro/clash => ../../foss/golang/clash
15+
replace github.com/metacubex/mihomo => ../../foss/golang/clash
1616

17-
replace github.com/sagernet/sing => github.com/metacubex/sing v0.0.0-20231001053806-1230641572b9
17+
replace github.com/sagernet/sing => github.com/metacubex/sing v0.0.0-20240111014253-f1818b6a82b2
1818

1919
require (
2020
github.com/3andne/restls-client-go v0.1.6 // indirect
@@ -55,7 +55,7 @@ require (
5555
github.com/metacubex/sing-quic v0.0.0-20231008050747-a684db516966 // indirect
5656
github.com/metacubex/sing-shadowsocks v0.2.5 // indirect
5757
github.com/metacubex/sing-shadowsocks2 v0.1.4 // indirect
58-
github.com/metacubex/sing-tun v0.1.15-0.20231102032628-0f8a17217e56 // indirect
58+
github.com/metacubex/sing-tun v0.1.15-0.20231103033938-170591e8d5bd // indirect
5959
github.com/metacubex/sing-vmess v0.1.9-0.20230921005247-a0488d7dac74 // indirect
6060
github.com/metacubex/sing-wireguard v0.0.0-20231001110902-321836559170 // indirect
6161
github.com/mroth/weightedrand/v2 v2.1.0 // indirect

‎core/src/main/golang/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ github.com/metacubex/sing-shadowsocks v0.2.5 h1:O2RRSHlKGEpAVG/OHJQxyHqDy8uvvdCW
101101
github.com/metacubex/sing-shadowsocks v0.2.5/go.mod h1:Xz2uW9BEYGEoA8B4XEpoxt7ERHClFCwsMAvWaruoyMo=
102102
github.com/metacubex/sing-shadowsocks2 v0.1.4 h1:OOCf8lgsVcpTOJUeaFAMzyKVebaQOBnKirDdUdBoKIE=
103103
github.com/metacubex/sing-shadowsocks2 v0.1.4/go.mod h1:Qz028sLfdY3qxGRm9FDI+IM2Ae3ty2wR7HIzD/56h/k=
104-
github.com/metacubex/sing-tun v0.1.15-0.20231102032628-0f8a17217e56 h1:ietLSuWRlYrNukGEEn/WXioB4OKPebqpZCc93MRKxEU=
105-
github.com/metacubex/sing-tun v0.1.15-0.20231102032628-0f8a17217e56/go.mod h1:Q7zmpJ+qOvMMXyUoYlxGQuWkqALUpXzFSSqO+KLPyzA=
104+
github.com/metacubex/sing-tun v0.1.15-0.20231103033938-170591e8d5bd h1:k0+92eARqyTAovGhg2AxdsMWHjUsdiGCnR5NuXF3CQY=
105+
github.com/metacubex/sing-tun v0.1.15-0.20231103033938-170591e8d5bd/go.mod h1:Q7zmpJ+qOvMMXyUoYlxGQuWkqALUpXzFSSqO+KLPyzA=
106106
github.com/metacubex/sing-vmess v0.1.9-0.20230921005247-a0488d7dac74 h1:FtupiyFkaVjFvRa7B/uDtRWg5BNsoyPC9MTev3sDasY=
107107
github.com/metacubex/sing-vmess v0.1.9-0.20230921005247-a0488d7dac74/go.mod h1:8EWBZpc+qNvf5gmvjAtMHK1/DpcWqzfcBL842K00BsM=
108108
github.com/metacubex/sing-wireguard v0.0.0-20231001110902-321836559170 h1:DBGA0hmrP4pVIwLiXUONdphjcppED+plmVaKf1oqkwk=

‎core/src/main/golang/native/all/imports.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ import (
1212

1313
_ "golang.org/x/sync/semaphore"
1414

15-
_ "github.com/Dreamacro/clash/log"
15+
_ "github.com/metacubex/mihomo/log"
1616
)

‎core/src/main/golang/native/app.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"cfa/native/app"
1111

12-
"github.com/Dreamacro/clash/log"
12+
"github.com/metacubex/mihomo/log"
1313
)
1414

1515
func openRemoteContent(url string) (int, error) {

‎core/src/main/golang/native/app/dns.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package app
33
import (
44
"strings"
55

6-
"github.com/Dreamacro/clash/dns"
6+
"github.com/metacubex/mihomo/dns"
77
)
88

99
func NotifyDnsChanged(dnsList string) {

‎core/src/main/golang/native/app/ui.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package app
33
import (
44
"github.com/dlclark/regexp2"
55

6-
"github.com/Dreamacro/clash/log"
6+
"github.com/metacubex/mihomo/log"
77
)
88

99
var uiSubtitlePattern *regexp2.Regexp

‎core/src/main/golang/native/config/fetch.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414

1515
"cfa/native/app"
1616

17-
clashHttp "github.com/Dreamacro/clash/component/http"
17+
clashHttp "github.com/metacubex/mihomo/component/http"
1818
)
1919

2020
type Status struct {

0 commit comments

Comments
 (0)