From dcc6bac57c50c844c675199bf0bf451627a925ab Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 8 Nov 2021 23:38:25 +0800 Subject: [PATCH] misc fixes --- metadata/com.apps.adrcotfas.goodtime.yml | 4 ++++ metadata/com.blacksquircle.ui.yml | 14 +++++------- metadata/com.enjoyingfoss.feeel.yml | 2 +- metadata/com.krawieck.lemmur.yml | 3 ++- metadata/com.manimarank.websitemonitor.yml | 4 ++++ metadata/com.osfans.trime.yml | 1 - metadata/com.shadow.blackhole.yml | 4 ++++ .../com.simplemobiletools.applauncher.yml | 4 ++++ metadata/com.tutpro.baresip.plus.yml | 22 ------------------- metadata/com.tutpro.baresip.yml | 21 ------------------ metadata/de.blau.android.yml | 2 -- metadata/fr.odrevet.bide_et_musique.yml | 2 +- metadata/org.atalk.android.yml | 1 + ....ghostsinthelab.apps.guilelessbopomofo.yml | 3 ++- 14 files changed, 28 insertions(+), 59 deletions(-) diff --git a/metadata/com.apps.adrcotfas.goodtime.yml b/metadata/com.apps.adrcotfas.goodtime.yml index 8c8b544067..8a09235b17 100644 --- a/metadata/com.apps.adrcotfas.goodtime.yml +++ b/metadata/com.apps.adrcotfas.goodtime.yml @@ -232,6 +232,10 @@ Builds: versionCode: 137 commit: 708d8c05b819a40267e95a7ff42ada0ac94896bb subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - fdroid diff --git a/metadata/com.blacksquircle.ui.yml b/metadata/com.blacksquircle.ui.yml index 1cb67abe15..a80611ec22 100644 --- a/metadata/com.blacksquircle.ui.yml +++ b/metadata/com.blacksquircle.ui.yml @@ -33,16 +33,12 @@ Builds: versionCode: 10007 commit: cfeb4a21b82621cfed4003cc6d33b567c95d1807 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - - yes - rm: - - gradle/publish.gradle - - app/src/main/kotlin/com/blacksquircle/ui/utils/inappupdate/InAppUpdateImpl.kt - prebuild: - - sed -i -e '/publish.gradle/d' ../editorkit/build.gradle ../languages/language-*/build.gradle - - sed -i -e '/playcore/d' build.gradle ../gradle/versions.gradle - - sed -i -e 's/InAppUpdateImpl(context)/InAppUpdateStub()/' -e '/InAppUpdateImpl/d' - src/main/kotlin/com/blacksquircle/ui/internal/di/AppModule.kt + - fdroid MaintainerNotes: |- App repo contains both android app and diff --git a/metadata/com.enjoyingfoss.feeel.yml b/metadata/com.enjoyingfoss.feeel.yml index 54ff7fe556..33b3bc26b6 100644 --- a/metadata/com.enjoyingfoss.feeel.yml +++ b/metadata/com.enjoyingfoss.feeel.yml @@ -145,7 +145,7 @@ Builds: commit: e1030ba87fe09f7e9d99fa703bc6f2ba710d2646 output: build/app/outputs/flutter-apk/app-release.apk srclibs: - - flutter@2.2.0 + - flutter@2.5.3 prebuild: sed -i -e '/splits/,/^}/d' android/app/build.gradle build: - $$flutter$$/bin/flutter config --no-analytics diff --git a/metadata/com.krawieck.lemmur.yml b/metadata/com.krawieck.lemmur.yml index b42b7ac6e4..75fd4c182c 100644 --- a/metadata/com.krawieck.lemmur.yml +++ b/metadata/com.krawieck.lemmur.yml @@ -124,7 +124,8 @@ Builds: - windows build: - $$flutter$$/bin/flutter config --no-analytics - - $$flutter$$/bin/flutter build apk + - $$flutter$$/bin/flutter build apk --release --target lib/main_prod.dart --flavor + prod AutoUpdateMode: Version UpdateCheckMode: Tags ^v.*$ diff --git a/metadata/com.manimarank.websitemonitor.yml b/metadata/com.manimarank.websitemonitor.yml index 887190d33b..98d32edcf5 100644 --- a/metadata/com.manimarank.websitemonitor.yml +++ b/metadata/com.manimarank.websitemonitor.yml @@ -46,6 +46,10 @@ Builds: versionCode: 5 commit: 561f102bf157f57b58fe5fff7603c632a08be9ee subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - yes diff --git a/metadata/com.osfans.trime.yml b/metadata/com.osfans.trime.yml index 92ccdc6f96..69e1f34316 100644 --- a/metadata/com.osfans.trime.yml +++ b/metadata/com.osfans.trime.yml @@ -90,7 +90,6 @@ Builds: - versionName: 3.2.3 versionCode: 20211002 - disable: need ndk r23 commit: 8ea42b889aadc7c9268f88846df8f5487d32dae9 subdir: app submodules: true diff --git a/metadata/com.shadow.blackhole.yml b/metadata/com.shadow.blackhole.yml index b8d4c91d70..3a10b36697 100644 --- a/metadata/com.shadow.blackhole.yml +++ b/metadata/com.shadow.blackhole.yml @@ -50,6 +50,10 @@ Builds: - versionName: 1.12.0 versionCode: 21 commit: 1a62c2441a927d724643142a84671356ea4389bb + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java output: build/app/outputs/flutter-apk/app-release.apk srclibs: - flutter@2.5.1 diff --git a/metadata/com.simplemobiletools.applauncher.yml b/metadata/com.simplemobiletools.applauncher.yml index 95654fe0fe..72580557fc 100644 --- a/metadata/com.simplemobiletools.applauncher.yml +++ b/metadata/com.simplemobiletools.applauncher.yml @@ -255,6 +255,10 @@ Builds: versionCode: 36 commit: 1b51198086cfa8f1be617413689ee85310bbd8f8 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - yes prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle diff --git a/metadata/com.tutpro.baresip.plus.yml b/metadata/com.tutpro.baresip.plus.yml index 7ed20b81be..f725496853 100644 --- a/metadata/com.tutpro.baresip.plus.yml +++ b/metadata/com.tutpro.baresip.plus.yml @@ -922,28 +922,6 @@ Builds: - popd ndk: r21e - - versionName: 22.1.0 - versionCode: 59 - commit: 938699d425ae4ac494a82af3c48f5256302aef66 - subdir: app - sudo: - - apt-get update || apt-get update - - apt-get install -y --no-install-recommends -t testing nasm - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java - gradle: - - yes - srclibs: - - libbaresip-android@v15.0 - build: - - pushd $$libbaresip-android$$ - - sed -i -e 's!$(shell ls -d -1 /opt/Android/ndk/\* | tail -1)!$$NDK$$!' -e - 's|/usr/src/baresip-studio|../../com.tutpro.baresip.plus|' Makefile - - make download-sources - - make install-all - - popd - ndk: r23 - - versionName: 22.2.0 versionCode: 60 commit: 813938f141e488c36c6d5e82222cc80e4f02e5dd diff --git a/metadata/com.tutpro.baresip.yml b/metadata/com.tutpro.baresip.yml index 2403928374..fd57d642b5 100644 --- a/metadata/com.tutpro.baresip.yml +++ b/metadata/com.tutpro.baresip.yml @@ -1980,27 +1980,6 @@ Builds: - popd ndk: r21e - - versionName: 35.1.0 - versionCode: 181 - commit: 6c3f5e6a2463faf339c17fd73b4b69feb348c20a - subdir: app - sudo: - - apt-get update || apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java - gradle: - - yes - srclibs: - - libbaresip-android@22.0 - build: - - pushd $$libbaresip-android$$ - - sed -i -e 's!$(shell ls -d -1 /opt/Android/ndk/\* | tail -1)!$$NDK$$!' -e - 's|/usr/src/baresip-studio|../../com.tutpro.baresip|' Makefile - - make download-sources - - make install-all - - popd - ndk: r23 - - versionName: 35.2.0 versionCode: 182 commit: b47fed95396c575123b7be070cf054bb5bba4704 diff --git a/metadata/de.blau.android.yml b/metadata/de.blau.android.yml index aed62e906e..5d991d8176 100644 --- a/metadata/de.blau.android.yml +++ b/metadata/de.blau.android.yml @@ -1059,8 +1059,6 @@ Builds: commit: 9423570ddd2410e7e0c63c094c089bd7d03bc746 gradle: - current - scanignore: - - src/main/assets/synonyms/synonyms.so scandelete: - src/androidTest/resources/fixtures/military.zip - src/androidTest/resources/fixtures/military2.zip diff --git a/metadata/fr.odrevet.bide_et_musique.yml b/metadata/fr.odrevet.bide_et_musique.yml index 6a506dcaf8..6f67ab6fb3 100644 --- a/metadata/fr.odrevet.bide_et_musique.yml +++ b/metadata/fr.odrevet.bide_et_musique.yml @@ -55,7 +55,7 @@ Builds: commit: d52b9f7e46e41aa375523e870119ab32799bc6a5 output: build/app/outputs/flutter-apk/app-release.apk srclibs: - - flutter@2.0.3 + - flutter@2.5.3 rm: - ios build: diff --git a/metadata/org.atalk.android.yml b/metadata/org.atalk.android.yml index 66264e7b61..5253f8b0d6 100644 --- a/metadata/org.atalk.android.yml +++ b/metadata/org.atalk.android.yml @@ -1545,6 +1545,7 @@ Builds: - versionName: 2.7.1 versionCode: 207010 + disable: https://github.com/cmeng-git/atalk-android/issues/185 commit: 37ee226661399eca1c67298e39b2b595f674a8c7 subdir: aTalk gradle: diff --git a/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml b/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml index 1044b01399..a274f9e0ab 100644 --- a/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml +++ b/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml @@ -320,6 +320,7 @@ Builds: - versionName: 1.6.0 versionCode: 56 + disable: ndk r23b commit: b3e348f12c17a7c9e19f6fefa1b0f18b22522cda subdir: app submodules: true @@ -331,7 +332,7 @@ Builds: - update-alternatives --auto java gradle: - yes - ndk: r22b + ndk: r23b AutoUpdateMode: Version %v UpdateCheckMode: Tags