From b66e947dc5d63972c9d23f6be8f296d524162cd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Gonz=C3=A1lez?= Date: Thu, 14 Apr 2022 08:34:49 +0000 Subject: [PATCH] Update DuckDuckGo to 5.118.0 --- metadata/com.duckduckgo.mobile.android.yml | 36 ++++++++++++++++++++-- srclibs/marcosholgado_fladle.yml | 2 ++ 2 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 srclibs/marcosholgado_fladle.yml diff --git a/metadata/com.duckduckgo.mobile.android.yml b/metadata/com.duckduckgo.mobile.android.yml index 122a613eae..a4b07afce6 100644 --- a/metadata/com.duckduckgo.mobile.android.yml +++ b/metadata/com.duckduckgo.mobile.android.yml @@ -1255,9 +1255,39 @@ Builds: - build-cache/ ndk: r21 -MaintainerNotes: Cannot use AUM/UCM because version code and version name are dynamic. + - versionName: 5.118.0 + versionCode: 51180000 + commit: 5.118.0 + submodules: true + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java + gradle: + - fdroid + output: app/build/outputs/apk/fdroid/release/duckduckgo-$$VERSION$$-fdroid-release-unsigned.apk + srclibs: + - marcosholgado_fladle@87551515ca559fbfe4ba135957034428be97a74c + rm: + - app/src/play/res/raw/https_mobile_v2_bloom.bin + prebuild: sed -i -e '/installreferrer/d' statistics/build.gradle + scandelete: + - app/src/androidTest + - build-cache/ + - libs/ + build: + - pushd $$marcosholgado_fladle$$ + - gradle assembleRelease + - popd + - cp $$marcosholgado_fladle$$/fladle-plugin/build/libs/fladle-0.17.4-SNAPSHOT.jar + libs/ + ndk: r21 + +MaintainerNotes: |- + Cannot use AUM/UCM because version code and version name are dynamic. + Using a custom fladle build, see https://gitlab.com/fdroid/fdroiddata/-/merge_requests/10831#note_897065716 AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: 5.116.0 -CurrentVersionCode: 51160000 +CurrentVersion: 5.118.0 +CurrentVersionCode: 51180000 diff --git a/srclibs/marcosholgado_fladle.yml b/srclibs/marcosholgado_fladle.yml new file mode 100644 index 0000000000..a1d83d0218 --- /dev/null +++ b/srclibs/marcosholgado_fladle.yml @@ -0,0 +1,2 @@ +RepoType: git +Repo: https://github.com/marcosholgado/fladle.git