From a9d8d9ac6854e5421c8e4ea2b5231795d04c5c9c Mon Sep 17 00:00:00 2001 From: linsui Date: Sun, 9 Jan 2022 00:54:27 +0800 Subject: [PATCH] misc fixes --- metadata/com.emanuelef.remote_capture.yml | 9 +++------ metadata/com.menny.android.anysoftkeyboard.yml | 10 +++++++--- metadata/com.simplemobiletools.musicplayer.yml | 2 +- metadata/de.corona.tracing.yml | 1 + metadata/dev.linwood.butterfly.yml | 2 +- metadata/eu.pretix.pretixscan.droid.yml | 1 + metadata/org.hlwd.bible_multi_the_life.yml | 1 + 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/metadata/com.emanuelef.remote_capture.yml b/metadata/com.emanuelef.remote_capture.yml index 1642131034..94ce4b9177 100644 --- a/metadata/com.emanuelef.remote_capture.yml +++ b/metadata/com.emanuelef.remote_capture.yml @@ -307,12 +307,9 @@ Builds: - update-alternatives --auto java gradle: - yes - prebuild: - - sed -i -e '/3.18.1/d' -e 's/23.1.7779620/23.0.7599858/' build.gradle - - sed -i -e 's/3.18.1/3.10.2/' src/main/jni/CMakeLists.txt - scanignore: - - submodules/res/raw - ndk: r23 + prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager 'cmake;3.18.1' + > /dev/null + ndk: r23b MaintainerNotes: Ignored files are the DB-IP country lite db and the DB-IP ASN lite db licensed under CC-BY-4.0. diff --git a/metadata/com.menny.android.anysoftkeyboard.yml b/metadata/com.menny.android.anysoftkeyboard.yml index 5fefbfeed7..7976dafced 100644 --- a/metadata/com.menny.android.anysoftkeyboard.yml +++ b/metadata/com.menny.android.anysoftkeyboard.yml @@ -516,14 +516,18 @@ Builds: commit: 2f7fd6e13e9375047768320c4bf2509cb0736e15 sudo: - apt-get update || apt-get update - - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless + - apt-get install openjdk-11-jdk-headless - update-alternatives --auto java gradle: - yes output: outputs/apks/release/ime-app-7137.apk forceversion: true - prebuild: sed -i -e '/versionCode/d' -e '/versionName/aversionCode $$VERCODE$$' - build.gradle + prebuild: + - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager 'build-tools;31.0.0' + 'build-tools;30.0.3' 'platforms;android-31' > /dev/null + - cp $$SDK$$/build-tools/30.0.3/lib/dx.jar $$SDK$$/build-tools/31.0.0/lib/dx.jar + - cp $$SDK$$/build-tools/30.0.3/dx $$SDK$$/build-tools/31.0.0/dx + - sed -i -e '/versionCode/d' -e '/versionName/aversionCode $$VERCODE$$' build.gradle scanignore: - addons/languages/*/pack/dictionary/*.gz ndk: r23 diff --git a/metadata/com.simplemobiletools.musicplayer.yml b/metadata/com.simplemobiletools.musicplayer.yml index 11026dca28..992b7e82c9 100644 --- a/metadata/com.simplemobiletools.musicplayer.yml +++ b/metadata/com.simplemobiletools.musicplayer.yml @@ -628,7 +628,7 @@ Builds: - apt-get install -y openjdk-11-jdk-headless - update-alternatives --auto java gradle: - - yes + - fdroid prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle AutoUpdateMode: Version %v diff --git a/metadata/de.corona.tracing.yml b/metadata/de.corona.tracing.yml index 7722d72269..39220e1756 100644 --- a/metadata/de.corona.tracing.yml +++ b/metadata/de.corona.tracing.yml @@ -328,6 +328,7 @@ Builds: - versionName: 2.14.1.1 versionCode: 2140102 + disable: DOES NOT VERIFY commit: v2.14.1.1 subdir: Corona-Warn-App submodules: true diff --git a/metadata/dev.linwood.butterfly.yml b/metadata/dev.linwood.butterfly.yml index ed7a3c3b9a..9e2eb80c87 100644 --- a/metadata/dev.linwood.butterfly.yml +++ b/metadata/dev.linwood.butterfly.yml @@ -147,7 +147,7 @@ Builds: - update-alternatives --auto java output: build/app/outputs/flutter-apk/app-release.apk srclibs: - - flutter@2.8.0 + - flutter@2.8.1 rm: - app/ios - app/linux diff --git a/metadata/eu.pretix.pretixscan.droid.yml b/metadata/eu.pretix.pretixscan.droid.yml index 13a58af257..12f0bd3cbe 100644 --- a/metadata/eu.pretix.pretixscan.droid.yml +++ b/metadata/eu.pretix.pretixscan.droid.yml @@ -241,6 +241,7 @@ Builds: - versionName: 1.13.1 versionCode: 62 + disable: Could not determine java version from '11.0.6'. commit: f494ede91adb13535e93db0ac826295e8ce4eb61 subdir: pretixscan/app submodules: true diff --git a/metadata/org.hlwd.bible_multi_the_life.yml b/metadata/org.hlwd.bible_multi_the_life.yml index 0ddb0e36f5..7e7aafb123 100644 --- a/metadata/org.hlwd.bible_multi_the_life.yml +++ b/metadata/org.hlwd.bible_multi_the_life.yml @@ -238,6 +238,7 @@ Builds: - versionName: 1.17.0 versionCode: 20220102 + disable: https://gitlab.com/hotlittlewhitedog/BibleTheLife/-/issues/11 commit: c7478fcacf09c8dddc5e0f36f3f9e6f98a478021 output: build/app/outputs/flutter-apk/app-release.apk srclibs: