From 514263375fd690725c9fb3de55086dcd31aac22d Mon Sep 17 00:00:00 2001 From: linsui Date: Wed, 21 Jul 2021 21:07:16 +0800 Subject: [PATCH] Misc fixes --- metadata/com.manimarank.websitemonitor.yml | 1 + metadata/com.mirfatif.permissionmanagerx.yml | 1 + metadata/com.unicornsonlsd.finamp.yml | 1 + metadata/com.vishnuraghav.EnRecipes.yml | 1 + metadata/de.tutao.tutanota.yml | 27 +--------- metadata/eu.faircode.email.yml | 53 ++++---------------- metadata/fr.gouv.android.stopcovid.yml | 2 +- metadata/org.purple.smoke.yml | 4 +- metadata/org.traccar.client.yml | 13 ++--- metadata/org.voidsink.anewjkuapp.yml | 8 ++- 10 files changed, 30 insertions(+), 81 deletions(-) diff --git a/metadata/com.manimarank.websitemonitor.yml b/metadata/com.manimarank.websitemonitor.yml index 17b9d1834c..b6d655568f 100644 --- a/metadata/com.manimarank.websitemonitor.yml +++ b/metadata/com.manimarank.websitemonitor.yml @@ -34,6 +34,7 @@ Builds: - versionName: 1.1.2 versionCode: 4 + disable: https://gitlab.com/manimaran/website-monitor/-/issues/10 commit: 983700878fb5bf5cd31e43a85262c08decca8175 subdir: app gradle: diff --git a/metadata/com.mirfatif.permissionmanagerx.yml b/metadata/com.mirfatif.permissionmanagerx.yml index f0cc25eba5..39f8f6f6c0 100644 --- a/metadata/com.mirfatif.permissionmanagerx.yml +++ b/metadata/com.mirfatif.permissionmanagerx.yml @@ -50,6 +50,7 @@ Builds: - versionName: v1.07 versionCode: 107 + disable: https://github.com/mirfatif/PermissionManagerX/issues/15 commit: 6e15c8fdfae635ee1cec56d3bd76c23a5c2a2d40 subdir: app submodules: true diff --git a/metadata/com.unicornsonlsd.finamp.yml b/metadata/com.unicornsonlsd.finamp.yml index 5765fc4201..f587c8e166 100644 --- a/metadata/com.unicornsonlsd.finamp.yml +++ b/metadata/com.unicornsonlsd.finamp.yml @@ -50,6 +50,7 @@ Builds: - $$flutter$$/bin/flutter config --no-analytics - $$flutter$$/bin/flutter packages pub get - $$flutter$$/bin/flutter build apk + ndk: r21 AutoUpdateMode: Version UpdateCheckMode: Tags diff --git a/metadata/com.vishnuraghav.EnRecipes.yml b/metadata/com.vishnuraghav.EnRecipes.yml index ad82be5b1d..50e42b2c91 100644 --- a/metadata/com.vishnuraghav.EnRecipes.yml +++ b/metadata/com.vishnuraghav.EnRecipes.yml @@ -19,6 +19,7 @@ Repo: https://github.com/vishnuraghavb/EnRecipes.git Builds: - versionName: 2.0.0 versionCode: 1 + disable: need to specify ndk version in NativeScript_android-runtime commit: v2.0.0 sudo: - apt-get update || apt-get update diff --git a/metadata/de.tutao.tutanota.yml b/metadata/de.tutao.tutanota.yml index 6e95463a83..f68fdd3eb0 100644 --- a/metadata/de.tutao.tutanota.yml +++ b/metadata/de.tutao.tutanota.yml @@ -1185,32 +1185,9 @@ Builds: scandelete: - node_modules/** - - versionName: 3.84.11 - versionCode: 384110 - disable: https://github.com/tutao/tutanota/issues/3154 - commit: 997a3c16886dd94b0db33a982238225539af2f96 - subdir: app-android/app - sudo: - - curl -Lo node.tar.xz https://nodejs.org/download/release/v14.17.2/node-v14.17.2-linux-x64.tar.xz - - echo "6cf9db7349407c177b36205feec949729d0ee9db485e19b10b0b1ffca65a3a46 node.tar.xz" - | sha256sum -c - - - tar xJf node.tar.xz - - cp -a node-v14.17.2-linux-x64/. /usr/local/ - - npm install -g npm@latest - gradle: - - yes - rm: - - app-ios - prebuild: - - cd ../.. - - node fdroid-fix-deps - - npm install - - node dist prod - scandelete: - - node_modules/** - - versionName: 3.85.3 versionCode: 385030 + disable: https://github.com/tutao/tutanota/issues/3154 commit: 6e244133786874af29a8b58158faccab18873ab5 subdir: app-android/app sudo: @@ -1232,7 +1209,7 @@ Builds: scandelete: - node_modules/** -AutoUpdateMode: Version tutanota-android-release-%v +AutoUpdateMode: None UpdateCheckMode: Tags tutanota-android-release-* CurrentVersion: 3.85.3 CurrentVersionCode: 385030 diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml index 8e00b0a9f7..15b4d178f3 100644 --- a/metadata/eu.faircode.email.yml +++ b/metadata/eu.faircode.email.yml @@ -4452,11 +4452,16 @@ Builds: - app/lib ndk: r21e - - versionName: '1.1648' - versionCode: 1648 - commit: 15f7820d61f1e2a2efd5b967f93c9384e9a33832 + - versionName: '1.1658' + versionCode: 1658 + disable: Failed to find Platform SDK with path:platforms;android-31 + commit: 68ba7c92778bd5d099c22b6c1418fdb9af2500dc subdir: app submodules: true + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - fdroid prebuild: sed -i -e '/keystoreProperties/d' -e '/in-app-purchasing/d' build.gradle @@ -4464,44 +4469,8 @@ Builds: - app/lib ndk: r21e - - versionName: '1.1651' - versionCode: 1651 - commit: e60c777f06c5debb19b33e9e0f945ef111f1be6b - subdir: app - submodules: true - gradle: - - fdroid - prebuild: sed -i -e '/keystoreProperties/d' -e '/in-app-purchasing/d' build.gradle - scandelete: - - app/lib - ndk: r21e - - - versionName: '1.1654' - versionCode: 1654 - commit: 470fe97044ccbf54390898a5e3dd020ea7ec374a - subdir: app - submodules: true - gradle: - - fdroid - prebuild: sed -i -e '/keystoreProperties/d' -e '/in-app-purchasing/d' build.gradle - scandelete: - - app/lib - ndk: r21e - - - versionName: '1.1656' - versionCode: 1656 - commit: ffe28a2dfae383788f9dfda724b0412c6a1b4b3e - subdir: app - submodules: true - gradle: - - fdroid - prebuild: sed -i -e '/keystoreProperties/d' -e '/in-app-purchasing/d' build.gradle - scandelete: - - app/lib - ndk: r21e - -AutoUpdateMode: Version +AutoUpdateMode: None UpdateCheckMode: Tags UpdateCheckData: app/build.gradle|getVersionCode.*return (\d+)|| -CurrentVersion: '1.1656' -CurrentVersionCode: 1656 +CurrentVersion: '1.1658' +CurrentVersionCode: 1658 diff --git a/metadata/fr.gouv.android.stopcovid.yml b/metadata/fr.gouv.android.stopcovid.yml index e008709a35..7a64a676d5 100644 --- a/metadata/fr.gouv.android.stopcovid.yml +++ b/metadata/fr.gouv.android.stopcovid.yml @@ -302,7 +302,7 @@ Builds: - versionName: 3.4.0 versionCode: 310 - commit: 0c4576f8f6d1ff6646d7a45d95ceaf248d155df7 + commit: 3878990fca79fcecd1953865e26180067bcf5eaf subdir: stopcovid submodules: true gradle: diff --git a/metadata/org.purple.smoke.yml b/metadata/org.purple.smoke.yml index 358559e3ae..2a50547a3d 100644 --- a/metadata/org.purple.smoke.yml +++ b/metadata/org.purple.smoke.yml @@ -111,8 +111,8 @@ Builds: output: build/outputs/apk/release/apk/smoke.apk rm: - Smoke/app/libs/* - prebuild: sed -i -e '/bcprov-ext-jdk15on-168/d' -e "/fileTree/aimplementation - 'org.bouncycastle:bcprov-ext-jdk15on:1.68'" -e '/MissingTranslation/aabortOnError\ + prebuild: sed -i -e '/bcprov-ext-jdk15on-169/d' -e "/fileTree/aimplementation + 'org.bouncycastle:bcprov-ext-jdk15on:1.69'" -e '/MissingTranslation/aabortOnError\ false' build.gradle AutoUpdateMode: Version %v diff --git a/metadata/org.traccar.client.yml b/metadata/org.traccar.client.yml index 0d55d74704..e40ae99d53 100644 --- a/metadata/org.traccar.client.yml +++ b/metadata/org.traccar.client.yml @@ -367,19 +367,14 @@ Builds: prebuild: sed -i -e '/com.google.gms/d' -e '/com.google.firebase/d' -e '/fabric/d' -e '/crashlytics/d' ../build.gradle build.gradle - - versionName: '6.8' - versionCode: 69 - commit: 298d7becb57abf1660d269082b3b003555276889 - subdir: app - gradle: - - regular - prebuild: sed -i -e '/com.google.gms/d' -e '/com.google.firebase/d' -e '/fabric/d' - -e '/crashlytics/d' ../build.gradle build.gradle - - versionName: '6.9' versionCode: 70 commit: 6910790fa7bfce776e25c12a758d7e4ad153dd5f subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - regular prebuild: sed -i -e '/com.google.gms/d' -e '/com.google.firebase/d' -e '/fabric/d' diff --git a/metadata/org.voidsink.anewjkuapp.yml b/metadata/org.voidsink.anewjkuapp.yml index c4dfe353ec..fb9fea985f 100644 --- a/metadata/org.voidsink.anewjkuapp.yml +++ b/metadata/org.voidsink.anewjkuapp.yml @@ -305,10 +305,14 @@ Builds: - sed -i -e '/maven {$/,/}/d; /com.google.gms/d; /io.fabric.tools/d' ../build.gradle - sed -i -e '/applicationVariants/,+4d; /googleImplementation/d' build.gradle - - versionName: 0.53.6-fdroid-fdroid + - versionName: 0.53.6-fdroid versionCode: 140085 commit: 4efbfe98adb5c8678a1c8878d75108b902dc17cb subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - fdroid rm: @@ -319,7 +323,7 @@ Builds: MaintainerNotes: Disable AUM when build/sed proves to be to fragile. -AutoUpdateMode: Version +-fdroid v%v +AutoUpdateMode: Version v%v UpdateCheckMode: Tags CurrentVersion: 0.53.6-fdroid CurrentVersionCode: 140085