diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index 2fb89442..658dd1b4 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -20,7 +20,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Fetch Status - run: git submodule status 'core/*' > core_status + run: git submodule status 'library/core/*' > core_status - name: Core Cache id: cache uses: actions/cache@v2 @@ -39,7 +39,7 @@ jobs: run: | echo "sdk.dir=${ANDROID_HOME}" > local.properties echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties - ./run libs core + ./run lib core v2ray: name: Native Build (V2Ray) runs-on: ubuntu-latest @@ -47,14 +47,14 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Fetch Status - run: git submodule status v2ray > v2ray_status + run: git submodule status library/v2ray > v2ray_status - name: V2Ray Cache id: cache uses: actions/cache@v2 with: path: | app/libs/libv2ray.aar - key: ${{ hashFiles('bin/libs/v2ray/*', 'v2ray_status') }} + key: ${{ hashFiles('bin/lib/v2ray/*', 'v2ray_status') }} - name: Install Golang uses: actions/setup-go@v2 if: steps.cache.outputs.cache-hit != 'true' @@ -62,7 +62,7 @@ jobs: go-version: 1.16 - name: Native Build if: steps.cache.outputs.cache-hit != 'true' - run: ./run libs v2ray + run: ./run lib v2ray xtls: name: Native Build (XTLS) runs-on: ubuntu-latest @@ -70,14 +70,14 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Fetch Status - run: git submodule status 'xtls-plugin/*' > xtls_status + run: git submodule status 'plugin/xtls/*' > xtls_status - name: XTLS Cache id: cache uses: actions/cache@v2 with: path: | - xtls-plugin/src/main/jniLibs - key: ${{ hashFiles('bin/libs/xtls.sh', 'xtls_status') }} + plugin/xtls/src/main/jniLibs + key: ${{ hashFiles('bin/lib/xtls.sh', 'xtls_status') }} - name: Install Golang uses: actions/setup-go@v2 if: steps.cache.outputs.cache-hit != 'true' @@ -85,7 +85,7 @@ jobs: go-version: 1.16 - name: Native Build if: steps.cache.outputs.cache-hit != 'true' - run: ./run libs xtls + run: ./run plugin xtls trojan-go: name: Native Build (Trojan-Go) runs-on: ubuntu-latest @@ -93,14 +93,14 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Fetch Status - run: git submodule status 'trojan-go-plugin/*' > trojan_go_status + run: git submodule status 'plugin/trojan-go/*' > trojan_go_status - name: Trojan-Go Cache id: cache uses: actions/cache@v2 with: path: | - trojan-go-plugin/src/main/jniLibs - key: ${{ hashFiles('bin/libs/trojan_go.sh', 'trojan_go_status') }} + plugin/trojan-go/src/main/jniLibs + key: ${{ hashFiles('bin/lib/trojan_go.sh', 'trojan_go_status') }} - name: Install Golang uses: actions/setup-go@v2 if: steps.cache.outputs.cache-hit != 'true' @@ -108,7 +108,7 @@ jobs: go-version: 1.16 - name: Native Build if: steps.cache.outputs.cache-hit != 'true' - run: ./run libs trojan_go + run: ./run plugin trojan_go naive: runs-on: ubuntu-latest name: Native Build (NaïveProxy) @@ -120,19 +120,19 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Fetch Status - run: git submodule status 'naive-plugin/*' > naive_status + run: git submodule status 'plugin/naive/*' > naive_status - name: Naive Cache id: cache uses: actions/cache@v2 with: path: | - naive-plugin/src/main/jniLibs/${{ matrix.arch }} - key: naive-${{ matrix.arch }}-${{ hashFiles('bin/libs/naive/*', 'naive_status') }} + plugin/naive/src/main/jniLibs/${{ matrix.arch }} + key: naive-${{ matrix.arch }}-${{ hashFiles('bin/plugin/naive/*', 'naive_status') }} - name: Native Build if: steps.cache.outputs.cache-hit != 'true' run: | ./run init action naive - ./run libs naive ${{ matrix.arch }} + ./run plugin naive ${{ matrix.arch }} pingtunnel: name: Native Build (PingTunnel) runs-on: ubuntu-latest @@ -140,14 +140,14 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Fetch Status - run: git submodule status 'pt-plugin/*' > pt_status + run: git submodule status 'plugin/pingtunnel/*' > pt_status - name: PingTunnel Cache id: cache uses: actions/cache@v2 with: path: | - pt-plugin/src/main/jniLibs - key: ${{ hashFiles('bin/libs/pingtunnel.sh', 'pt_status') }} + plugin/pingtunnel/src/main/jniLibs + key: ${{ hashFiles('bin/lib/pingtunnel.sh', 'pt_status') }} - name: Install Golang uses: actions/setup-go@v2 if: steps.cache.outputs.cache-hit != 'true' @@ -155,7 +155,7 @@ jobs: go-version: 1.16 - name: Native Build if: steps.cache.outputs.cache-hit != 'true' - run: ./run libs pingtunnel + run: ./run plugin pingtunnel relaybaton: name: Native Build (RelayBaton) runs-on: ubuntu-latest @@ -163,14 +163,14 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Fetch Status - run: git submodule status 'rb-plugin/*' > rb_status + run: git submodule status 'plugin/relaybaton/*' > rb_status - name: RelayBaton Cache id: cache uses: actions/cache@v2 with: path: | - rb-plugin/src/main/jniLibs - key: ${{ hashFiles('bin/libs/relaybaton.sh', 'rb_status') }} + plugin/relaybaton/src/main/jniLibs + key: ${{ hashFiles('bin/lib/relaybaton.sh', 'rb_status') }} - name: Install Golang uses: actions/setup-go@v2 if: steps.cache.outputs.cache-hit != 'true' @@ -178,7 +178,7 @@ jobs: go-version: 1.16 - name: Native Build if: steps.cache.outputs.cache-hit != 'true' - run: ./run libs relaybaton + run: ./run plugin relaybaton shadowsocks: name: Native Build (Shadowsocks) runs-on: ubuntu-latest @@ -186,14 +186,14 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Fetch Status - run: git submodule status 'shadowsocks/*' > shadowsocks_status + run: git submodule status 'library/shadowsocks/*' > shadowsocks_status - name: Shadowsocks Cache id: cache uses: actions/cache@v2 with: path: | app/libs/shadowsocks-release.aar - key: ${{ hashFiles('shadowsocks/build.gradle.kts', 'shadowsocks_status') }} + key: ${{ hashFiles('library/shadowsocks/build.gradle.kts', 'shadowsocks_status') }} - name: Install Rust if: steps.cache.outputs.cache-hit != 'true' run: ./run init action shadowsocks @@ -208,7 +208,7 @@ jobs: run: | echo "sdk.dir=${ANDROID_HOME}" > local.properties echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties - ./run libs shadowsocks + ./run lib shadowsocks shadowsocksr: name: Native Build (ShadowsocksR) runs-on: ubuntu-latest @@ -216,7 +216,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Fetch Status - run: git submodule status 'shadowsocksr/*' > shadowsocksr_status + run: git submodule status 'library/shadowsocksr/*' > shadowsocksr_status - name: ShadowsocksR Cache id: cache uses: actions/cache@v2 @@ -235,7 +235,7 @@ jobs: run: | echo "sdk.dir=${ANDROID_HOME}" > local.properties echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties - ./run libs shadowsocksr + ./run lib shadowsocksr build: name: Gradle Build runs-on: ubuntu-latest @@ -249,10 +249,10 @@ jobs: uses: actions/checkout@v2 - name: Fetch Status run: | - git submodule status 'core/*' > core_status - git submodule status 'shadowsocks/*' > shadowsocks_status - git submodule status 'shadowsocksr/*' > shadowsocksr_status - git submodule status v2ray > v2ray_status + git submodule status 'library/core/*' > core_status + git submodule status 'library/shadowsocks/*' > shadowsocks_status + git submodule status 'library/shadowsocksr/*' > shadowsocksr_status + git submodule status library/v2ray > v2ray_status - name: Core Cache uses: actions/cache@v2 with: @@ -264,13 +264,13 @@ jobs: with: path: | app/libs/libv2ray.aar - key: ${{ hashFiles('bin/libs/v2ray/*', 'v2ray_status') }} + key: ${{ hashFiles('bin/lib/v2ray/*', 'v2ray_status') }} - name: Shadowsocks Cache uses: actions/cache@v2 with: path: | app/libs/shadowsocks-release.aar - key: ${{ hashFiles('shadowsocks/build.gradle.kts', 'shadowsocks_status') }} + key: ${{ hashFiles('library/shadowsocks/build.gradle.kts', 'shadowsocks_status') }} - name: ShadowsocksR Cache uses: actions/cache@v2 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6777e0c3..46e162e7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,7 +33,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Fetch Status - run: git submodule status 'core/*' > core_status + run: git submodule status 'library/core/*' > core_status - name: Core Cache id: cache uses: actions/cache@v2 @@ -52,7 +52,7 @@ jobs: run: | echo "sdk.dir=${ANDROID_HOME}" > local.properties echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties - ./run libs core + ./run lib core v2ray: name: Native Build (V2Ray) runs-on: ubuntu-latest @@ -61,14 +61,14 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Fetch Status - run: git submodule status v2ray > v2ray_status + run: git submodule status library/v2ray > v2ray_status - name: V2Ray Cache id: cache uses: actions/cache@v2 with: path: | app/libs/libv2ray.aar - key: ${{ hashFiles('bin/libs/v2ray/*', 'v2ray_status') }} + key: ${{ hashFiles('bin/lib/v2ray/*', 'v2ray_status') }} - name: Install Golang uses: actions/setup-go@v2 if: steps.cache.outputs.cache-hit != 'true' @@ -85,7 +85,7 @@ jobs: run: | echo "sdk.dir=${ANDROID_HOME}" > local.properties echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties - ./run libs v2ray + ./run lib v2ray shadowsocks: name: Native Build (Shadowsocks) runs-on: ubuntu-latest @@ -94,14 +94,14 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Fetch Status - run: git submodule status 'shadowsocks/*' > shadowsocks_status + run: git submodule status 'library/shadowsocks/*' > shadowsocks_status - name: Shadowsocks Cache id: cache uses: actions/cache@v2 with: path: | app/libs/shadowsocks-release.aar - key: ${{ hashFiles('shadowsocks/build.gradle.kts', 'shadowsocks_status') }} + key: ${{ hashFiles('library/shadowsocks/build.gradle.kts', 'shadowsocks_status') }} - name: Install Rust if: steps.cache.outputs.cache-hit != 'true' run: ./run init action shadowsocks @@ -116,7 +116,7 @@ jobs: run: | echo "sdk.dir=${ANDROID_HOME}" > local.properties echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties - ./run libs shadowsocks + ./run lib shadowsocks shadowsocksr: name: Native Build (ShadowsocksR) runs-on: ubuntu-latest @@ -125,7 +125,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Fetch Status - run: git submodule status 'shadowsocksr/*' > shadowsocksr_status + run: git submodule status 'library/shadowsocksr/*' > shadowsocksr_status - name: ShadowsocksR Cache id: cache uses: actions/cache@v2 @@ -144,7 +144,7 @@ jobs: run: | echo "sdk.dir=${ANDROID_HOME}" > local.properties echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties - ./run libs shadowsocksr + ./run lib shadowsocksr build: name: Gradle Build runs-on: ubuntu-latest @@ -158,10 +158,10 @@ jobs: uses: actions/checkout@v2 - name: Fetch Status run: | - git submodule status 'core/*' > core_status - git submodule status 'shadowsocks/*' > shadowsocks_status - git submodule status 'shadowsocksr/*' > shadowsocksr_status - git submodule status v2ray > v2ray_status + git submodule status 'library/core/*' > core_status + git submodule status 'library/shadowsocks/*' > shadowsocks_status + git submodule status 'library/shadowsocksr/*' > shadowsocksr_status + git submodule status library/v2ray > v2ray_status - name: Core Cache uses: actions/cache@v2 with: @@ -173,13 +173,13 @@ jobs: with: path: | app/libs/libv2ray.aar - key: ${{ hashFiles('bin/libs/v2ray/*', 'v2ray_status') }} + key: ${{ hashFiles('bin/lib/v2ray/*', 'v2ray_status') }} - name: Shadowsocks Cache uses: actions/cache@v2 with: path: | app/libs/shadowsocks-release.aar - key: ${{ hashFiles('shadowsocks/build.gradle.kts', 'shadowsocks_status') }} + key: ${{ hashFiles('library/shadowsocks/build.gradle.kts', 'shadowsocks_status') }} - name: ShadowsocksR Cache uses: actions/cache@v2 with: @@ -270,10 +270,10 @@ jobs: uses: actions/checkout@v2 - name: Fetch Status run: | - git submodule status 'core/*' > core_status - git submodule status 'shadowsocks/*' > shadowsocks_status - git submodule status 'shadowsocksr/*' > shadowsocksr_status - git submodule status v2ray > v2ray_status + git submodule status 'library/core/*' > core_status + git submodule status 'library/shadowsocks/*' > shadowsocks_status + git submodule status 'library/shadowsocksr/*' > shadowsocksr_status + git submodule status library/v2ray > v2ray_status - name: Core Cache uses: actions/cache@v2 with: @@ -285,13 +285,13 @@ jobs: with: path: | app/libs/libv2ray.aar - key: ${{ hashFiles('bin/libs/v2ray/*', 'v2ray_status') }} + key: ${{ hashFiles('bin/lib/v2ray/*', 'v2ray_status') }} - name: Shadowsocks Cache uses: actions/cache@v2 with: path: | app/libs/shadowsocks-release.aar - key: ${{ hashFiles('shadowsocks/build.gradle.kts', 'shadowsocks_status') }} + key: ${{ hashFiles('library/shadowsocks/build.gradle.kts', 'shadowsocks_status') }} - name: ShadowsocksR Cache uses: actions/cache@v2 with: diff --git a/.github/workflows/release_naive.yml b/.github/workflows/release_naive.yml index 1e8d6289..9d45c10e 100644 --- a/.github/workflows/release_naive.yml +++ b/.github/workflows/release_naive.yml @@ -34,14 +34,14 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Fetch Status - run: git submodule status 'naive-plugin/*' > naive_status + run: git submodule status 'plugin/naive/*' > naive_status - name: Naive Cache id: cache uses: actions/cache@v2 with: path: | - naive-plugin/src/main/jniLibs/${{ matrix.arch }} - key: naive-${{ matrix.arch }}-${{ hashFiles('bin/libs/naive/*', 'naive_status') }} + plugin/naive/src/main/jniLibs/${{ matrix.arch }} + key: naive-${{ matrix.arch }}-${{ hashFiles('bin/plugin/naive/*', 'naive_status') }} - name: Gradle cache uses: actions/cache@v2 if: steps.cache.outputs.cache-hit != 'true' @@ -54,7 +54,7 @@ jobs: echo "sdk.dir=${ANDROID_HOME}" > local.properties echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties ./run init action naive - ./run libs naive ${{ matrix.arch }} + ./run plugin naive ${{ matrix.arch }} naive: needs: naive_libs name: Gradle Build (NaïveProxy) @@ -63,31 +63,31 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Fetch Status - run: git submodule status 'naive-plugin/*' > naive_status + run: git submodule status 'plugin/naive/*' > naive_status - name: Naive Cache (armeabi-v7a) uses: actions/cache@v2 with: path: | - naive-plugin/src/main/jniLibs/armeabi-v7a - key: naive-armeabi-v7a-${{ hashFiles('bin/libs/naive/*', 'naive_status') }} + plugin/naive/src/main/jniLibs/armeabi-v7a + key: naive-armeabi-v7a-${{ hashFiles('bin/plugin/naive/*', 'naive_status') }} - name: Naive Cache (arm64-v8a) uses: actions/cache@v2 with: path: | - naive-plugin/src/main/jniLibs/arm64-v8a - key: naive-arm64-v8a-${{ hashFiles('bin/libs/naive/*', 'naive_status') }} + plugin/naive/src/main/jniLibs/arm64-v8a + key: naive-arm64-v8a-${{ hashFiles('bin/plugin/naive/*', 'naive_status') }} - name: Naive Cache (x86) uses: actions/cache@v2 with: path: | - naive-plugin/src/main/jniLibs/x86 - key: naive-x86-${{ hashFiles('bin/libs/naive/*', 'naive_status') }} + plugin/naive/src/main/jniLibs/x86 + key: naive-x86-${{ hashFiles('bin/plugin/naive/*', 'naive_status') }} - name: Naive Cache (x86_64) uses: actions/cache@v2 with: path: | - naive-plugin/src/main/jniLibs/x86_64 - key: naive-x86_64-${{ hashFiles('bin/libs/naive/*', 'naive_status') }} + plugin/naive/src/main/jniLibs/x86_64 + key: naive-x86_64-${{ hashFiles('bin/plugin/naive/*', 'naive_status') }} - name: Gradle cache uses: actions/cache@v2 with: @@ -99,7 +99,7 @@ jobs: echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}" ./gradlew naive-plugin:assembleRelease - APK=$(find naive-plugin/build/outputs/apk -name '*arm64-v8a*.apk') + APK=$(find plugin/naive/build/outputs/apk -name '*arm64-v8a*.apk') APK=$(dirname $APK) echo "APK=$APK" >> $GITHUB_ENV - uses: actions/upload-artifact@v2 @@ -164,13 +164,13 @@ jobs: # - name: Checkout # uses: actions/checkout@v2 # - name: Fetch Status -# run: git submodule status 'xtls-plugin/*' > xtls_status +# run: git submodule status 'plugin/xtls/*' > xtls_status # - name: XTLS Cache # uses: actions/cache@v2 # with: # path: | -# xtls-plugin/src/main/jniLibs -# key: ${{ hashFiles('bin/libs/xtls.sh', 'xtls_status') }} +# plugin/xtls/src/main/jniLibs +# key: ${{ hashFiles('bin/lib/xtls.sh', 'xtls_status') }} # - name: Release Build # run: | # echo "sdk.dir=${ANDROID_HOME}" > local.properties diff --git a/.github/workflows/release_pingtunnel.yml b/.github/workflows/release_pingtunnel.yml index ffe36e5c..f880e3ad 100644 --- a/.github/workflows/release_pingtunnel.yml +++ b/.github/workflows/release_pingtunnel.yml @@ -31,14 +31,14 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Fetch Status - run: git submodule status 'pt-plugin/*' > pt_status + run: git submodule status 'plugin/pingtunnel/*' > pt_status - name: PingTunnel Cache id: cache uses: actions/cache@v2 with: path: | - pt-plugin/src/main/jniLibs - key: ${{ hashFiles('bin/libs/pingtunnel.sh', 'pt_status') }} + plugin/pingtunnel/src/main/jniLibs + key: ${{ hashFiles('bin/lib/pingtunnel.sh', 'pt_status') }} - name: Install Golang uses: actions/setup-go@v2 if: steps.cache.outputs.cache-hit != 'true' @@ -46,7 +46,7 @@ jobs: go-version: 1.16 - name: Native Build if: steps.cache.outputs.cache-hit != 'true' - run: ./run libs pingtunnel + run: ./run plugin pingtunnel build: name: Gradle Build runs-on: ubuntu-latest @@ -56,13 +56,13 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Fetch Status - run: git submodule status 'pt-plugin/*' > pt_status + run: git submodule status 'plugin/pingtunnel/*' > pt_status - name: PingTunnel Cache uses: actions/cache@v2 with: path: | - pt-plugin/src/main/jniLibs - key: ${{ hashFiles('bin/libs/pingtunnel.sh', 'pt_status') }} + plugin/pingtunnel/src/main/jniLibs + key: ${{ hashFiles('bin/lib/pingtunnel.sh', 'pt_status') }} - name: Gradle cache uses: actions/cache@v2 with: @@ -74,7 +74,7 @@ jobs: echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}" ./gradlew pt-plugin:assembleRelease - APK=$(find pt-plugin/build/outputs/apk -name '*arm64-v8a*.apk') + APK=$(find plugin/pingtunnel/build/outputs/apk -name '*arm64-v8a*.apk') APK=$(dirname $APK) echo "APK=$APK" >> $GITHUB_ENV - uses: actions/upload-artifact@v2 @@ -139,13 +139,13 @@ jobs: # - name: Checkout # uses: actions/checkout@v2 # - name: Fetch Status -# run: git submodule status 'xtls-plugin/*' > xtls_status +# run: git submodule status 'plugin/xtls/*' > xtls_status # - name: XTLS Cache # uses: actions/cache@v2 # with: # path: | -# xtls-plugin/src/main/jniLibs -# key: ${{ hashFiles('bin/libs/xtls.sh', 'xtls_status') }} +# plugin/xtls/src/main/jniLibs +# key: ${{ hashFiles('bin/lib/xtls.sh', 'xtls_status') }} # - name: Release Build # run: | # echo "sdk.dir=${ANDROID_HOME}" > local.properties diff --git a/.github/workflows/release_relaybaton.yml b/.github/workflows/release_relaybaton.yml index c64e0707..add5ad92 100644 --- a/.github/workflows/release_relaybaton.yml +++ b/.github/workflows/release_relaybaton.yml @@ -31,14 +31,14 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Fetch Status - run: git submodule status 'rb-plugin/*' > rb_status + run: git submodule status 'plugin/relaybaton/*' > rb_status - name: RelayBaton Cache id: cache uses: actions/cache@v2 with: path: | - rb-plugin/src/main/jniLibs - key: ${{ hashFiles('bin/libs/relaybaton.sh', 'rb_status') }} + plugin/relaybaton/src/main/jniLibs + key: ${{ hashFiles('bin/lib/relaybaton.sh', 'rb_status') }} - name: Install Golang uses: actions/setup-go@v2 if: steps.cache.outputs.cache-hit != 'true' @@ -46,7 +46,7 @@ jobs: go-version: 1.16 - name: Native Build if: steps.cache.outputs.cache-hit != 'true' - run: ./run libs relaybaton + run: ./run plugin relaybaton build: name: Gradle Build runs-on: ubuntu-latest @@ -56,13 +56,13 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Fetch Status - run: git submodule status 'rb-plugin/*' > rb_status + run: git submodule status 'plugin/relaybaton/*' > rb_status - name: RelayBaton Cache uses: actions/cache@v2 with: path: | - rb-plugin/src/main/jniLibs - key: ${{ hashFiles('bin/libs/relaybaton.sh', 'rb_status') }} + plugin/relaybaton/src/main/jniLibs + key: ${{ hashFiles('bin/lib/relaybaton.sh', 'rb_status') }} - name: Gradle cache uses: actions/cache@v2 with: @@ -74,7 +74,7 @@ jobs: echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}" ./gradlew rb-plugin:assembleRelease - APK=$(find rb-plugin/build/outputs/apk -name '*arm64-v8a*.apk') + APK=$(find plugin/relaybaton/build/outputs/apk -name '*arm64-v8a*.apk') APK=$(dirname $APK) echo "APK=$APK" >> $GITHUB_ENV - uses: actions/upload-artifact@v2 @@ -139,13 +139,13 @@ jobs: # - name: Checkout # uses: actions/checkout@v2 # - name: Fetch Status -# run: git submodule status 'xtls-plugin/*' > xtls_status +# run: git submodule status 'plugin/xtls/*' > xtls_status # - name: XTLS Cache # uses: actions/cache@v2 # with: # path: | -# xtls-plugin/src/main/jniLibs -# key: ${{ hashFiles('bin/libs/xtls.sh', 'xtls_status') }} +# plugin/xtls/src/main/jniLibs +# key: ${{ hashFiles('bin/lib/xtls.sh', 'xtls_status') }} # - name: Release Build # run: | # echo "sdk.dir=${ANDROID_HOME}" > local.properties diff --git a/.github/workflows/release_trojan_go.yml b/.github/workflows/release_trojan_go.yml index ce89c04e..36a6d26a 100644 --- a/.github/workflows/release_trojan_go.yml +++ b/.github/workflows/release_trojan_go.yml @@ -31,14 +31,14 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Fetch Status - run: git submodule status 'trojan-go-plugin/*' > trojan_go_status + run: git submodule status 'plugin/trojan-go/*' > trojan_go_status - name: Trojan-Go Cache id: cache uses: actions/cache@v2 with: path: | - trojan-go-plugin/src/main/jniLibs - key: ${{ hashFiles('bin/libs/trojan_go.sh', 'trojan_go_status') }} + plugin/trojan-go/src/main/jniLibs + key: ${{ hashFiles('bin/lib/trojan_go.sh', 'trojan_go_status') }} - name: Install Golang uses: actions/setup-go@v2 if: steps.cache.outputs.cache-hit != 'true' @@ -46,7 +46,7 @@ jobs: go-version: 1.16 - name: Native Build if: steps.cache.outputs.cache-hit != 'true' - run: ./run libs trojan_go + run: ./run plugin trojan_go build: name: Gradle Build runs-on: ubuntu-latest @@ -56,13 +56,13 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Fetch Status - run: git submodule status 'trojan-go-plugin/*' > trojan_go_status + run: git submodule status 'plugin/trojan-go/*' > trojan_go_status - name: Trojan-Go Cache uses: actions/cache@v2 with: path: | - trojan-go-plugin/src/main/jniLibs - key: ${{ hashFiles('bin/libs/trojan_go.sh', 'trojan_go_status') }} + plugin/trojan-go/src/main/jniLibs + key: ${{ hashFiles('bin/lib/trojan_go.sh', 'trojan_go_status') }} - name: Gradle cache uses: actions/cache@v2 with: @@ -74,7 +74,7 @@ jobs: echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}" ./gradlew trojan-go-plugin:assembleRelease - APK=$(find trojan-go-plugin/build/outputs/apk -name '*arm64-v8a*.apk') + APK=$(find plugin/trojan-go/build/outputs/apk -name '*arm64-v8a*.apk') APK=$(dirname $APK) echo "APK=$APK" >> $GITHUB_ENV - uses: actions/upload-artifact@v2 @@ -139,13 +139,13 @@ jobs: # - name: Checkout # uses: actions/checkout@v2 # - name: Fetch Status -# run: git submodule status 'xtls-plugin/*' > xtls_status +# run: git submodule status 'plugin/xtls/*' > xtls_status # - name: XTLS Cache # uses: actions/cache@v2 # with: # path: | -# xtls-plugin/src/main/jniLibs -# key: ${{ hashFiles('bin/libs/xtls.sh', 'xtls_status') }} +# plugin/xtls/src/main/jniLibs +# key: ${{ hashFiles('bin/lib/xtls.sh', 'xtls_status') }} # - name: Release Build # run: | # echo "sdk.dir=${ANDROID_HOME}" > local.properties diff --git a/.github/workflows/release_xtls.yml b/.github/workflows/release_xtls.yml index 27c050c7..733c5b5c 100644 --- a/.github/workflows/release_xtls.yml +++ b/.github/workflows/release_xtls.yml @@ -31,14 +31,14 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Fetch Status - run: git submodule status 'xtls-plugin/*' > xtls_status + run: git submodule status 'plugin/xtls/*' > xtls_status - name: XTLS Cache id: cache uses: actions/cache@v2 with: path: | - xtls-plugin/src/main/jniLibs - key: ${{ hashFiles('bin/libs/xtls.sh', 'xtls_status') }} + plugin/xtls/src/main/jniLibs + key: ${{ hashFiles('bin/lib/xtls.sh', 'xtls_status') }} - name: Gradle cache uses: actions/cache@v2 with: @@ -51,7 +51,7 @@ jobs: go-version: 1.16 - name: Native Build if: steps.cache.outputs.cache-hit != 'true' - run: ./run libs xtls + run: ./run plugin xtls build: name: Gradle Build runs-on: ubuntu-latest @@ -61,13 +61,13 @@ jobs: - name: Checkout uses: actions/checkout@v2 - name: Fetch Status - run: git submodule status 'xtls-plugin/*' > xtls_status + run: git submodule status 'plugin/xtls/*' > xtls_status - name: XTLS Cache uses: actions/cache@v2 with: path: | - xtls-plugin/src/main/jniLibs - key: ${{ hashFiles('bin/libs/xtls.sh', 'xtls_status') }} + plugin/xtls/src/main/jniLibs + key: ${{ hashFiles('bin/lib/xtls.sh', 'xtls_status') }} - name: Gradle cache uses: actions/cache@v2 with: @@ -79,7 +79,7 @@ jobs: echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}" ./gradlew xtls-plugin:assembleRelease - APK=$(find xtls-plugin/build/outputs/apk -name '*arm64-v8a*.apk') + APK=$(find plugin/xtls/build/outputs/apk -name '*arm64-v8a*.apk') APK=$(dirname $APK) echo "APK=$APK" >> $GITHUB_ENV - uses: actions/upload-artifact@v2 @@ -144,13 +144,13 @@ jobs: # - name: Checkout # uses: actions/checkout@v2 # - name: Fetch Status -# run: git submodule status 'xtls-plugin/*' > xtls_status +# run: git submodule status 'plugin/xtls/*' > xtls_status # - name: XTLS Cache # uses: actions/cache@v2 # with: # path: | -# xtls-plugin/src/main/jniLibs -# key: ${{ hashFiles('bin/libs/xtls.sh', 'xtls_status') }} +# plugin/xtls/src/main/jniLibs +# key: ${{ hashFiles('bin/lib/xtls.sh', 'xtls_status') }} # - name: Release Build # run: | # echo "sdk.dir=${ANDROID_HOME}" > local.properties diff --git a/.gitmodules b/.gitmodules index 1a67c257..ecf1283b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,48 +1,48 @@ -[submodule "core/src/main/jni/badvpn"] - path = core/src/main/jni/badvpn +[submodule "library/core/src/main/jni/badvpn"] + path = library/core/src/main/jni/badvpn url = https://github.com/shadowsocks/badvpn -[submodule "core/src/main/jni/libancillary"] - path = core/src/main/jni/libancillary +[submodule "library/core/src/main/jni/libancillary"] + path = library/core/src/main/jni/libancillary url = https://github.com/shadowsocks/libancillary -[submodule "v2ray"] - path = v2ray +[submodule "library/v2ray"] + path = library/v2ray url = https://github.com/nekohasekai/AndroidLibV2rayLite -[submodule "shadowsocks/src/main/rust/shadowsocks-rust"] - path = shadowsocks/src/main/rust/shadowsocks-rust +[submodule "library/shadowsocks/src/main/rust/shadowsocks-rust"] + path = library/shadowsocks/src/main/rust/shadowsocks-rust url = https://github.com/shadowsocks/shadowsocks-rust.git -[submodule "shadowsocksr/src/main/jni/shadowsocks-libev"] - path = shadowsocksr/src/main/jni/shadowsocks-libev +[submodule "library/shadowsocksr/src/main/jni/shadowsocks-libev"] + path = library/shadowsocksr/src/main/jni/shadowsocks-libev url = https://github.com/shadowsocksRb/shadowsocksr-libev -[submodule "shadowsocksr/src/main/jni/mbedtls"] - path = shadowsocksr/src/main/jni/mbedtls +[submodule "library/shadowsocksr/src/main/jni/mbedtls"] + path = library/shadowsocksr/src/main/jni/mbedtls url = https://github.com/ARMmbed/mbedtls -[submodule "shadowsocksr/src/main/jni/libancillary"] - path = shadowsocksr/src/main/jni/libancillary +[submodule "library/shadowsocksr/src/main/jni/libancillary"] + path = library/shadowsocksr/src/main/jni/libancillary url = https://github.com/shadowsocks/libancillary -[submodule "shadowsocksr/src/main/jni/pcre"] - path = shadowsocksr/src/main/jni/pcre +[submodule "library/shadowsocksr/src/main/jni/pcre"] + path = library/shadowsocksr/src/main/jni/pcre url = https://android.googlesource.com/platform/external/pcre -[submodule "shadowsocksr/src/main/jni/libsodium"] - path = shadowsocksr/src/main/jni/libsodium +[submodule "library/shadowsocksr/src/main/jni/libsodium"] + path = library/shadowsocksr/src/main/jni/libsodium url = https://github.com/jedisct1/libsodium -[submodule "shadowsocksr/src/main/jni/re2"] - path = shadowsocksr/src/main/jni/re2 +[submodule "library/shadowsocksr/src/main/jni/re2"] + path = library/shadowsocksr/src/main/jni/re2 url = https://github.com/google/re2 -[submodule "xtls-plugin/src/main/go/Xray-core"] - path = xtls-plugin/src/main/go/Xray-core +[submodule "plugin/xtls/src/main/go/Xray-core"] + path = plugin/xtls/src/main/go/Xray-core url = https://github.com/XTLS/Xray-core -[submodule "trojan-go-plugin/src/main/go/trojan-go"] - path = trojan-go-plugin/src/main/go/trojan-go +[submodule "plugin/trojan-go/src/main/go/trojan-go"] + path = plugin/trojan-go/src/main/go/trojan-go url = https://github.com/p4gefau1t/trojan-go [submodule "core/src/main/jni/proxychains-ng"] - path = core/src/main/jni/proxychains + path = library/core/src/main/jni/proxychains url = https://github.com/SagerNet/proxychains-ng -[submodule "naive-plugin/src/main/jni/naiveproxy"] - path = naive-plugin/src/main/jni/naiveproxy +[submodule "plugin/naive/src/main/jni/naiveproxy"] + path = plugin/naive/src/main/jni/naiveproxy url = https://github.com/klzgrad/naiveproxy -[submodule "pt-plugin/src/main/go/pingtunnel"] - path = pt-plugin/src/main/go/pingtunnel +[submodule "plugin/pingtunnel/src/main/go/pingtunnel"] + path = plugin/pingtunnel/src/main/go/pingtunnel url = https://github.com/esrrhs/pingtunnel -[submodule "rb-plugin/src/main/go/relaybaton"] - path = rb-plugin/src/main/go/relaybaton +[submodule "plugin/relaybaton/src/main/go/relaybaton"] + path = plugin/relaybaton/src/main/go/relaybaton url = https://github.com/iyouport-org/relaybaton diff --git a/.idea/dictionaries/sekai.xml b/.idea/dictionaries/sekai.xml index 0e7c2a37..5c6f6030 100644 --- a/.idea/dictionaries/sekai.xml +++ b/.idea/dictionaries/sekai.xml @@ -8,6 +8,7 @@ dokodemo downlink fakedns + fdroid geoip geosite grpc diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 52397a8b..a33621db 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,7 +4,7 @@