From c7a4f817f2e6f96b164b81cd2febb2d22f8a9818 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Thu, 16 Dec 2021 15:31:13 +0100 Subject: [PATCH] Misc fixes after build cycle --- metadata/ca.snoe.deedum.yml | 11 ----------- metadata/com.farmerbb.taskbar.yml | 4 ++++ metadata/com.osfans.trime.yml | 1 + metadata/com.standardnotes.yml | 1 + metadata/de.baumann.browser.yml | 5 +---- metadata/de.chaosdorf.meteroid.yml | 1 + metadata/de.thecode.android.tazreader.yml | 2 ++ metadata/eu.faircode.email.yml | 18 +----------------- metadata/eu.sum7.conversations.yml | 2 ++ metadata/fr.gouv.android.stopcovid.yml | 2 ++ metadata/org.yausername.dvd.yml | 4 ++++ ...bletrainer.heinecke.aron.vocabletrainer.yml | 4 ++++ 12 files changed, 23 insertions(+), 32 deletions(-) diff --git a/metadata/ca.snoe.deedum.yml b/metadata/ca.snoe.deedum.yml index 8ffd255a50..8bdbd04552 100644 --- a/metadata/ca.snoe.deedum.yml +++ b/metadata/ca.snoe.deedum.yml @@ -22,17 +22,6 @@ Builds: - $$flutter$$/bin/flutter config --no-analytics - $$flutter$$/bin/flutter build apk - - versionName: 2021.1201.0405 - versionCode: 17 - commit: bd31c5ae6821b3b16b24c0b05d6388733abd7b2d - output: build/app/outputs/flutter-apk/app-release.apk - srclibs: - - flutter@1.22.5 - prebuild: echo "flutter.sdk=$$flutter$$" >> ../local.properties - build: - - $$flutter$$/bin/flutter config --no-analytics - - $$flutter$$/bin/flutter build apk - - versionName: 2021.1203.0440 versionCode: 18 commit: f803fbdf1cbeea30ca281db94cf82b1ab09ac256 diff --git a/metadata/com.farmerbb.taskbar.yml b/metadata/com.farmerbb.taskbar.yml index 162219337c..db466d7c74 100644 --- a/metadata/com.farmerbb.taskbar.yml +++ b/metadata/com.farmerbb.taskbar.yml @@ -523,6 +523,10 @@ Builds: versionCode: 204 commit: 4652f142731bae59cd9f23c3292a98ed7084a455 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - free diff --git a/metadata/com.osfans.trime.yml b/metadata/com.osfans.trime.yml index 3a6ab2d193..4267e88c14 100644 --- a/metadata/com.osfans.trime.yml +++ b/metadata/com.osfans.trime.yml @@ -117,6 +117,7 @@ Builds: - versionName: 3.2.4 versionCode: 20211130 + disable: https://github.com/osfans/trime/issues/634 commit: d35d85039dd632aaa3bb99915fd0c5c5fe41a833 subdir: app submodules: true diff --git a/metadata/com.standardnotes.yml b/metadata/com.standardnotes.yml index 9602f7b38a..6615550796 100644 --- a/metadata/com.standardnotes.yml +++ b/metadata/com.standardnotes.yml @@ -2047,6 +2047,7 @@ Builds: - versionName: 3.9.5 versionCode: 3000313 + disable: https://github.com/standardnotes/mobile/issues/516 commit: 3.9.5 subdir: android/app/ sudo: diff --git a/metadata/de.baumann.browser.yml b/metadata/de.baumann.browser.yml index 3905878965..aadd02466d 100644 --- a/metadata/de.baumann.browser.yml +++ b/metadata/de.baumann.browser.yml @@ -710,10 +710,7 @@ Builds: - update-alternatives --auto java gradle: - yes - prebuild: - - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' - } }" >> build.gradle - - sed -i -e '/jitpack.de/d' ../build.gradle + prebuild: sed -i -e '/jitpack.de/d' ../build.gradle AutoUpdateMode: Version v%v UpdateCheckMode: Tags diff --git a/metadata/de.chaosdorf.meteroid.yml b/metadata/de.chaosdorf.meteroid.yml index 0cb56c60a5..3814a68431 100644 --- a/metadata/de.chaosdorf.meteroid.yml +++ b/metadata/de.chaosdorf.meteroid.yml @@ -129,6 +129,7 @@ Builds: - versionName: 2.10.0 versionCode: 42 + disable: https://github.com/chaosdorf/meteroid/issues/26 commit: ef6a3f900f64fa42c0a3ab01b9a8de8b029c8c4d subdir: meteroid sudo: diff --git a/metadata/de.thecode.android.tazreader.yml b/metadata/de.thecode.android.tazreader.yml index 1ff55cfac0..2c05ef02b9 100644 --- a/metadata/de.thecode.android.tazreader.yml +++ b/metadata/de.thecode.android.tazreader.yml @@ -88,6 +88,8 @@ Builds: output: ./build/outputs/apk/taz/release/tazapp-taz-universal-release-unsigned.apk srclibs: - MuPDF@1.10-114-g9d96d035 + prebuild: echo -e '\n' 'org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError + -Dfile.encoding=UTF-8' >> ../gradle.properties build: - find $$MuPDF$$ -type f -name \*.[ch] | xargs perl -i -pe 's/com.artifex.mupdf(?!demo)/$&demo/g' - perl -i -pe 's,^/\* (#define TOFU(?:_CJK)?) .*,$1,' $$MuPDF$$/include/mupdf/fitz/config.h diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml index e644fda80b..26509b9af5 100644 --- a/metadata/eu.faircode.email.yml +++ b/metadata/eu.faircode.email.yml @@ -5588,22 +5588,6 @@ Builds: - app/lib ndk: r21e - - versionName: '1.1788' - versionCode: 1788 - commit: 4b43e5efc327b10dab9d2f1a2bbfc577de265e0c - subdir: app - submodules: true - sudo: - - apt-get update || apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java - gradle: - - fdroid - prebuild: sed -i -e '/keystoreProperties/d' -e '/in-app-purchasing/d' build.gradle - scandelete: - - app/lib - ndk: r21e - - versionName: '1.1789' versionCode: 1789 commit: 53e45a76e846dc17627373d8eab2e9490b1c0a1a @@ -5618,7 +5602,7 @@ Builds: prebuild: sed -i -e '/keystoreProperties/d' -e '/in-app-purchasing/d' build.gradle scandelete: - app/lib - ndk: r21e + ndk: r23b AutoUpdateMode: Version UpdateCheckMode: Tags diff --git a/metadata/eu.sum7.conversations.yml b/metadata/eu.sum7.conversations.yml index 0baba7fec6..b3c9d1c04a 100644 --- a/metadata/eu.sum7.conversations.yml +++ b/metadata/eu.sum7.conversations.yml @@ -617,6 +617,8 @@ Builds: - versionName: 2.10.2 versionCode: 420230100 + disable: method setLocalDescription in class PeerConnection cannot be applied + to given types commit: aa8b9f338f8b855d11853104690baf450b16af35 sudo: - apt-get update || apt-get update diff --git a/metadata/fr.gouv.android.stopcovid.yml b/metadata/fr.gouv.android.stopcovid.yml index 6580b9e255..3a49b16478 100644 --- a/metadata/fr.gouv.android.stopcovid.yml +++ b/metadata/fr.gouv.android.stopcovid.yml @@ -513,6 +513,7 @@ Builds: - versionName: 4.0.1 versionCode: 426 + disable: NullSafeMutableLiveData commit: ab2a78381647c4e1b29595b6956d8f75bf567fca subdir: stopcovid submodules: true @@ -532,6 +533,7 @@ Builds: - versionName: 4.0.1 versionCode: 428 + disable: NullSafeMutableLiveData commit: 544cbe275ae24c2c0c4fdce4a498013b43fb63bb subdir: stopcovid submodules: true diff --git a/metadata/org.yausername.dvd.yml b/metadata/org.yausername.dvd.yml index d9bb3329af..b33509a217 100644 --- a/metadata/org.yausername.dvd.yml +++ b/metadata/org.yausername.dvd.yml @@ -61,6 +61,7 @@ Builds: gradle: - yes prebuild: sed -i 's/ versionCode .*/ versionCode $$VERCODE$$/' build.gradle + ndk: r21 gradleprops: - noSplits - ABI_FILTERS=x86 @@ -72,6 +73,7 @@ Builds: gradle: - yes prebuild: sed -i 's/ versionCode .*/ versionCode $$VERCODE$$/' build.gradle + ndk: r21 gradleprops: - noSplits - ABI_FILTERS=x86_64 @@ -83,6 +85,7 @@ Builds: gradle: - yes prebuild: sed -i 's/ versionCode .*/ versionCode $$VERCODE$$/' build.gradle + ndk: r21 gradleprops: - noSplits - ABI_FILTERS=armeabi-v7a @@ -94,6 +97,7 @@ Builds: gradle: - yes prebuild: sed -i 's/ versionCode .*/ versionCode $$VERCODE$$/' build.gradle + ndk: r21 gradleprops: - noSplits - ABI_FILTERS=arm64-v8a diff --git a/metadata/vocabletrainer.heinecke.aron.vocabletrainer.yml b/metadata/vocabletrainer.heinecke.aron.vocabletrainer.yml index af5ee83f7c..b9c98dd241 100644 --- a/metadata/vocabletrainer.heinecke.aron.vocabletrainer.yml +++ b/metadata/vocabletrainer.heinecke.aron.vocabletrainer.yml @@ -173,6 +173,10 @@ Builds: versionCode: 23 commit: edcc2f5318c5ada970bf2b25461dd422cd0df8a6 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - yes