From da6e45bfbbf98ce9dec992073d395052735f51ce Mon Sep 17 00:00:00 2001 From: F-Droid checkupdates bot Date: Sat, 25 Jun 2022 05:13:28 +0000 Subject: [PATCH] Update Blokada 5 (ad blocker and privacy app) to 6.1.0 (601000000) --- metadata/org.blokada.fem.fdroid.yml | 42 +++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/metadata/org.blokada.fem.fdroid.yml b/metadata/org.blokada.fem.fdroid.yml index e619be602d..c5d1d6d414 100644 --- a/metadata/org.blokada.fem.fdroid.yml +++ b/metadata/org.blokada.fem.fdroid.yml @@ -501,7 +501,45 @@ Builds: - ./build.blocka.sh ndk: r24 + - versionName: 6.1.0 + versionCode: 601000000 + commit: ea81890c3a46fbadde8256bfddb6053ac9b80fab + subdir: android5/app + submodules: true + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java + gradle: + - droid + srclibs: + - rustup@1.24.3 + rm: + - android5/app/src/engine/jniLibs + - android5/app/src/libre/jniLibs + prebuild: + - unzip -P default_blocklist src/libre/assets/default_blocklist.zip default_blocklist + -d src/libre/assets + - rm src/libre/assets/default_blocklist.zip + - sed -i -e 's/24.0.7856742/24.0.8215888/' build.gradle + build: + - $$rustup$$/rustup-init.sh -y + - source $HOME/.cargo/env + - rustup default 1.61.0 + - rustup target add armv7-linux-androideabi + - rustup target add aarch64-linux-android + - cargo install cargo-ndk --version 1.0.0 + - cd ../.. + - curl -Lo ndk.zip https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip + - echo "ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e ndk.zip" + | sha256sum -c - + - unzip -q ndk.zip + - export ANDROID_NDK=$(pwd)/android-ndk-r21e + - ./build.boringtun.sh + - ./build.blocka.sh + ndk: r24 + AutoUpdateMode: Version android-v%v UpdateCheckMode: Tags ^android-v[0-9.]+$ -CurrentVersion: 6.0.3 -CurrentVersionCode: 600000300 +CurrentVersion: 6.1.0 +CurrentVersionCode: 601000000