Refactor: refactor golang flavor
This commit is contained in:
1 parent
11c4e19e0c
commit
e364af393a
54 files changed
+16
-12
No files matched your search
+2
-4
@@ -20,10 +20,8 @@ gradle-app.setting
|
||||
*.iml
|
||||
/.idea/*
|
||||
!/.idea/codeStyles
|
||||
/core/src/foss/go/.idea/*
|
||||
!/core/src/foss/go/.idea/codeStyles
|
||||
/core/src/premium/go/.idea/*
|
||||
!/core/src/premium/go/.idea/codeStyles
|
||||
/core/src/main/golang/.idea/*
|
||||
!/core/src/main/golang/.idea/codeStyles
|
||||
|
||||
# KeyStore
|
||||
*.keystore
|
||||
|
||||
+4
-1
@@ -1,3 +1,6 @@
|
||||
[submodule "clash-foss"]
|
||||
path = core/src/foss/go/clash
|
||||
path = core/src/main/golang/core/foss
|
||||
url = https://github.com/Kr328/clash.git
|
||||
[submodule "clash-premium"]
|
||||
path = core/src/main/golang/core/premium
|
||||
url = https://github.com/Kr328/clash.git
|
||||
@@ -18,13 +18,15 @@ val geoipOutput = buildDir.resolve("intermediates/golang_blob")
|
||||
golang {
|
||||
sourceSets {
|
||||
create("foss") {
|
||||
srcDir.set(file("src/foss/go"))
|
||||
tags.set(listOf("foss"))
|
||||
}
|
||||
create("premium") {
|
||||
srcDir.set(file("src/premium/go"))
|
||||
tags.set(listOf("premium"))
|
||||
moduleFile.set("go.premium.mod")
|
||||
}
|
||||
all {
|
||||
fileName.set("libclash.so")
|
||||
srcDir.set(file("src/main/golang"))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Generated
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Submodule
+1
Submodule core/src/main/golang/core/premium added at fab0b09292.
File renamed without changes.
@@ -1,4 +1,4 @@
|
||||
package core
|
||||
package delegate
|
||||
|
||||
import (
|
||||
"errors"
|
||||
@@ -13,6 +13,6 @@ require (
|
||||
gopkg.in/yaml.v2 v2.4.0
|
||||
)
|
||||
|
||||
replace github.com/Dreamacro/clash => ./clash
|
||||
replace github.com/Dreamacro/clash => ./core/foss
|
||||
|
||||
replace cfa/blob => ../../../build/intermediates/golang_blob
|
||||
File renamed without changes.
File renamed without changes.
@@ -11,7 +11,7 @@ import (
|
||||
"runtime"
|
||||
|
||||
"cfa/config"
|
||||
"cfa/core"
|
||||
"cfa/delegate"
|
||||
"cfa/tunnel"
|
||||
|
||||
"github.com/Dreamacro/clash/log"
|
||||
@@ -27,7 +27,7 @@ func coreInit(home, versionName C.c_string, sdkVersion C.int) {
|
||||
v := C.GoString(versionName)
|
||||
s := int(sdkVersion)
|
||||
|
||||
core.Init(h, v, s)
|
||||
delegate.Init(h, v, s)
|
||||
|
||||
reset()
|
||||
}
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+1
-1
@@ -17,7 +17,7 @@ dependencyResolutionManagement {
|
||||
val agp = "7.0.2"
|
||||
val ksp = "1.5.30-1.0.0-beta09"
|
||||
val kotlin = "1.5.30"
|
||||
val golang = "1.0.1"
|
||||
val golang = "1.0.2"
|
||||
val coroutine = "1.5.0"
|
||||
val coreKtx = "1.5.0"
|
||||
val activity = "1.2.3"
|
||||
|
||||
Reference in new issue
Block a user