From 85ee06be15b9d4f1e5669c15d895d73d4397f3eb Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Wed, 16 Jun 2021 08:06:49 +0200 Subject: [PATCH] Fixes from checkupdates --- metadata/com.casimirlab.simpleDeadlines.yml | 8 +++--- .../com.emmanuelmess.simpleaccounting.yml | 8 +++--- metadata/com.github.wakhub.tinyclock.yml | 9 ------- ....greenaddress.greenbits_android_wallet.yml | 3 ++- metadata/com.invoiceninja.app.yml | 26 ------------------- metadata/com.lun.chin.aicamera.yml | 4 +-- metadata/com.ringdroid.yml | 4 +-- metadata/com.stealthcotper.networktools.yml | 8 ------ metadata/com.vsmartcard.acardemulator.yml | 21 --------------- metadata/de.bitsharesmunich.wallet.yml | 4 +-- ....kugihan.dictionaryformids.hmi_android.yml | 2 +- metadata/freemap.opentrail.yml | 26 ------------------- metadata/me.tsukanov.counter.yml | 5 ++-- metadata/net.jakevossen.apollotrivia.yml | 4 +-- metadata/org.aykit.MyOwnNotes.yml | 8 ------ metadata/org.fdroid.fdroid.ota.yml | 4 +-- metadata/org.fsociety.vernet.yml | 2 +- metadata/org.secuso.privacyfriendlypin.yml | 8 ------ metadata/org.smssecure.smssecure.yml | 15 ----------- metadata/org.surrel.facebooknotifications.yml | 8 ------ metadata/ru.meefik.busybox.yml | 6 ++--- metadata/security.pEp.yml | 3 ++- 22 files changed, 30 insertions(+), 156 deletions(-) diff --git a/metadata/com.casimirlab.simpleDeadlines.yml b/metadata/com.casimirlab.simpleDeadlines.yml index 6d64f9b217..5369a0513f 100644 --- a/metadata/com.casimirlab.simpleDeadlines.yml +++ b/metadata/com.casimirlab.simpleDeadlines.yml @@ -70,7 +70,7 @@ Builds: - yes prebuild: rm -rf store -AutoUpdateMode: Version %v -UpdateCheckMode: Tags -CurrentVersion: 3.2.2 -CurrentVersionCode: 18 +AutoUpdateMode: None +UpdateCheckMode: None +CurrentVersion: 3.2.3 +CurrentVersionCode: 19 diff --git a/metadata/com.emmanuelmess.simpleaccounting.yml b/metadata/com.emmanuelmess.simpleaccounting.yml index 6abf370c3f..11cfbebe00 100644 --- a/metadata/com.emmanuelmess.simpleaccounting.yml +++ b/metadata/com.emmanuelmess.simpleaccounting.yml @@ -46,7 +46,7 @@ Builds: scandelete: - Images -AutoUpdateMode: Version v%v -UpdateCheckMode: Tags -CurrentVersion: '1.6' -CurrentVersionCode: 22 +AutoUpdateMode: None +UpdateCheckMode: None +CurrentVersion: 1.6.1 +CurrentVersionCode: 23 diff --git a/metadata/com.github.wakhub.tinyclock.yml b/metadata/com.github.wakhub.tinyclock.yml index 8411e3b27b..5656590eaf 100644 --- a/metadata/com.github.wakhub.tinyclock.yml +++ b/metadata/com.github.wakhub.tinyclock.yml @@ -18,15 +18,6 @@ Builds: gradle: - yes - - versionName: 1.2.3 - versionCode: 6 - disable: wait for upstream - commit: v1.2.3 - subdir: app - submodules: true - gradle: - - yes - AutoUpdateMode: Version v%v UpdateCheckMode: Tags CurrentVersion: 1.2.2 diff --git a/metadata/com.greenaddress.greenbits_android_wallet.yml b/metadata/com.greenaddress.greenbits_android_wallet.yml index a1cbc9f654..592f194ba2 100644 --- a/metadata/com.greenaddress.greenbits_android_wallet.yml +++ b/metadata/com.greenaddress.greenbits_android_wallet.yml @@ -2002,5 +2002,6 @@ MaintainerNotes: |- AutoUpdateMode: Version release_%v UpdateCheckMode: Tags +VercodeOperation: 22000000 + %c CurrentVersion: 3.6.0 -CurrentVersionCode: 360 +CurrentVersionCode: 22000360 diff --git a/metadata/com.invoiceninja.app.yml b/metadata/com.invoiceninja.app.yml index bf09f2ea53..545654ed2c 100644 --- a/metadata/com.invoiceninja.app.yml +++ b/metadata/com.invoiceninja.app.yml @@ -140,32 +140,6 @@ Builds: - $$flutter$$/bin/flutter config --no-analytics - $$flutter$$/bin/flutter build apk - - versionName: 5.0.51 - versionCode: 51 - disable: no such tag - commit: v5.0.51 - output: build/app/outputs/flutter-apk/app-release.apk - srclibs: - - flutter@2.0.5 - rm: - - ios - - linux - - macos - - web - - windows - prebuild: - - cp lib/.env.dart.example lib/.env.dart - - cp android/app/build.gradle.dev android/app/build.gradle - - cp android/build.gradle.foss android/build.gradle - - cp lib/utils/oauth.dart.foss lib/utils/oauth.dart - - cp lib/ui/app/upgrade_dialog.dart.foss lib/ui/app/upgrade_dialog.dart - - cp android/app/src/main/AndroidManifest.foss.xml android/app/src/main/AndroidManifest.xml - - cp pubspec.foss.yaml pubspec.yaml - - rm pubspec.lock - build: - - $$flutter$$/bin/flutter config --no-analytics - - $$flutter$$/bin/flutter build apk - AutoUpdateMode: Version UpdateCheckMode: Tags ^v.*$ UpdateCheckData: pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+ diff --git a/metadata/com.lun.chin.aicamera.yml b/metadata/com.lun.chin.aicamera.yml index ed7c11d3e3..e19e350c0e 100644 --- a/metadata/com.lun.chin.aicamera.yml +++ b/metadata/com.lun.chin.aicamera.yml @@ -19,7 +19,7 @@ Builds: gradle: - yes -AutoUpdateMode: Version v%v -UpdateCheckMode: Tags +AutoUpdateMode: None +UpdateCheckMode: None CurrentVersion: '1.0' CurrentVersionCode: 1 diff --git a/metadata/com.ringdroid.yml b/metadata/com.ringdroid.yml index b34d4b9a2d..c5c41c37ef 100644 --- a/metadata/com.ringdroid.yml +++ b/metadata/com.ringdroid.yml @@ -41,7 +41,7 @@ Builds: gradle: - yes -AutoUpdateMode: Version v%v -UpdateCheckMode: Tags +AutoUpdateMode: None +UpdateCheckMode: None CurrentVersion: 2.7.3 CurrentVersionCode: 20703 diff --git a/metadata/com.stealthcotper.networktools.yml b/metadata/com.stealthcotper.networktools.yml index 587705c27a..fe868d38ff 100644 --- a/metadata/com.stealthcotper.networktools.yml +++ b/metadata/com.stealthcotper.networktools.yml @@ -20,14 +20,6 @@ Builds: gradle: - yes - - versionName: 0.4.5.3 - versionCode: 21 - disable: Unexpected version/version code in output - commit: 0.4.5.3 - subdir: app - gradle: - - yes - AutoUpdateMode: Version %v UpdateCheckMode: Tags CurrentVersion: 0.4.5.2 diff --git a/metadata/com.vsmartcard.acardemulator.yml b/metadata/com.vsmartcard.acardemulator.yml index 4799b92e53..93be56b08c 100644 --- a/metadata/com.vsmartcard.acardemulator.yml +++ b/metadata/com.vsmartcard.acardemulator.yml @@ -73,27 +73,6 @@ Builds: - ACardEmulator/app/src/main/external/ykneo-oath/build.gradle - ACardEmulator/app/src/main/external/PivApplet/ext/ant/sdks/ - - versionName: '3.4' - versionCode: 7 - disable: fails to git reset - commit: virtualsmartcard-0.8 - subdir: ACardEmulator/app - submodules: true - gradle: - - fdroid - prebuild: - - git clean -xfd - - git submodule foreach --recursive git clean -xfd - - git reset --hard - - git submodule foreach --recursive git reset --hard - - git submodule update --init --recursive - - sed -i -e '/applicationIdSuffix/d' build.gradle - scandelete: - - virtualsmartcard/npa-example-data - - ccid/src/OpenSC/src/tests/regression/bintest - - ACardEmulator/app/src/main/external/ykneo-oath/build.gradle - - ACardEmulator/app/src/main/external/PivApplet/ext/ant/sdks/ - AutoUpdateMode: Version ACardEmulator-%v UpdateCheckMode: Tags ^ACardEmulator-\d\.\d$ CurrentVersion: '3.3' diff --git a/metadata/de.bitsharesmunich.wallet.yml b/metadata/de.bitsharesmunich.wallet.yml index 57b1970d92..7a2218f77d 100644 --- a/metadata/de.bitsharesmunich.wallet.yml +++ b/metadata/de.bitsharesmunich.wallet.yml @@ -99,8 +99,8 @@ Builds: gradle: - yes -AutoUpdateMode: Version v%v -UpdateCheckMode: Tags +AutoUpdateMode: None +UpdateCheckMode: None VercodeOperation: '%c*10 + 8' CurrentVersion: 1.0.2 CurrentVersionCode: 100028 diff --git a/metadata/de.kugihan.dictionaryformids.hmi_android.yml b/metadata/de.kugihan.dictionaryformids.hmi_android.yml index 24f347d078..fa7ac53163 100644 --- a/metadata/de.kugihan.dictionaryformids.hmi_android.yml +++ b/metadata/de.kugihan.dictionaryformids.hmi_android.yml @@ -68,6 +68,6 @@ MaintainerNotes: |- https://f-droid.org/docs/All_About_Descriptions_Graphics_and_Screenshots AutoUpdateMode: None -UpdateCheckMode: RepoManifest +UpdateCheckMode: None CurrentVersion: 1.1.0 CurrentVersionCode: 131 diff --git a/metadata/freemap.opentrail.yml b/metadata/freemap.opentrail.yml index 34b4f28d13..a90bf26708 100644 --- a/metadata/freemap.opentrail.yml +++ b/metadata/freemap.opentrail.yml @@ -59,32 +59,6 @@ Builds: - pushd $$freemaplibProj$$ - $$MVN3$$ install - - versionName: 0.5.3 - versionCode: 9 - disable: fails to build, missing srclib deps - commit: 0.5.3 - subdir: app - gradle: - - yes - srclibs: - - andromaps@ec817a0b869ad41d0dc661bcca0b8595dc719003 - - freemaplib@d409e3db4b84509108e4e406f8b4e721d9223d1b - - freemaplibProj@a15388343b5cd0498efe70586c2c863a4870959f - - JCoord@aa4c5aa25fee1179c57817bbb2c7f61aa1c5328d - - javaproj@fecb0f3a6b52a4eb4e44889f10c07183cc592a3d - build: - - pushd $$freemaplib$$ - - $$MVN3$$ install - - popd - - pushd $$JCoord$$ - - $$MVN3$$ install -DskipTests - - popd - - pushd $$javaproj$$ - - $$MVN3$$ install -DskipTests - - popd - - pushd $$freemaplibProj$$ - - $$MVN3$$ install - AutoUpdateMode: Version %v UpdateCheckMode: Tags CurrentVersion: '0.4' diff --git a/metadata/me.tsukanov.counter.yml b/metadata/me.tsukanov.counter.yml index 6d0150073e..3581f5da0c 100644 --- a/metadata/me.tsukanov.counter.yml +++ b/metadata/me.tsukanov.counter.yml @@ -69,5 +69,6 @@ Builds: AutoUpdateMode: Version v%c UpdateCheckMode: Tags -CurrentVersion: '20' -CurrentVersionCode: 20 +UpdateCheckData: build.gradle|appVersion = (\d+)||v(\d+) +CurrentVersion: '22' +CurrentVersionCode: 22 diff --git a/metadata/net.jakevossen.apollotrivia.yml b/metadata/net.jakevossen.apollotrivia.yml index 2acd966c1a..c92b7737be 100644 --- a/metadata/net.jakevossen.apollotrivia.yml +++ b/metadata/net.jakevossen.apollotrivia.yml @@ -40,7 +40,7 @@ Builds: gradle: - yes -AutoUpdateMode: Version %v -UpdateCheckMode: Tags +AutoUpdateMode: None +UpdateCheckMode: None CurrentVersion: 1.4.2 CurrentVersionCode: 12 diff --git a/metadata/org.aykit.MyOwnNotes.yml b/metadata/org.aykit.MyOwnNotes.yml index bb13a4460b..a7c9c8ce83 100644 --- a/metadata/org.aykit.MyOwnNotes.yml +++ b/metadata/org.aykit.MyOwnNotes.yml @@ -48,14 +48,6 @@ Builds: gradle: - store - - versionName: 2.1.1 - versionCode: 12 - disable: no such Git tag anymore - commit: 2.1.1 - subdir: app - gradle: - - store - AutoUpdateMode: Version %v UpdateCheckMode: Tags CurrentVersion: '2.0' diff --git a/metadata/org.fdroid.fdroid.ota.yml b/metadata/org.fdroid.fdroid.ota.yml index dc75f5f06d..5614af2d4f 100644 --- a/metadata/org.fdroid.fdroid.ota.yml +++ b/metadata/org.fdroid.fdroid.ota.yml @@ -40,7 +40,7 @@ Builds: MaintainerNotes: AutoUpdateMode only works for APKs right now. ArchivePolicy: 0 versions -AutoUpdateMode: Version %v -UpdateCheckMode: Static +AutoUpdateMode: None +UpdateCheckMode: None CurrentVersion: 1.0.3 CurrentVersionCode: 1000013 diff --git a/metadata/org.fsociety.vernet.yml b/metadata/org.fsociety.vernet.yml index 15acfd5af8..95263a778c 100644 --- a/metadata/org.fsociety.vernet.yml +++ b/metadata/org.fsociety.vernet.yml @@ -33,6 +33,6 @@ Builds: AutoUpdateMode: Version v%v+%c UpdateCheckMode: Tags -UpdateCheckData: pubspec.yaml|version:\s.*\+(\d+)|.|version:\s.*\+ +UpdateCheckData: pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+ CurrentVersion: 1.0.0 CurrentVersionCode: 5 diff --git a/metadata/org.secuso.privacyfriendlypin.yml b/metadata/org.secuso.privacyfriendlypin.yml index d0f0a0a799..aa86c28578 100644 --- a/metadata/org.secuso.privacyfriendlypin.yml +++ b/metadata/org.secuso.privacyfriendlypin.yml @@ -57,14 +57,6 @@ Builds: gradle: - yes - - versionName: 2.0.2 - versionCode: 7 - disable: no tag, checkupdate bot blunder - commit: v2.0.2 - subdir: app - gradle: - - yes - AutoUpdateMode: Version v%v UpdateCheckMode: Tags CurrentVersion: 2.0.1 diff --git a/metadata/org.smssecure.smssecure.yml b/metadata/org.smssecure.smssecure.yml index 69fc2544bd..934e79c1d1 100644 --- a/metadata/org.smssecure.smssecure.yml +++ b/metadata/org.smssecure.smssecure.yml @@ -879,21 +879,6 @@ Builds: - ./scripts/build-witness.sh - rm -rf libs/gradle-witness/build - - versionName: 0.15.16 - versionCode: 212 - disable: checkupdate blunder - commit: v0.15.16 - submodules: true - gradle: - - yes - rm: - - libs/*.jar - - libs/org.greenrobot.eventbus/EventBusTest/libs/*.jar - prebuild: - - touch signing.properties - - ./scripts/build-witness.sh - - rm -rf libs/gradle-witness/build - MaintainerNotes: |- Auto Update does not really work because the latest unstable build is newer than CV. So we need to always add new build manually. diff --git a/metadata/org.surrel.facebooknotifications.yml b/metadata/org.surrel.facebooknotifications.yml index 269ce83754..06c3dc257d 100644 --- a/metadata/org.surrel.facebooknotifications.yml +++ b/metadata/org.surrel.facebooknotifications.yml @@ -100,14 +100,6 @@ Builds: gradle: - yes - - versionName: 1.10.1 - versionCode: 14 - disable: no tag, checkupdate bot blunder - commit: v1.10.1 - subdir: app - gradle: - - yes - AutoUpdateMode: Version v%v UpdateCheckMode: Tags CurrentVersion: 1.10.0 diff --git a/metadata/ru.meefik.busybox.yml b/metadata/ru.meefik.busybox.yml index fa49b9c05a..e686664a86 100644 --- a/metadata/ru.meefik.busybox.yml +++ b/metadata/ru.meefik.busybox.yml @@ -262,7 +262,7 @@ Builds: - popd ndk: r15c -AutoUpdateMode: Version %v -UpdateCheckMode: Tags +AutoUpdateMode: None +UpdateCheckMode: None CurrentVersion: 1.31.1 -CurrentVersionCode: 42 +CurrentVersionCode: 46 diff --git a/metadata/security.pEp.yml b/metadata/security.pEp.yml index 5dad305dd3..27cb469123 100644 --- a/metadata/security.pEp.yml +++ b/metadata/security.pEp.yml @@ -714,6 +714,7 @@ Builds: ndk: r20b AutoUpdateMode: None -UpdateCheckMode: Tags +UpdateCheckMode: Tags ^v[0-9.]*$ +UpdateCheckData: build.gradle|versionCode'\s*:\s*(\d+)|.|versionName'\s*:\s*'([\d.]+)' CurrentVersion: 1.1.265 CurrentVersionCode: 89