From a61fde709584a414004f8adba66dd1c46a0996c3 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Wed, 17 Mar 2021 16:09:02 +0000 Subject: [PATCH] Bump NDK versions of missing builds after build server rebuild --- metadata/com.mirfatif.permissionmanagerx.yml | 2 +- metadata/com.renard.ocr.yml | 3 +- metadata/com.tnibler.cryptocam.yml | 2 +- metadata/com.tutpro.baresip.plus.yml | 2 +- metadata/com.tutpro.baresip.yml | 2 +- metadata/de.corona.tracing.yml | 2 +- metadata/eu.faircode.email.yml | 2 +- metadata/eu.siacs.conversations.yml | 2 +- metadata/im.quicksy.client.yml | 2 +- metadata/io.treehouses.remote.yml | 2 +- metadata/me.thanel.dank.yml | 2 +- metadata/me.zhanghai.android.files.yml | 2 +- metadata/mobi.maptrek.yml | 2 +- metadata/nekox.messenger.yml | 44 +------------------- metadata/net.ivpn.client.yml | 2 +- metadata/org.blokada.fem.fdroid.yml | 2 +- metadata/org.telegram.messenger.yml | 8 ++-- metadata/st.wow.git.hrm.yml | 2 +- 18 files changed, 23 insertions(+), 62 deletions(-) diff --git a/metadata/com.mirfatif.permissionmanagerx.yml b/metadata/com.mirfatif.permissionmanagerx.yml index 01b42e4bbd..ac224739cb 100644 --- a/metadata/com.mirfatif.permissionmanagerx.yml +++ b/metadata/com.mirfatif.permissionmanagerx.yml @@ -27,7 +27,7 @@ Builds: - sed -i -e 's/priv_daemon-release/priv_daemon-release-unsigned/' build.gradle - sed -i -e 's/pref_settings_check_for_updates_default">true/pref_settings_check_for_updates_default">false/' src/main/res/values/preference_keys.xml - ndk: r21d + ndk: r21e AutoUpdateMode: Version %v UpdateCheckMode: Tags diff --git a/metadata/com.renard.ocr.yml b/metadata/com.renard.ocr.yml index 9d9ab891ca..7c6bae7c89 100644 --- a/metadata/com.renard.ocr.yml +++ b/metadata/com.renard.ocr.yml @@ -56,11 +56,12 @@ Builds: - sed -i 's/http:\/\/oss\.sonatype\.org\/content\/repositories\/snapshots/https:\/\/oss.sonatype.org\/content\/repositories\/snapshots\//' ../build.gradle - rm -rf ../test-images + - sed -i 's/21.3.6528147/21.4.7075529/' build.gradle scanignore: - tessdata scandelete: - . - ndk: r21d + ndk: r21e MaintainerNotes: |- F-Droid scanner complains about sonatype repo because it misses a / at the end. diff --git a/metadata/com.tnibler.cryptocam.yml b/metadata/com.tnibler.cryptocam.yml index ab04f8909f..bad51e917c 100644 --- a/metadata/com.tnibler.cryptocam.yml +++ b/metadata/com.tnibler.cryptocam.yml @@ -55,7 +55,7 @@ Builds: output: app/build/outputs/apk/release/app-release-unsigned.apk build: ANDROID_SDK_HOME=$$SDK$$ ANDROID_SDK_ROOT=$$SDK$$ ANDROID_NDK_HOME=$$NDK$$ ./complete_build.sh - ndk: r21d + ndk: r21e AutoUpdateMode: Version v%v UpdateCheckMode: Tags diff --git a/metadata/com.tutpro.baresip.plus.yml b/metadata/com.tutpro.baresip.plus.yml index 59e3db72c6..548df4ae65 100644 --- a/metadata/com.tutpro.baresip.plus.yml +++ b/metadata/com.tutpro.baresip.plus.yml @@ -529,7 +529,7 @@ Builds: - make download-sources - make install-all - popd - ndk: r21d + ndk: r21e MaintainerNotes: make download-sources checks out master branches of several libraries; this can cause build failures. diff --git a/metadata/com.tutpro.baresip.yml b/metadata/com.tutpro.baresip.yml index c18bcac834..5380b10e06 100644 --- a/metadata/com.tutpro.baresip.yml +++ b/metadata/com.tutpro.baresip.yml @@ -1650,7 +1650,7 @@ Builds: - make download-sources - make install-all - popd - ndk: r21d + ndk: r21e MaintainerNotes: make download-sources checks out master branches of several libraries; this can cause build failures. diff --git a/metadata/de.corona.tracing.yml b/metadata/de.corona.tracing.yml index 319f0a2f17..2dd739de34 100644 --- a/metadata/de.corona.tracing.yml +++ b/metadata/de.corona.tracing.yml @@ -148,7 +148,7 @@ Builds: - Corona-Warn-App/src/main/assets/default_app_config_android.bin scandelete: - protobuf/build - ndk: r21d + ndk: r21e MaintainerNotes: |- scanignored are some protobuf encoded config files, view them with: diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml index 7b622f1dd4..3c7dcebb32 100644 --- a/metadata/eu.faircode.email.yml +++ b/metadata/eu.faircode.email.yml @@ -3776,7 +3776,7 @@ Builds: gradle: - fdroid prebuild: sed -i -e '/keystoreProperties/d' build.gradle - ndk: r21d + ndk: r21e MaintainerNotes: Dynamic versionName and version code, so no autoupdates anymore. diff --git a/metadata/eu.siacs.conversations.yml b/metadata/eu.siacs.conversations.yml index 0aaa9b4b35..eaa3457155 100644 --- a/metadata/eu.siacs.conversations.yml +++ b/metadata/eu.siacs.conversations.yml @@ -1980,7 +1980,7 @@ Builds: prebuild: sed -i -e '/MissingTranslation/aabortOnError\ false' -e '/libwebrtc/d' -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.32006'" -e '/splits/,+5d' -e '/Variants.all/,+8d' build.gradle - ndk: r21d + ndk: r21e MaintainerNotes: |- For 2.8.0 we replace the webrtc.aar with the latest M79 from maven, but diff --git a/metadata/im.quicksy.client.yml b/metadata/im.quicksy.client.yml index aca405c0a0..0386be9877 100644 --- a/metadata/im.quicksy.client.yml +++ b/metadata/im.quicksy.client.yml @@ -478,7 +478,7 @@ Builds: prebuild: sed -i -e '/MissingTranslation/aabortOnError\ false' -e '/libwebrtc/d' -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.32006'" -e '/splits/,+5d' -e '/Variants.all/,+8d' build.gradle - ndk: r21d + ndk: r21e AutoUpdateMode: None UpdateCheckMode: None diff --git a/metadata/io.treehouses.remote.yml b/metadata/io.treehouses.remote.yml index e6abaae188..9590fc28e5 100644 --- a/metadata/io.treehouses.remote.yml +++ b/metadata/io.treehouses.remote.yml @@ -553,7 +553,7 @@ Builds: gradle: - yes output: app/build/outputs/apk/release/remote-$$VERSION$$.apk - ndk: r21d + ndk: r21e MaintainerNotes: The root build.gradle contains custom code that uses relative paths. Thus we cannot apply subdir. diff --git a/metadata/me.thanel.dank.yml b/metadata/me.thanel.dank.yml index 68ae11de42..94b2d40393 100644 --- a/metadata/me.thanel.dank.yml +++ b/metadata/me.thanel.dank.yml @@ -36,7 +36,7 @@ Builds: subdir: app gradle: - yes - ndk: r21d + ndk: r21e AutoUpdateMode: Version %v UpdateCheckMode: Tags diff --git a/metadata/me.zhanghai.android.files.yml b/metadata/me.zhanghai.android.files.yml index 7d1bbea8fd..9ecb3b8a68 100644 --- a/metadata/me.zhanghai.android.files.yml +++ b/metadata/me.zhanghai.android.files.yml @@ -110,7 +110,7 @@ Builds: rm: - app/src/main/java/me/zhanghai/android/files/nonfree prebuild: find -type f -exec sed -i '/\/\/#ifdef NONFREE/,/\/\/#endif/d' {} + - ndk: r21d + ndk: r22 AutoUpdateMode: Version v%v UpdateCheckMode: Tags ^v.+$ diff --git a/metadata/mobi.maptrek.yml b/metadata/mobi.maptrek.yml index a74de23a9e..46d10e7134 100644 --- a/metadata/mobi.maptrek.yml +++ b/metadata/mobi.maptrek.yml @@ -98,7 +98,7 @@ Builds: gradle: - full - world - ndk: r21d + ndk: r21e AutoUpdateMode: Version %v UpdateCheckMode: Tags diff --git a/metadata/nekox.messenger.yml b/metadata/nekox.messenger.yml index 9426bab93d..16c89e9df5 100644 --- a/metadata/nekox.messenger.yml +++ b/metadata/nekox.messenger.yml @@ -15,46 +15,6 @@ RepoType: git Repo: https://github.com/NekoX-Dev/NekoX Builds: - - versionName: 7.5.0-rc05 - versionCode: 211 - commit: v7.5.0-rc05 - timeout: 10800 - subdir: TMessagesProj - submodules: true - sudo: apt-get install -y ninja-build - gradle: - - fullFdroidArm - output: build/outputs/apk/full/*/*.apk - prebuild: - - pushd .. - - ./run fdroid prebuild - scandelete: - - TMessagesProj - build: - - pushd .. - - ./run fdroid build - ndk: r21d - - - versionName: 7.5.0-rc05 - versionCode: 212 - commit: v7.5.0-rc05 - timeout: 10800 - subdir: TMessagesProj - submodules: true - sudo: apt-get install -y ninja-build - gradle: - - fullFdroidArm64 - output: build/outputs/apk/full/*/*.apk - prebuild: - - pushd .. - - ./run fdroid prebuild - scandelete: - - TMessagesProj - build: - - pushd .. - - ./run fdroid build - ndk: r21d - - versionName: 7.5.0-rc10 versionCode: 226 commit: v7.5.0-rc10 @@ -73,7 +33,7 @@ Builds: build: - pushd .. - ./run fdroid build - ndk: r21d + ndk: r21e - versionName: 7.5.0-rc10 versionCode: 227 @@ -93,7 +53,7 @@ Builds: build: - pushd .. - ./run fdroid build - ndk: r21d + ndk: r21e ArchivePolicy: 6 versions AutoUpdateMode: None diff --git a/metadata/net.ivpn.client.yml b/metadata/net.ivpn.client.yml index 74cbc62b4d..ab057bded8 100644 --- a/metadata/net.ivpn.client.yml +++ b/metadata/net.ivpn.client.yml @@ -116,7 +116,7 @@ Builds: - rm -rf src/main/cpp/openvpn3/test gradle: - fdroidProduction - ndk: r21d + ndk: r21e AutoUpdateMode: Version v%v UpdateCheckMode: Tags diff --git a/metadata/org.blokada.fem.fdroid.yml b/metadata/org.blokada.fem.fdroid.yml index e5e2dbf444..ef64b4931f 100644 --- a/metadata/org.blokada.fem.fdroid.yml +++ b/metadata/org.blokada.fem.fdroid.yml @@ -217,7 +217,7 @@ Builds: - cd ./../.. - ./build.boringtun.sh - ./build.blocka.sh - ndk: r21d + ndk: r21e AutoUpdateMode: Version android-v%v UpdateCheckMode: Tags diff --git a/metadata/org.telegram.messenger.yml b/metadata/org.telegram.messenger.yml index 37694cddb4..b24d4554d6 100644 --- a/metadata/org.telegram.messenger.yml +++ b/metadata/org.telegram.messenger.yml @@ -1861,7 +1861,7 @@ Builds: - TMessagesProj/jni/ffmpeg/tests/ref/fate/sub-microdvd-remux prebuild: - echo -e 'APP_ID = 12834\nAPP_HASH = c84d9229db1d6be95c067b02b126352c' > API_KEYS - - sed -i -e 's/21.1.6352462/21.3.6528147/' build.gradle + - sed -i -e 's/21.1.6352462/21.4.7075529/' build.gradle scandelete: - TMessagesProj/jni build: @@ -1873,7 +1873,7 @@ Builds: - ./patch_boringssl.sh - ./build_boringssl.sh - popd - ndk: r21d + ndk: r21e - versionName: 7.5.0 versionCode: 22465 @@ -1889,7 +1889,7 @@ Builds: - TMessagesProj/jni/ffmpeg/tests/ref/fate/sub-microdvd-remux prebuild: - echo -e 'APP_ID = 12834\nAPP_HASH = c84d9229db1d6be95c067b02b126352c' > API_KEYS - - sed -i -e 's/21.1.6352462/21.3.6528147/' build.gradle + - sed -i -e 's/21.1.6352462/21.4.7075529/' build.gradle scandelete: - TMessagesProj/jni build: @@ -1901,7 +1901,7 @@ Builds: - ./patch_boringssl.sh - ./build_boringssl.sh - popd - ndk: r21d + ndk: r21e MaintainerNotes: |- Summary and Description have been moved to the new localizable text files: diff --git a/metadata/st.wow.git.hrm.yml b/metadata/st.wow.git.hrm.yml index 1dab0fcef2..9f45cca181 100644 --- a/metadata/st.wow.git.hrm.yml +++ b/metadata/st.wow.git.hrm.yml @@ -52,7 +52,7 @@ Builds: - popd - ANDROID_SDK_ROOT=$$SDK$$ ANDROID_NDK_ROOT=$$NDK$$ gogio -target android -version 3 -appid st.wow.git.hrm . - ndk: r21d + ndk: r21e AutoUpdateMode: None UpdateCheckMode: None