From 097c5221ebcc90463be77ec2840f5753b572807c Mon Sep 17 00:00:00 2001 From: linsui Date: Thu, 10 Jun 2021 14:25:56 +0800 Subject: [PATCH] misc fixes --- metadata/ch.rmy.android.http_shortcuts.yml | 1 + .../com.github.jameshnsears.quoteunquote.yml | 22 ++----------------- metadata/com.osfans.trime.yml | 10 ++++----- metadata/com.pvpc.precio_luz.yml | 12 +--------- metadata/com.roguetemple.hyperroid.yml | 1 + metadata/dev.lucanlm.antimine.yml | 1 + metadata/eu.faircode.email.yml | 6 ++--- metadata/se.leap.bitmaskclient.yml | 1 + 8 files changed, 14 insertions(+), 40 deletions(-) diff --git a/metadata/ch.rmy.android.http_shortcuts.yml b/metadata/ch.rmy.android.http_shortcuts.yml index 71d0163982..a5ff8bcdf9 100644 --- a/metadata/ch.rmy.android.http_shortcuts.yml +++ b/metadata/ch.rmy.android.http_shortcuts.yml @@ -111,6 +111,7 @@ Builds: gradle: - yes output: build/outputs/apk/release/app-universal-release.apk + ndk: r21 AutoUpdateMode: Version v%v UpdateCheckMode: Tags diff --git a/metadata/com.github.jameshnsears.quoteunquote.yml b/metadata/com.github.jameshnsears.quoteunquote.yml index cf27df7df9..e9ca2864ed 100644 --- a/metadata/com.github.jameshnsears.quoteunquote.yml +++ b/metadata/com.github.jameshnsears.quoteunquote.yml @@ -107,25 +107,7 @@ Builds: - fdroid prebuild: sed -i -e '/firebase/d' build.gradle - - versionName: 2.5.1-fdroid-S - versionCode: 70 - commit: 2.5.1-fdroid - subdir: app - submodules: true - gradle: - - fdroid - prebuild: sed -i -e '/firebase/d' build.gradle - - - versionName: 2.5.1-fdroid-S - versionCode: 72 - commit: 2.5.1-fdroid - subdir: app - submodules: true - gradle: - - fdroid - prebuild: sed -i -e '/firebase/d' build.gradle - - - versionName: 2.5.2-fdroid-S + - versionName: 2.5.2-fdroid versionCode: 73 commit: 2.5.2-fdroid subdir: app @@ -136,5 +118,5 @@ Builds: AutoUpdateMode: Version %v UpdateCheckMode: Tags .*-fdroid$ -CurrentVersion: 2.5.2-fdroid-S +CurrentVersion: 2.5.2-fdroid CurrentVersionCode: 73 diff --git a/metadata/com.osfans.trime.yml b/metadata/com.osfans.trime.yml index 9573485571..6186146612 100644 --- a/metadata/com.osfans.trime.yml +++ b/metadata/com.osfans.trime.yml @@ -42,18 +42,16 @@ Builds: - versionName: 3.2.0 versionCode: 20210604 + disable: https://github.com/osfans/trime/issues/418 commit: v3.2.0 subdir: app submodules: true gradle: - yes - prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.10.2.4988404' + prebuild: $$SDK$$/tools/bin/sdkmanager 'cmake;3.18.1' > /dev/null scandelete: - - app/src/main/jni/libiconv/tests - - app/src/main/jni/librime/thirdparty/bin/curl.exe - - app/src/main/jni/boost/libs/fiber/examples/cuda/single_stream - - app/src/main/jni/boost/libs/fiber/examples/cuda/multiple_streams - ndk: r20 + - app/src/main/jni + ndk: r22b AutoUpdateMode: Version %v UpdateCheckMode: Tags diff --git a/metadata/com.pvpc.precio_luz.yml b/metadata/com.pvpc.precio_luz.yml index 318688e74b..8913e894a9 100644 --- a/metadata/com.pvpc.precio_luz.yml +++ b/metadata/com.pvpc.precio_luz.yml @@ -37,16 +37,6 @@ Builds: - $$flutter$$/bin/flutter config --no-analytics - $$flutter$$/bin/flutter build apk - - versionName: 2.0.1 - versionCode: 4 - commit: v2.0.1 - output: build/app/outputs/flutter-apk/app-release.apk - srclibs: - - flutter@2.2.1 - build: - - $$flutter$$/bin/flutter config --no-analytics - - $$flutter$$/bin/flutter build apk - - versionName: 2.0.3 versionCode: 6 commit: v2.0.3 @@ -56,8 +46,8 @@ Builds: build: - $$flutter$$/bin/flutter config --no-analytics - $$flutter$$/bin/flutter build apk + ndk: r20 -ArchivePolicy: 0 versions AutoUpdateMode: Version UpdateCheckMode: Tags ^v.*$ UpdateCheckData: pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+ diff --git a/metadata/com.roguetemple.hyperroid.yml b/metadata/com.roguetemple.hyperroid.yml index 27d530a5fc..4c7ab73010 100644 --- a/metadata/com.roguetemple.hyperroid.yml +++ b/metadata/com.roguetemple.hyperroid.yml @@ -153,6 +153,7 @@ Builds: - versionName: 12.0a versionCode: 12010 + disable: miss resource commit: v12.0a subdir: hyperroid/app sudo: diff --git a/metadata/dev.lucanlm.antimine.yml b/metadata/dev.lucanlm.antimine.yml index 151888d7c9..1b13b1d7ea 100644 --- a/metadata/dev.lucanlm.antimine.yml +++ b/metadata/dev.lucanlm.antimine.yml @@ -571,6 +571,7 @@ Builds: prebuild: - sed -i -e "s/':proprietary', //; s/':wear', //" ../settings.gradle - sed -i -e "/':proprietary'/d" build.gradle + ndk: r21 AutoUpdateMode: Version %v UpdateCheckMode: Tags diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml index e7781be0ff..f472365132 100644 --- a/metadata/eu.faircode.email.yml +++ b/metadata/eu.faircode.email.yml @@ -4238,9 +4238,9 @@ Builds: prebuild: sed -i -e '/keystoreProperties/d' build.gradle ndk: r21e - - versionName: '1.1608' + - versionName: '1.1609' versionCode: 1609 - commit: '1.1608' + commit: '1.1609' subdir: app submodules: true gradle: @@ -4251,5 +4251,5 @@ Builds: AutoUpdateMode: Version UpdateCheckMode: Tags UpdateCheckData: app/build.gradle|getVersionCode.*return (\d+)|| -CurrentVersion: '1.1608' +CurrentVersion: '1.1609' CurrentVersionCode: 1609 diff --git a/metadata/se.leap.bitmaskclient.yml b/metadata/se.leap.bitmaskclient.yml index 34c92f72d5..714daca248 100644 --- a/metadata/se.leap.bitmaskclient.yml +++ b/metadata/se.leap.bitmaskclient.yml @@ -316,6 +316,7 @@ Builds: - versionName: 1.0.9 versionCode: 155 + disable: native build failed commit: 1.0.9 subdir: app submodules: true