diff --git a/metadata/pan.alexander.tordnscrypt.stable.yml b/metadata/pan.alexander.tordnscrypt.stable.yml index 876acfba97..3e70f1d772 100644 --- a/metadata/pan.alexander.tordnscrypt.stable.yml +++ b/metadata/pan.alexander.tordnscrypt.stable.yml @@ -575,6 +575,84 @@ Builds: - popd ndk: 23.0.7599858 + - versionName: 6.6.0 + versionCode: 21702 + commit: adbf499ae7a9b22694ecac761d986980a73c18ce + subdir: tordnscrypt + submodules: true + sudo: + - apt-get update + - apt-get install -y autogen automake autopoint g++ libc-dev make gettext libtool + pkg-config rename shtool bzip2 + - apt-get install -t bullseye-backports -y golang-go + init: + - sed -i -e "s/ndkVersion .*/ndkVersion '23.0.7599858'/" build.gradle + - libs/prebuild + - cd libs/dnscrypt-proxy + - git checkout 0da41e80d0275743a24b2618ed1bbab031c5551e + gradle: + - fdroid + - armv7a + srclibs: + - go@go1.21.3 + rm: + - PurpleI2PBuildScript/external/libs/openssl/fuzz/corpora + - TorBuildScript/external/openssl/fuzz/corpora + prebuild: sdkmanager 'ndk;21.4.7075529' 'cmake;3.18.1' + scandelete: + - tordnscrypt/libs + - TorBuildScript/external + build: + - pushd $$go$$/src + - ./make.bash + - popd + - export PATH=$$go$$/bin:$PATH + - NDK="$$SDK$$/ndk/21.4.7075529" libs/build + - pushd libs + - mv Nflog-android conjure dnscrypt-proxy libzmq lyrebird snowflake webtunnel + ~ + - popd + ndk: 23.0.7599858 + + - versionName: 6.6.0 + versionCode: 21703 + commit: adbf499ae7a9b22694ecac761d986980a73c18ce + subdir: tordnscrypt + submodules: true + sudo: + - apt-get update + - apt-get install -y autogen automake autopoint g++ libc-dev make gettext libtool + pkg-config rename shtool bzip2 + - apt-get install -t bullseye-backports -y golang-go + init: + - sed -i -e "s/ndkVersion .*/ndkVersion '23.0.7599858'/" build.gradle + - libs/prebuild + - cd libs/dnscrypt-proxy + - git checkout 0da41e80d0275743a24b2618ed1bbab031c5551e + gradle: + - fdroid + - arm64 + srclibs: + - go@go1.21.3 + rm: + - PurpleI2PBuildScript/external/libs/openssl/fuzz/corpora + - TorBuildScript/external/openssl/fuzz/corpora + prebuild: sdkmanager 'ndk;21.4.7075529' 'cmake;3.18.1' + scandelete: + - tordnscrypt/libs + - TorBuildScript/external + build: + - pushd $$go$$/src + - ./make.bash + - popd + - export PATH=$$go$$/bin:$PATH + - NDK="$$SDK$$/ndk/21.4.7075529" libs/build arm64 + - pushd libs + - mv Nflog-android conjure dnscrypt-proxy libzmq lyrebird snowflake webtunnel + ~ + - popd + ndk: 23.0.7599858 + MaintainerNotes: We move the source libs folders out of the way else gradle tries to use those files and errors out "libc++_shared.so is not an ABI" @@ -584,5 +662,5 @@ VercodeOperation: - 100 * %c + 2 - 100 * %c + 3 UpdateCheckData: tordnscrypt/build.gradle|versionCode\s(\d+)|.|versionName\s"([\d.]+)" -CurrentVersion: 6.5.0 -CurrentVersionCode: 20803 +CurrentVersion: 6.6.0 +CurrentVersionCode: 21703