From dcc50b664a95fbe94dd0cc1bd2473be50eb41c97 Mon Sep 17 00:00:00 2001 From: linsui Date: Thu, 17 Jun 2021 19:36:12 +0800 Subject: [PATCH] misc fixes --- metadata/com.adonai.manman.yml | 2 ++ metadata/com.eletac.tronwallet.yml | 15 ++++--------- metadata/com.metallic.chiaki.yml | 5 +++-- metadata/eu.bauerj.paperless_app.yml | 1 + metadata/io.github.pd4d10.gittouch.yml | 16 +++----------- .../org.musicbrainz.picard.barcodescanner.yml | 21 +++++++------------ metadata/se.leap.bitmaskclient.yml | 1 + metadata/se.leap.riseupvpn.yml | 1 + 8 files changed, 22 insertions(+), 40 deletions(-) diff --git a/metadata/com.adonai.manman.yml b/metadata/com.adonai.manman.yml index fb626d44f6..9d47d3d59d 100644 --- a/metadata/com.adonai.manman.yml +++ b/metadata/com.adonai.manman.yml @@ -8,6 +8,7 @@ AuthorWebSite: https://plus.google.com/102332121455682860724 SourceCode: https://github.com/Adonai/Man-Man IssueTracker: https://github.com/Adonai/Man-Man/issues Donate: https://www.patreon.com/kanedias +Liberapay: Kanedias AutoName: Man Man Description: |- @@ -173,6 +174,7 @@ Builds: subdir: app gradle: - fdroid + prebuild: sed -i -e 's/= URI.create//' ../build.gradle AutoUpdateMode: Version %v UpdateCheckMode: Tags diff --git a/metadata/com.eletac.tronwallet.yml b/metadata/com.eletac.tronwallet.yml index 081bb315f0..5f772dc2b6 100644 --- a/metadata/com.eletac.tronwallet.yml +++ b/metadata/com.eletac.tronwallet.yml @@ -33,16 +33,9 @@ Builds: gradle: - yes - - versionName: 1.1.9.4 - versionCode: 47 - commit: v1.1.9.4 - subdir: app - gradle: - - yes - -AutoUpdateMode: Version v%v -UpdateCheckMode: Tags -CurrentVersion: 1.1.9.4 -CurrentVersionCode: 47 +AutoUpdateMode: None +UpdateCheckMode: None +CurrentVersion: 1.1.8.0 +CurrentVersionCode: 37 NoSourceSince: 1.1.8.0 diff --git a/metadata/com.metallic.chiaki.yml b/metadata/com.metallic.chiaki.yml index 820e62e0ec..b976744852 100644 --- a/metadata/com.metallic.chiaki.yml +++ b/metadata/com.metallic.chiaki.yml @@ -70,7 +70,7 @@ Builds: prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.10.2.4988404' ndk: r20b - - versionName: v2.1.1 + - versionName: 2.1.1 versionCode: 11 commit: v2.1.1 subdir: android/app @@ -85,5 +85,6 @@ Builds: AutoUpdateMode: Version UpdateCheckMode: Tags -CurrentVersion: v2.1.1 +UpdateCheckData: android/app/build.gradle|versionCode\s(\d+)||v([\d.]+) +CurrentVersion: 2.1.1 CurrentVersionCode: 11 diff --git a/metadata/eu.bauerj.paperless_app.yml b/metadata/eu.bauerj.paperless_app.yml index d4cf95cec9..a8e5796599 100644 --- a/metadata/eu.bauerj.paperless_app.yml +++ b/metadata/eu.bauerj.paperless_app.yml @@ -81,6 +81,7 @@ Builds: - $$flutter$$/bin/flutter pub get - $$flutter$$/bin/flutter pub run build_runner build - $$flutter$$/bin/flutter build apk + ndk: r21 MaintainerNotes: |- Builds will fail when the srclib ref of flutter and the version with which diff --git a/metadata/io.github.pd4d10.gittouch.yml b/metadata/io.github.pd4d10.gittouch.yml index 172be3e829..450bd683e5 100644 --- a/metadata/io.github.pd4d10.gittouch.yml +++ b/metadata/io.github.pd4d10.gittouch.yml @@ -59,28 +59,18 @@ Builds: - $$flutter$$/bin/flutter config --no-analytics - $$flutter$$/bin/flutter build apk --no-tree-shake-icons - - versionName: 1.12.4 - versionCode: 25 - disable: https://github.com/git-touch/git-touch/issues/239 - commit: v1.12.4 - output: build/app/outputs/flutter-apk/app-release.apk - srclibs: - - flutter@1.22.5 - build: - - $$flutter$$/bin/flutter config --no-analytics - - $$flutter$$/bin/flutter build apk --no-tree-shake-icons - - versionName: 1.13.0 versionCode: 26 + disable: https://github.com/git-touch/git-touch/issues/239 commit: v1.13.0 output: build/app/outputs/flutter-apk/app-release.apk srclibs: - - flutter@1.22.5 + - flutter@2.2.2 build: - $$flutter$$/bin/flutter config --no-analytics - $$flutter$$/bin/flutter build apk --no-tree-shake-icons -AutoUpdateMode: Version +AutoUpdateMode: None UpdateCheckMode: Tags ^v.*$ UpdateCheckData: pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+ CurrentVersion: 1.13.0 diff --git a/metadata/org.musicbrainz.picard.barcodescanner.yml b/metadata/org.musicbrainz.picard.barcodescanner.yml index a68b79fd36..71fa1b5215 100644 --- a/metadata/org.musicbrainz.picard.barcodescanner.yml +++ b/metadata/org.musicbrainz.picard.barcodescanner.yml @@ -39,18 +39,11 @@ Builds: - sed -i 's@\(reference.1=\).*@\1$$ActionBar$$@;/musicbrainz/d' project.properties - echo 'source.dir=src;$$MusicBrainz-API$$/src' > ant.properties - - versionName: '1.3' - versionCode: 6 - commit: '1.3' - srclibs: - - MusicBrainz-API@1.2.5 - - ActionBar@093a5f80 - prebuild: - - rm -rf $$MusicBrainz-API$$/src/test - - sed -i 's@\(reference.1=\).*@\1$$ActionBar$$@;/musicbrainz/d' project.properties - - echo 'source.dir=src;$$MusicBrainz-API$$/src' > ant.properties +MaintainerNotes: Use PayPal_MPL-1.5.5.45.jar -AutoUpdateMode: Version -UpdateCheckMode: Tags -CurrentVersion: '1.3' -CurrentVersionCode: 6 +AutoUpdateMode: None +UpdateCheckMode: None +CurrentVersion: '1.1' +CurrentVersionCode: 2 + +NoSourceSince: '1.1' diff --git a/metadata/se.leap.bitmaskclient.yml b/metadata/se.leap.bitmaskclient.yml index b4d2831647..caff3fb1c6 100644 --- a/metadata/se.leap.bitmaskclient.yml +++ b/metadata/se.leap.bitmaskclient.yml @@ -328,6 +328,7 @@ Builds: - $$SDK$$/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.3' > /dev/null - sed -i -e "/^task updateSdkLicences/,/^}/d; /commandLine 'git'/d" build.gradle + - sed -i -e '/android {/a ndkVersion = "20.1.5948944"' ../ics-openvpn/main/build.gradle.kts scandelete: - bitmask-core - bitmask-web-core diff --git a/metadata/se.leap.riseupvpn.yml b/metadata/se.leap.riseupvpn.yml index 32c142557b..f94486404a 100644 --- a/metadata/se.leap.riseupvpn.yml +++ b/metadata/se.leap.riseupvpn.yml @@ -162,6 +162,7 @@ Builds: - $$SDK$$/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.3' > /dev/null - sed -i -e "/^task updateSdkLicences/,/^}/d; /commandLine 'git'/d" build.gradle + - sed -i -e '/android {/a ndkVersion = "20.1.5948944"' ../ics-openvpn/main/build.gradle.kts scandelete: - bitmask-core - bitmask-web-core