From 27ffccec7f2c1a41270f19c747a784fd27ca012e Mon Sep 17 00:00:00 2001 From: linsui Date: Sun, 26 Feb 2023 16:22:37 +0800 Subject: [PATCH] misc fixes --- metadata/com.chooloo.www.koler.yml | 1 + metadata/com.github.axet.filemanager.yml | 12 ++---- metadata/de.monocles.chat.yml | 38 +++++++++++++++++-- metadata/de.monocles.mail.yml | 4 +- metadata/de.niendo.ImapNotes3.yml | 2 +- ...o.nekohasekai.sagernet.plugin.hysteria.yml | 6 +-- metadata/ru.tech.imageresizershrinker.yml | 14 +++---- metadata/uk.openvk.android.legacy.yml | 1 + 8 files changed, 51 insertions(+), 27 deletions(-) diff --git a/metadata/com.chooloo.www.koler.yml b/metadata/com.chooloo.www.koler.yml index f6570aa2e9..5d80d7c502 100644 --- a/metadata/com.chooloo.www.koler.yml +++ b/metadata/com.chooloo.www.koler.yml @@ -98,6 +98,7 @@ Builds: - versionName: v1.6.0 versionCode: 80 + disable: https://github.com/Chooloo/koler/issues/509 commit: 224c6c67628b43eabd4d227abe8f755307ec3b25 subdir: koler gradle: diff --git a/metadata/com.github.axet.filemanager.yml b/metadata/com.github.axet.filemanager.yml index 263d1345c6..118d0e3c7d 100644 --- a/metadata/com.github.axet.filemanager.yml +++ b/metadata/com.github.axet.filemanager.yml @@ -372,20 +372,16 @@ Builds: - yes ndk: r16b - - versionName: 0.5.7 - versionCode: 186 - commit: cdad3e86c27aff984a8a4d139cbdac14452f2b1f - subdir: app - gradle: - - yes - ndk: r16b - - versionName: 0.5.8 versionCode: 187 commit: 660defd643997029c891f19e9c010b48124cce30 subdir: app + sudo: + - apt-get update + - apt-get install -y libncurses5 gradle: - yes + prebuild: sed -i -e '/android {/a lintOptions {abortOnError false}' build.gradle ndk: r16b AutoUpdateMode: Version diff --git a/metadata/de.monocles.chat.yml b/metadata/de.monocles.chat.yml index 589c119527..c1467e8941 100644 --- a/metadata/de.monocles.chat.yml +++ b/metadata/de.monocles.chat.yml @@ -200,13 +200,43 @@ Builds: prebuild: sed -i -e '/signingConfigs./d' build.gradle - versionName: 1.6.2 - versionCode: 129 + versionCode: 12901 commit: 39cf4a48cc141fe5a739117a4aa99610d5d9b9f2 gradle: - git - prebuild: sed -i -e '/signingConfigs./d' build.gradle + prebuild: sed -i -e '/signingConfigs./d' -e '/grgit/d' -e 's/universalApk true/reset()\ninclude + "armeabi-v7a"/' build.gradle + + - versionName: 1.6.2 + versionCode: 12902 + commit: 39cf4a48cc141fe5a739117a4aa99610d5d9b9f2 + gradle: + - git + prebuild: sed -i -e '/signingConfigs./d' -e '/grgit/d' -e 's/universalApk true/reset()\ninclude + "x86"/' build.gradle + + - versionName: 1.6.2 + versionCode: 12903 + commit: 39cf4a48cc141fe5a739117a4aa99610d5d9b9f2 + gradle: + - git + prebuild: sed -i -e '/signingConfigs./d' -e '/grgit/d' -e 's/universalApk true/reset()\ninclude + "x86_64"/' build.gradle + + - versionName: 1.6.2 + versionCode: 12904 + commit: 39cf4a48cc141fe5a739117a4aa99610d5d9b9f2 + gradle: + - git + prebuild: sed -i -e '/signingConfigs./d' -e '/grgit/d' -e 's/universalApk true/reset()\ninclude + "arm64-v8a"/' build.gradle AutoUpdateMode: Version -UpdateCheckMode: Tags ^v\d+\.\d+(\.\d+)?$ +UpdateCheckMode: Tags ^v[\d.]+$ +VercodeOperation: + - 100 * %c + 1 + - 100 * %c + 2 + - 100 * %c + 3 + - 100 * %c + 4 CurrentVersion: 1.6.2 -CurrentVersionCode: 129 +CurrentVersionCode: 12901 diff --git a/metadata/de.monocles.mail.yml b/metadata/de.monocles.mail.yml index 0f7726e27e..7b384d439a 100644 --- a/metadata/de.monocles.mail.yml +++ b/metadata/de.monocles.mail.yml @@ -4,7 +4,7 @@ License: Apache-2.0 AuthorName: Arne-Brün Vogelsang AuthorEmail: arne@monocles.de WebSite: https://monocles.de/more/ -SourceCode: https://codeberg.org/Arne/monocles_mail +SourceCode: https://codeberg.org/Arne/monocles_F-Droid build failedmail IssueTracker: https://codeberg.org/Arne/monocles_mail/issues Translation: https://www.transifex.com/projects/p/monoclesmail Donate: https://monocles.de/more/#donation-section @@ -92,10 +92,12 @@ Builds: - versionName: 1.1.1 versionCode: 8 + disable: https://codeberg.org/Arne/monocles_mail/issues/10 commit: 4c99c13cf158eec9c6250ff9624246cfca0742d4 subdir: app/k9mail gradle: - yes + prebuild: cp -R ../../gradle ./ AutoUpdateMode: Version UpdateCheckMode: Tags v\d+\.\d+(\.\d+)? diff --git a/metadata/de.niendo.ImapNotes3.yml b/metadata/de.niendo.ImapNotes3.yml index 4fd4a8f276..dfd301acb7 100644 --- a/metadata/de.niendo.ImapNotes3.yml +++ b/metadata/de.niendo.ImapNotes3.yml @@ -46,11 +46,11 @@ Builds: - versionName: v1.1-00 versionCode: 10100 + disable: https://github.com/niendo1/ImapNotes3/issues/23 commit: c36a487747aba51fa97667ba284a8bc217d289c6 subdir: ImapNotes3 gradle: - yes - prebuild: sed -i -e '/lint {/,+2d' build.gradle AutoUpdateMode: Version UpdateCheckMode: Tags diff --git a/metadata/io.nekohasekai.sagernet.plugin.hysteria.yml b/metadata/io.nekohasekai.sagernet.plugin.hysteria.yml index 2024220bed..72cf395832 100644 --- a/metadata/io.nekohasekai.sagernet.plugin.hysteria.yml +++ b/metadata/io.nekohasekai.sagernet.plugin.hysteria.yml @@ -201,12 +201,10 @@ Builds: submodules: true sudo: - apt-get update - - curl -Lso go.tar.gz https://golang.org/dl/go1.18.6.linux-amd64.tar.gz - - echo "bb05f179a773fed60c6a454a24141aaa7e71edfd0f2d465ad610a3b8f1dc7fe8 go.tar.gz" - | sha256sum -c - - - tar xzf go.tar.gz --strip-components=1 -C /usr/local/ + - apt-get install -y -t bullseye-backports golang-go gradle: - fdroid + prebuild: cp -R ../../gradle ./ scandelete: - external - plugin diff --git a/metadata/ru.tech.imageresizershrinker.yml b/metadata/ru.tech.imageresizershrinker.yml index 8eec448c16..c4cb5c20a9 100644 --- a/metadata/ru.tech.imageresizershrinker.yml +++ b/metadata/ru.tech.imageresizershrinker.yml @@ -31,19 +31,15 @@ Builds: - versionName: 1.5.3 versionCode: 15 + disable: https://github.com/T8RIN/ImageResizer/issues/15 commit: 43b7ef5454f00e4b48aecf35d60f4074979c77f3 subdir: app - sudo: - - apt-get update - - apt-get install -y zipalign - output: out.apk + gradle: + - yes srclibs: - reproducible-apk-tools@v0.2.3 - build: - - gradle assembleRelease - - $$reproducible-apk-tools$$/fix-newlines.py build/outputs/apk/release/*.apk - fixed.apk 'META-INF/services/*' - - zipalign 4 fixed.apk out.apk + postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$ + 'META-INF/services/*' AutoUpdateMode: Version UpdateCheckMode: Tags diff --git a/metadata/uk.openvk.android.legacy.yml b/metadata/uk.openvk.android.legacy.yml index 77f5feb6df..cb66ccc047 100644 --- a/metadata/uk.openvk.android.legacy.yml +++ b/metadata/uk.openvk.android.legacy.yml @@ -379,6 +379,7 @@ Builds: - versionName: 1.1.176-beta versionCode: 176 + disable: https://github.com/openvk/mobile-android-legacy/issues/102 commit: ae4e6a4359313061350dc8fe8ee2e44fe48a1185 subdir: app sudo: