From 11dabb532040ffa69cf67eb886080282727256c7 Mon Sep 17 00:00:00 2001 From: baranovr605 Date: Wed, 19 Nov 2025 04:14:58 +0300 Subject: [PATCH 01/10] New App: com.dobby.vpn --- metadata/com.dobby.vpn.yml | 74 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 metadata/com.dobby.vpn.yml diff --git a/metadata/com.dobby.vpn.yml b/metadata/com.dobby.vpn.yml new file mode 100644 index 00000000000..b1edabd0ab1 --- /dev/null +++ b/metadata/com.dobby.vpn.yml @@ -0,0 +1,74 @@ +Categories: + - Internet + - VPN & Proxy +License: Apache-2.0 +SourceCode: https://github.com/DobbyVPN/DobbyVPN +Changelog: https://github.com/DobbyVPN/DobbyVPN/releases + +AutoName: DobbyVPN + +RepoType: git +Repo: https://github.com/DobbyVPN/DobbyVPN +Binaries: https://github.com/DobbyVPN/DobbyVPN/releases/download/v%v/DobbyVPN-v%v-sign.apk + +Builds: + - versionName: 1.0.6 + versionCode: 106 + commit: a38e14293b0047bb23ff0cabc7add923f9439928 + subdir: kmp_client/app + submodules: true + sudo: + - apt-get update + - apt-get install -t bookworm-backports -y golang-go + gradle: + - yes + srclibs: + - go@go1.24.3 + rm: + - kmp_client/iosApp + - kmp_client/tap-device + scandelete: + - kmp_client/outline/src/main/jniLibs + build: + - pushd $$go$$/src + - ./make.bash + - popd + - export GOPATH=$$go$$ + - export PATH="$GOPATH/bin:$PATH" + - cd ../.. + - mkdir -p go_client/modules/Cloak + - cp -r Cloak/internal go_client/modules/Cloak/ + - pushd go_client + - go get -u github.com/refraction-networking/utls@latest + - go mod tidy + - go mod download + - sdkmanager "platforms;android-36" "build-tools;36.0.0" "ndk;27.0.11718014" + - export PATH="$$SDK$$/ndk/27.0.11718014/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH" + - export CC=aarch64-linux-android21-clang + - export CXX=aarch64-linux-android21-clang++ + - export CGO_ENABLED=1 + - export GOOS=android + - export GOARCH=arm64 + - go build -v -buildmode=c-shared -o liboutline.so ./kotlin_exports/... + - popd + - mkdir -p kmp_client/outline/src/main/cpp/include + - mkdir -p kmp_client/outline/src/main/jniLibs/arm64-v8a + - cp go_client/liboutline.h kmp_client/outline/src/main/cpp/include/liboutline.h + - cp go_client/liboutline.so kmp_client/outline/src/main/jniLibs/arm64-v8a/liboutline.so + - cd kmp_client + - sed -i -e "s/^versionCode=.*/versionCode=$$VERCODE$$/" -e "s/^versionName=.*/versionName=$$VERSION$$/" + gradle.properties + - export COMMIT=$(git rev-parse HEAD) + - echo -e "\nprojectRepositoryCommit=$COMMIT\nprojectRepositoryCommitLink=https://github.com/DobbyVPN/DobbyVPN/tree/$COMMIT" + >> gradle.properties + preassemble: + - :outline:build + - :outline:copyOutlineAar + +AllowedAPKSigningKeys: c3f0414a74012060d7c6aa3a3d9dac0aa13c1bd23b7512eefd860fb865e67933 + +AutoUpdateMode: Version v%v +UpdateCheckMode: HTTP +UpdateCheckData: https://github.com/DobbyVPN/DobbyVPN/releases/latest/download/version.txt|versionCode=(\d+)|.|versionName=([\d.]+)\..+ +CurrentVersion: 1.0.6 +CurrentVersionCode: 106 -- GitLab From a88ad7ec87546cdfae6c8d2f64c8564988fe585f Mon Sep 17 00:00:00 2001 From: baranovr605 Date: Tue, 2 Dec 2025 01:49:22 +0300 Subject: [PATCH 02/10] Fix golang build --- metadata/com.dobby.vpn.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/metadata/com.dobby.vpn.yml b/metadata/com.dobby.vpn.yml index b1edabd0ab1..a1c2fe2efee 100644 --- a/metadata/com.dobby.vpn.yml +++ b/metadata/com.dobby.vpn.yml @@ -4,17 +4,15 @@ Categories: License: Apache-2.0 SourceCode: https://github.com/DobbyVPN/DobbyVPN Changelog: https://github.com/DobbyVPN/DobbyVPN/releases - AutoName: DobbyVPN - RepoType: git Repo: https://github.com/DobbyVPN/DobbyVPN Binaries: https://github.com/DobbyVPN/DobbyVPN/releases/download/v%v/DobbyVPN-v%v-sign.apk Builds: - - versionName: 1.0.6 - versionCode: 106 - commit: a38e14293b0047bb23ff0cabc7add923f9439928 + - versionName: 1.0.10 + versionCode: 110 + commit: 618e212971781bb8a56e27adc7a49ae19db974ad subdir: kmp_client/app submodules: true sudo: @@ -39,28 +37,30 @@ Builds: - mkdir -p go_client/modules/Cloak - cp -r Cloak/internal go_client/modules/Cloak/ - pushd go_client - - go get -u github.com/refraction-networking/utls@latest - go mod tidy - go mod download - sdkmanager "platforms;android-36" "build-tools;36.0.0" "ndk;27.0.11718014" - - export PATH="$$SDK$$/ndk/27.0.11718014/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH" + - export ANDROID_SDK_ROOT="$$SDK$$" + - export ANDROID_NDK_HOME="$$SDK$$/ndk/27.0.11718014" + - export PATH="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH" + - export DEBUG_PREFIX_FLAGS="-fdebug-prefix-map=$ANDROID_SDK_ROOT=/android-sdk -fdebug-prefix-map=$ANDROID_NDK_HOME=/android-ndk" - export CC=aarch64-linux-android21-clang - export CXX=aarch64-linux-android21-clang++ - export CGO_ENABLED=1 - export GOOS=android - export GOARCH=arm64 - - go build -v -buildmode=c-shared -o liboutline.so ./kotlin_exports/... + - export CGO_CFLAGS="$DEBUG_PREFIX_FLAGS ${CGO_CFLAGS:-}" + - export CGO_LDFLAGS="$DEBUG_PREFIX_FLAGS ${CGO_LDFLAGS:-}" + - go build -v -trimpath -ldflags="-buildid=" -buildvcs=false -buildmode=c-shared -o liboutline.so ./kotlin_exports/... - popd - mkdir -p kmp_client/outline/src/main/cpp/include - mkdir -p kmp_client/outline/src/main/jniLibs/arm64-v8a - cp go_client/liboutline.h kmp_client/outline/src/main/cpp/include/liboutline.h - cp go_client/liboutline.so kmp_client/outline/src/main/jniLibs/arm64-v8a/liboutline.so - cd kmp_client - - sed -i -e "s/^versionCode=.*/versionCode=$$VERCODE$$/" -e "s/^versionName=.*/versionName=$$VERSION$$/" - gradle.properties + - sed -i -e "s/^versionCode=.*/versionCode=$$VERCODE$$/" -e "s/^versionName=.*/versionName=$$VERSION$$/" gradle.properties - export COMMIT=$(git rev-parse HEAD) - - echo -e "\nprojectRepositoryCommit=$COMMIT\nprojectRepositoryCommitLink=https://github.com/DobbyVPN/DobbyVPN/tree/$COMMIT" - >> gradle.properties + - printf "\nprojectRepositoryCommit=$COMMIT\nprojectRepositoryCommitLink=https://github.com/DobbyVPN/DobbyVPN/tree/$COMMIT\n" >> gradle.properties preassemble: - :outline:build - :outline:copyOutlineAar @@ -70,5 +70,5 @@ AllowedAPKSigningKeys: c3f0414a74012060d7c6aa3a3d9dac0aa13c1bd23b7512eefd860fb86 AutoUpdateMode: Version v%v UpdateCheckMode: HTTP UpdateCheckData: https://github.com/DobbyVPN/DobbyVPN/releases/latest/download/version.txt|versionCode=(\d+)|.|versionName=([\d.]+)\..+ -CurrentVersion: 1.0.6 -CurrentVersionCode: 106 +CurrentVersion: 1.0.10 +CurrentVersionCode: 110 -- GitLab From 65e4282e983841a4c44658b33c0de43c41db1b54 Mon Sep 17 00:00:00 2001 From: baranovr605 Date: Tue, 2 Dec 2025 01:50:41 +0300 Subject: [PATCH 03/10] Some fix for lint --- metadata/com.dobby.vpn.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/metadata/com.dobby.vpn.yml b/metadata/com.dobby.vpn.yml index a1c2fe2efee..e984cd0d935 100644 --- a/metadata/com.dobby.vpn.yml +++ b/metadata/com.dobby.vpn.yml @@ -4,14 +4,16 @@ Categories: License: Apache-2.0 SourceCode: https://github.com/DobbyVPN/DobbyVPN Changelog: https://github.com/DobbyVPN/DobbyVPN/releases + AutoName: DobbyVPN + RepoType: git Repo: https://github.com/DobbyVPN/DobbyVPN Binaries: https://github.com/DobbyVPN/DobbyVPN/releases/download/v%v/DobbyVPN-v%v-sign.apk Builds: - versionName: 1.0.10 - versionCode: 110 + versionCode: 1010 commit: 618e212971781bb8a56e27adc7a49ae19db974ad subdir: kmp_client/app submodules: true @@ -43,7 +45,8 @@ Builds: - export ANDROID_SDK_ROOT="$$SDK$$" - export ANDROID_NDK_HOME="$$SDK$$/ndk/27.0.11718014" - export PATH="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH" - - export DEBUG_PREFIX_FLAGS="-fdebug-prefix-map=$ANDROID_SDK_ROOT=/android-sdk -fdebug-prefix-map=$ANDROID_NDK_HOME=/android-ndk" + - export DEBUG_PREFIX_FLAGS="-fdebug-prefix-map=$ANDROID_SDK_ROOT=/android-sdk + -fdebug-prefix-map=$ANDROID_NDK_HOME=/android-ndk" - export CC=aarch64-linux-android21-clang - export CXX=aarch64-linux-android21-clang++ - export CGO_ENABLED=1 @@ -51,16 +54,19 @@ Builds: - export GOARCH=arm64 - export CGO_CFLAGS="$DEBUG_PREFIX_FLAGS ${CGO_CFLAGS:-}" - export CGO_LDFLAGS="$DEBUG_PREFIX_FLAGS ${CGO_LDFLAGS:-}" - - go build -v -trimpath -ldflags="-buildid=" -buildvcs=false -buildmode=c-shared -o liboutline.so ./kotlin_exports/... + - go build -v -trimpath -ldflags="-buildid=" -buildvcs=false -buildmode=c-shared + -o liboutline.so ./kotlin_exports/... - popd - mkdir -p kmp_client/outline/src/main/cpp/include - mkdir -p kmp_client/outline/src/main/jniLibs/arm64-v8a - cp go_client/liboutline.h kmp_client/outline/src/main/cpp/include/liboutline.h - cp go_client/liboutline.so kmp_client/outline/src/main/jniLibs/arm64-v8a/liboutline.so - cd kmp_client - - sed -i -e "s/^versionCode=.*/versionCode=$$VERCODE$$/" -e "s/^versionName=.*/versionName=$$VERSION$$/" gradle.properties + - sed -i -e "s/^versionCode=.*/versionCode=$$VERCODE$$/" -e "s/^versionName=.*/versionName=$$VERSION$$/" + gradle.properties - export COMMIT=$(git rev-parse HEAD) - - printf "\nprojectRepositoryCommit=$COMMIT\nprojectRepositoryCommitLink=https://github.com/DobbyVPN/DobbyVPN/tree/$COMMIT\n" >> gradle.properties + - printf "\nprojectRepositoryCommit=$COMMIT\nprojectRepositoryCommitLink=https://github.com/DobbyVPN/DobbyVPN/tree/$COMMIT\n" + >> gradle.properties preassemble: - :outline:build - :outline:copyOutlineAar @@ -71,4 +77,4 @@ AutoUpdateMode: Version v%v UpdateCheckMode: HTTP UpdateCheckData: https://github.com/DobbyVPN/DobbyVPN/releases/latest/download/version.txt|versionCode=(\d+)|.|versionName=([\d.]+)\..+ CurrentVersion: 1.0.10 -CurrentVersionCode: 110 +CurrentVersionCode: 1010 -- GitLab From 623c70121319c3575f59d1998ffd7c6096e8ada3 Mon Sep 17 00:00:00 2001 From: baranovr605 Date: Thu, 4 Dec 2025 02:23:36 +0300 Subject: [PATCH 04/10] Fix libwg, jni libs build --- metadata/com.dobby.vpn.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/metadata/com.dobby.vpn.yml b/metadata/com.dobby.vpn.yml index e984cd0d935..35cf95ec643 100644 --- a/metadata/com.dobby.vpn.yml +++ b/metadata/com.dobby.vpn.yml @@ -12,9 +12,9 @@ Repo: https://github.com/DobbyVPN/DobbyVPN Binaries: https://github.com/DobbyVPN/DobbyVPN/releases/download/v%v/DobbyVPN-v%v-sign.apk Builds: - - versionName: 1.0.10 - versionCode: 1010 - commit: 618e212971781bb8a56e27adc7a49ae19db974ad + - versionName: 1.0.11 + versionCode: 1000011 + commit: 3661ae9f581fba03a3f2d7b851324bb6e4bbb3a5 subdir: kmp_client/app submodules: true sudo: @@ -33,8 +33,9 @@ Builds: - pushd $$go$$/src - ./make.bash - popd - - export GOPATH=$$go$$ - - export PATH="$GOPATH/bin:$PATH" + - export GOROOT=$$go$$ + - export GOPATH="$HOME/go" + - export PATH="$GOROOT/bin:$GOPATH/bin:$PATH" - cd ../.. - mkdir -p go_client/modules/Cloak - cp -r Cloak/internal go_client/modules/Cloak/ @@ -67,6 +68,7 @@ Builds: - export COMMIT=$(git rev-parse HEAD) - printf "\nprojectRepositoryCommit=$COMMIT\nprojectRepositoryCommitLink=https://github.com/DobbyVPN/DobbyVPN/tree/$COMMIT\n" >> gradle.properties + - printf "\ngoBinaryPath=$$go$$/bin/go\n" >> gradle.properties preassemble: - :outline:build - :outline:copyOutlineAar @@ -76,5 +78,5 @@ AllowedAPKSigningKeys: c3f0414a74012060d7c6aa3a3d9dac0aa13c1bd23b7512eefd860fb86 AutoUpdateMode: Version v%v UpdateCheckMode: HTTP UpdateCheckData: https://github.com/DobbyVPN/DobbyVPN/releases/latest/download/version.txt|versionCode=(\d+)|.|versionName=([\d.]+)\..+ -CurrentVersion: 1.0.10 -CurrentVersionCode: 1010 +CurrentVersion: 1.0.11 +CurrentVersionCode: 1000011 -- GitLab From 2f0dc04651a718e4f55d7bd744d09739090e1f4e Mon Sep 17 00:00:00 2001 From: baranovr605 Date: Thu, 4 Dec 2025 02:37:07 +0300 Subject: [PATCH 05/10] Fix commit --- metadata/com.dobby.vpn.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/com.dobby.vpn.yml b/metadata/com.dobby.vpn.yml index 35cf95ec643..ee828b2400d 100644 --- a/metadata/com.dobby.vpn.yml +++ b/metadata/com.dobby.vpn.yml @@ -14,7 +14,7 @@ Binaries: https://github.com/DobbyVPN/DobbyVPN/releases/download/v%v/DobbyVPN-v% Builds: - versionName: 1.0.11 versionCode: 1000011 - commit: 3661ae9f581fba03a3f2d7b851324bb6e4bbb3a5 + commit: 210b9e0d19fae22b3c73dfc1565973b1add4b03a subdir: kmp_client/app submodules: true sudo: -- GitLab From 3d991214411d45d3ba34aa26c1a44b9c9d1372d9 Mon Sep 17 00:00:00 2001 From: baranovr605 Date: Thu, 4 Dec 2025 04:01:11 +0300 Subject: [PATCH 06/10] Fix commit --- metadata/com.dobby.vpn.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/metadata/com.dobby.vpn.yml b/metadata/com.dobby.vpn.yml index ee828b2400d..b34e7a7a605 100644 --- a/metadata/com.dobby.vpn.yml +++ b/metadata/com.dobby.vpn.yml @@ -12,9 +12,9 @@ Repo: https://github.com/DobbyVPN/DobbyVPN Binaries: https://github.com/DobbyVPN/DobbyVPN/releases/download/v%v/DobbyVPN-v%v-sign.apk Builds: - - versionName: 1.0.11 - versionCode: 1000011 - commit: 210b9e0d19fae22b3c73dfc1565973b1add4b03a + - versionName: 1.0.12 + versionCode: 1000012 + commit: 605d66b6376892680dfc6ed8eb3f1e3dc782f847 subdir: kmp_client/app submodules: true sudo: @@ -78,5 +78,5 @@ AllowedAPKSigningKeys: c3f0414a74012060d7c6aa3a3d9dac0aa13c1bd23b7512eefd860fb86 AutoUpdateMode: Version v%v UpdateCheckMode: HTTP UpdateCheckData: https://github.com/DobbyVPN/DobbyVPN/releases/latest/download/version.txt|versionCode=(\d+)|.|versionName=([\d.]+)\..+ -CurrentVersion: 1.0.11 -CurrentVersionCode: 1000011 +CurrentVersion: 1.0.12 +CurrentVersionCode: 1000012 -- GitLab From f97776db7020e4008e38d49291605ae21af52f4f Mon Sep 17 00:00:00 2001 From: baranovr605 Date: Thu, 11 Dec 2025 03:24:30 +0300 Subject: [PATCH 07/10] Update desc, lib builds --- metadata/com.dobby.vpn.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/metadata/com.dobby.vpn.yml b/metadata/com.dobby.vpn.yml index b34e7a7a605..6978d096772 100644 --- a/metadata/com.dobby.vpn.yml +++ b/metadata/com.dobby.vpn.yml @@ -12,9 +12,9 @@ Repo: https://github.com/DobbyVPN/DobbyVPN Binaries: https://github.com/DobbyVPN/DobbyVPN/releases/download/v%v/DobbyVPN-v%v-sign.apk Builds: - - versionName: 1.0.12 - versionCode: 1000012 - commit: 605d66b6376892680dfc6ed8eb3f1e3dc782f847 + - versionName: 1.0.14 + versionCode: 1000014 + commit: 60df66fc6d0a9de290f8c89d8313092261d11475 subdir: kmp_client/app submodules: true sudo: @@ -78,5 +78,5 @@ AllowedAPKSigningKeys: c3f0414a74012060d7c6aa3a3d9dac0aa13c1bd23b7512eefd860fb86 AutoUpdateMode: Version v%v UpdateCheckMode: HTTP UpdateCheckData: https://github.com/DobbyVPN/DobbyVPN/releases/latest/download/version.txt|versionCode=(\d+)|.|versionName=([\d.]+)\..+ -CurrentVersion: 1.0.12 -CurrentVersionCode: 1000012 +CurrentVersion: 1.0.14 +CurrentVersionCode: 1000014 -- GitLab From 601768e301fdf91234120c7b867bf5d354abee1c Mon Sep 17 00:00:00 2001 From: baranovr605 Date: Thu, 11 Dec 2025 03:34:13 +0300 Subject: [PATCH 08/10] Fix scandelete --- metadata/com.dobby.vpn.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/metadata/com.dobby.vpn.yml b/metadata/com.dobby.vpn.yml index 6978d096772..d86fd478983 100644 --- a/metadata/com.dobby.vpn.yml +++ b/metadata/com.dobby.vpn.yml @@ -27,8 +27,6 @@ Builds: rm: - kmp_client/iosApp - kmp_client/tap-device - scandelete: - - kmp_client/outline/src/main/jniLibs build: - pushd $$go$$/src - ./make.bash -- GitLab From d589a837567352cd9fbba38c5372b8d16699b3a5 Mon Sep 17 00:00:00 2001 From: baranovr605 Date: Thu, 11 Dec 2025 03:48:51 +0300 Subject: [PATCH 09/10] Some fix --- metadata/com.dobby.vpn.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/metadata/com.dobby.vpn.yml b/metadata/com.dobby.vpn.yml index d86fd478983..e3594a75ecc 100644 --- a/metadata/com.dobby.vpn.yml +++ b/metadata/com.dobby.vpn.yml @@ -58,6 +58,8 @@ Builds: - popd - mkdir -p kmp_client/outline/src/main/cpp/include - mkdir -p kmp_client/outline/src/main/jniLibs/arm64-v8a + - mkdir -p kmp_client/outline/src/main/cpp/include/arm64-v8a + - cp go_client/liboutline.h kmp_client/outline/src/main/cpp/include/arm64-v8a/liboutline.h - cp go_client/liboutline.h kmp_client/outline/src/main/cpp/include/liboutline.h - cp go_client/liboutline.so kmp_client/outline/src/main/jniLibs/arm64-v8a/liboutline.so - cd kmp_client -- GitLab From 0345fc1621433dc504e3a2ffd449c47d60246fab Mon Sep 17 00:00:00 2001 From: linsui <2873532-linsui@users.noreply.gitlab.com> Date: Sat, 13 Dec 2025 07:39:25 +0000 Subject: [PATCH 10/10] Apply 1 suggestion(s) to 1 file(s) --- metadata/com.dobby.vpn.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/metadata/com.dobby.vpn.yml b/metadata/com.dobby.vpn.yml index e3594a75ecc..6e18ca04300 100644 --- a/metadata/com.dobby.vpn.yml +++ b/metadata/com.dobby.vpn.yml @@ -1,3 +1,6 @@ +AntiFeatures: + TetheredNet: + en-US: Rely on api.ipify.org Categories: - Internet - VPN & Proxy -- GitLab