From 8fadd4e1d17a2185e444187bc7a2b3c1af577852 Mon Sep 17 00:00:00 2001 From: Licaon_Kter Date: Tue, 13 Oct 2020 16:36:13 +0300 Subject: [PATCH] Misc fixes afetr cycle --- metadata/ca.chancehorizon.paseo.yml | 7 --- metadata/ch.protonvpn.android.yml | 2 +- metadata/com.apozas.contactdiary.yml | 4 +- metadata/com.flxrs.dankchat.yml | 1 + metadata/com.gitea.theoden8.sudaku.yml | 1 + metadata/com.lesspass.android.yml | 1 + metadata/com.unciv.app.yml | 2 +- ...e.storchp.opentracks.osmplugin.offline.yml | 6 --- metadata/dev.lucanlm.antimine.yml | 13 ------ metadata/dev.msfjarvis.aps.yml | 2 - metadata/dnsfilter.android.yml | 10 ----- metadata/eu.quelltext.coloring.yml | 1 + metadata/info.dvkr.screenstream.yml | 43 +------------------ metadata/io.anuke.mindustry.yml | 40 +---------------- metadata/juliushenke.smarttt.yml | 9 +--- metadata/la.daube.photochiotte.yml | 9 +--- metadata/lu.cases.tacos.yml | 1 + .../openfoodfacts.github.scrachx.openfood.yml | 2 +- metadata/org.dash.electrum.electrum_dash.yml | 4 +- metadata/org.emunix.unipatcher.yml | 17 +------- metadata/org.gateshipone.odyssey.yml | 2 + metadata/org.openobservatory.ooniprobe.yml | 5 +-- metadata/org.ostrya.presencepublisher.yml | 8 +--- metadata/org.smc.inputmethod.indic.yml | 20 --------- metadata/ru.yanus171.feedexfork.yml | 1 + 25 files changed, 26 insertions(+), 185 deletions(-) diff --git a/metadata/ca.chancehorizon.paseo.yml b/metadata/ca.chancehorizon.paseo.yml index 8153728b58..be9025cf13 100644 --- a/metadata/ca.chancehorizon.paseo.yml +++ b/metadata/ca.chancehorizon.paseo.yml @@ -18,13 +18,6 @@ Builds: gradle: - yes - - versionName: 1.2.0 - versionCode: 3 - commit: v1.2.0 - subdir: app - gradle: - - yes - - versionName: 1.2.1 versionCode: 4 commit: v1.2.1 diff --git a/metadata/ch.protonvpn.android.yml b/metadata/ch.protonvpn.android.yml index 31f297a385..9395de0faf 100644 --- a/metadata/ch.protonvpn.android.yml +++ b/metadata/ch.protonvpn.android.yml @@ -243,7 +243,7 @@ Builds: - openvpn/src/main/cpp/openvpn3/test/unittests - strongswan/testing/hosts/alice/etc/raddb/certs/random prebuild: - - sed -i -e '/triple/d' -e '/play\ {/,+4d' build.gradle + - sed -i -e '/triple/d' -e '/play\ {/,+4d' -e 's/20.0.5594570/20.1.5948944/' build.gradle - pushd ../strongswan - export PATH=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH - git clone git://git.strongswan.org/android-ndk-boringssl.git -b ndk-static diff --git a/metadata/com.apozas.contactdiary.yml b/metadata/com.apozas.contactdiary.yml index af8992e0cb..cbb3386f44 100644 --- a/metadata/com.apozas.contactdiary.yml +++ b/metadata/com.apozas.contactdiary.yml @@ -20,9 +20,9 @@ Builds: gradle: - github - - versionName: 1.0.5-github-github + - versionName: 1.0.5-github versionCode: 6 - commit: v1.0.5-github + commit: v1.0.5 subdir: android_app/app gradle: - github diff --git a/metadata/com.flxrs.dankchat.yml b/metadata/com.flxrs.dankchat.yml index 0e3c11ff8a..6c3793dabb 100644 --- a/metadata/com.flxrs.dankchat.yml +++ b/metadata/com.flxrs.dankchat.yml @@ -301,6 +301,7 @@ Builds: - versionName: 2.3.0 versionCode: 169 + disable: fails to build commit: v2.3.0 subdir: app gradle: diff --git a/metadata/com.gitea.theoden8.sudaku.yml b/metadata/com.gitea.theoden8.sudaku.yml index 8ac547e355..597ac601d9 100644 --- a/metadata/com.gitea.theoden8.sudaku.yml +++ b/metadata/com.gitea.theoden8.sudaku.yml @@ -25,6 +25,7 @@ Builds: - versionName: 0.0.3 versionCode: 4 + disable: version not updated, repo down commit: v0.0.3 output: build/app/outputs/apk/fdroid/release/app-fdroid-release.apk srclibs: diff --git a/metadata/com.lesspass.android.yml b/metadata/com.lesspass.android.yml index 07f73827a7..dae7d7dea7 100644 --- a/metadata/com.lesspass.android.yml +++ b/metadata/com.lesspass.android.yml @@ -186,6 +186,7 @@ Builds: - versionName: 9.1.9 versionCode: 90109 + disable: fails to build commit: 9.1.9 subdir: mobile/android/app/ sudo: diff --git a/metadata/com.unciv.app.yml b/metadata/com.unciv.app.yml index 5364858d91..4f3ab31ef4 100644 --- a/metadata/com.unciv.app.yml +++ b/metadata/com.unciv.app.yml @@ -819,7 +819,7 @@ Builds: prebuild: sed -i -e '/maven.aliyun.com/d' ../build.gradle.kts - versionName: 3.11.3-patch1 - versionCode: 485 + versionCode: 484 commit: 3.11.3-patch1 subdir: android gradle: diff --git a/metadata/de.storchp.opentracks.osmplugin.offline.yml b/metadata/de.storchp.opentracks.osmplugin.offline.yml index 054e6ffc7c..6130bd70c7 100644 --- a/metadata/de.storchp.opentracks.osmplugin.offline.yml +++ b/metadata/de.storchp.opentracks.osmplugin.offline.yml @@ -13,12 +13,6 @@ RepoType: git Repo: https://github.com/OpenTracksApp/OSMDashboard.git Builds: - - versionName: 2.6.0 - versionCode: 17 - commit: v2.6.0 - gradle: - - offline - - versionName: 2.6.1 versionCode: 18 commit: v2.6.1 diff --git a/metadata/dev.lucanlm.antimine.yml b/metadata/dev.lucanlm.antimine.yml index 4fa096daf1..67fee973e1 100644 --- a/metadata/dev.lucanlm.antimine.yml +++ b/metadata/dev.lucanlm.antimine.yml @@ -167,19 +167,6 @@ Builds: - sed -i -e "s/':proprietary', //; s/':wear', //" ../settings.gradle - sed -i -e '/googleImplementation/d' build.gradle - - versionName: 8.2.2 - versionCode: 802021 - commit: 8.2.2 - subdir: app - gradle: - - foss - rm: - - proprietary - - wear - prebuild: - - sed -i -e "s/':proprietary', //; s/':wear', //" ../settings.gradle - - sed -i -e "/':proprietary'/d" build.gradle - - versionName: 8.3.0 versionCode: 803001 commit: 8.3.0 diff --git a/metadata/dev.msfjarvis.aps.yml b/metadata/dev.msfjarvis.aps.yml index 2766bb8b2c..f54985423d 100644 --- a/metadata/dev.msfjarvis.aps.yml +++ b/metadata/dev.msfjarvis.aps.yml @@ -86,8 +86,6 @@ Builds: - mkdir -p $HOME/.gradle - echo "org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8" >> $HOME/.gradle/gradle.properties - scanignore: - - app/src/main/assets/publicsuffixes MaintainerNotes: |- The file at `app/src/main/assets/publicsuffixes` is a version of the diff --git a/metadata/dnsfilter.android.yml b/metadata/dnsfilter.android.yml index 7ecea59658..f0bf957476 100644 --- a/metadata/dnsfilter.android.yml +++ b/metadata/dnsfilter.android.yml @@ -133,16 +133,6 @@ Builds: - material.io_icons.zip - personalDNSfilter_icon.zip - - versionName: 1.50.42.0 - versionCode: 1504203 - commit: 1.50.42.0 - subdir: app - gradle: - - yes - scanignore: - - material.io_icons.zip - - personalDNSfilter_icon.zip - - versionName: 1.50.42.4 versionCode: 1504204 commit: 1.50.42.4 diff --git a/metadata/eu.quelltext.coloring.yml b/metadata/eu.quelltext.coloring.yml index e7ab994469..31b0f5c8e8 100644 --- a/metadata/eu.quelltext.coloring.yml +++ b/metadata/eu.quelltext.coloring.yml @@ -31,6 +31,7 @@ Builds: - versionName: 1.1.4 versionCode: 4 + disable: fails to build commit: v1.1.4 gradle: - yes diff --git a/metadata/info.dvkr.screenstream.yml b/metadata/info.dvkr.screenstream.yml index 2758f91a0b..6ecc4226dd 100644 --- a/metadata/info.dvkr.screenstream.yml +++ b/metadata/info.dvkr.screenstream.yml @@ -355,49 +355,10 @@ Builds: - sed -i -e '/firebaseCrashlytics/,+2d' -e '/^android\.applicationVariants\.all {/,/^}$/d' build.gradle - - versionName: 3.4.12 - versionCode: 30412 - disable: no source for bottomsheets.aar see upstream issue 107 - commit: 3.4.12 - subdir: app - gradle: - - firebasefree - prebuild: - - sed -i -e 's|= uri("https://jitpack\.io")|"https://jitpack.io"|' ../build.gradle - - sed -i -e '/com\.google\.firebase/d; /com\.google\.gms/d' ../build.gradle - build.gradle - - sed -i -e '/firebaseCrashlytics/d' -e '/^android\.applicationVariants\.all - {/,/^}$/d' build.gradle - - - versionName: 3.4.13 - versionCode: 30413 - commit: 3.4.13 - subdir: app - gradle: - - firebasefree - prebuild: - - sed -i -e 's|= uri("https://jitpack\.io")|"https://jitpack.io"|' ../build.gradle - - sed -i -e '/com\.google\.firebase/d; /com\.google\.gms/d' ../build.gradle - build.gradle - - sed -i -e '/firebaseCrashlytics/d' -e '/^android\.applicationVariants\.all - {/,/^}$/d' build.gradle - - - versionName: 3.4.14 - versionCode: 30414 - commit: 3.4.14 - subdir: app - gradle: - - firebasefree - prebuild: - - sed -i -e 's|= uri("https://jitpack\.io")|"https://jitpack.io"|' ../build.gradle - - sed -i -e '/com\.google\.firebase/d; /com\.google\.gms/d' ../build.gradle - build.gradle - - sed -i -e '/firebaseCrashlytics/d' -e '/^android\.applicationVariants\.all - {/,/^}$/d' build.gradle - - versionName: 3.4.15 versionCode: 30415 - commit: 3.4.15 + disable: no source for bottomsheets.aar see upstream issue 107 + commit: 3.5.15 subdir: app gradle: - firebasefree diff --git a/metadata/io.anuke.mindustry.yml b/metadata/io.anuke.mindustry.yml index b1fb65bd8f..2d69e7a14a 100644 --- a/metadata/io.anuke.mindustry.yml +++ b/metadata/io.anuke.mindustry.yml @@ -178,45 +178,7 @@ Builds: scandelete: - android/libs - - versionName: 5-fdroid-105 - versionCode: 105 - commit: v105 - subdir: android - gradle: - - yes - prebuild: - - echo "androidBuildCode=$$VERCODE$$" > ../core/assets/version.properties - - echo "build=$$VERCODE$$" >> ../core/assets/version.properties - - echo "modifier=beta" >> ../core/assets/version.properties - - echo "type=fdroid" >> ../core/assets/version.properties - - echo "buildversion=$$VERCODE$$" >> gradle.properties - - echo "versionType=fdroid" >> gradle.properties - - grep archash ../gradle.properties >> gradle.properties - scanignore: - - android/src/mindustry/android/AndroidRhinoContext.java - scandelete: - - android/libs - - - versionName: 5-fdroid-106 - versionCode: 106 - commit: v106 - subdir: android - gradle: - - yes - prebuild: - - echo "androidBuildCode=$$VERCODE$$" > ../core/assets/version.properties - - echo "build=$$VERCODE$$" >> ../core/assets/version.properties - - echo "modifier=beta" >> ../core/assets/version.properties - - echo "type=fdroid" >> ../core/assets/version.properties - - echo "buildversion=$$VERCODE$$" >> gradle.properties - - echo "versionType=fdroid" >> gradle.properties - - grep archash ../gradle.properties >> gradle.properties - scanignore: - - android/src/mindustry/android/AndroidRhinoContext.java - scandelete: - - android/libs - - - versionName: 5-fdroid-107 + - versionName: 6-fdroid-107 versionCode: 107 commit: v107 subdir: android diff --git a/metadata/juliushenke.smarttt.yml b/metadata/juliushenke.smarttt.yml index 084979c821..b401caa0a8 100644 --- a/metadata/juliushenke.smarttt.yml +++ b/metadata/juliushenke.smarttt.yml @@ -26,19 +26,14 @@ Builds: gradle: - yes - - versionName: '2.4' - versionCode: 18 - commit: '2.4' - subdir: app/ - gradle: - - yes - - versionName: 2.4.1 versionCode: 19 + disable: fails to build commit: 2.4.1 subdir: app/ gradle: - yes + prebuild: echo "android.useAndroidX=true" > ../gradle.properties AutoUpdateMode: Version %v UpdateCheckMode: Tags diff --git a/metadata/la.daube.photochiotte.yml b/metadata/la.daube.photochiotte.yml index 8a5b396ae5..700f2b4f3f 100644 --- a/metadata/la.daube.photochiotte.yml +++ b/metadata/la.daube.photochiotte.yml @@ -25,16 +25,9 @@ Builds: gradle: - flavorA - - versionName: '1.9' - versionCode: 10 - commit: v1.9 - subdir: app - gradle: - - flavorA - ndk: r21d - - versionName: '1.10' versionCode: 11 + disable: fails to build commit: v1.10 subdir: app gradle: diff --git a/metadata/lu.cases.tacos.yml b/metadata/lu.cases.tacos.yml index 2c6b6901bd..4aba19225d 100644 --- a/metadata/lu.cases.tacos.yml +++ b/metadata/lu.cases.tacos.yml @@ -17,6 +17,7 @@ Repo: https://github.com/CASES-LU/TACOS.git Builds: - versionName: 0.0.23 versionCode: 23 + disable: fails to build commit: v0.0.23 sudo: - apt update || apt update diff --git a/metadata/openfoodfacts.github.scrachx.openfood.yml b/metadata/openfoodfacts.github.scrachx.openfood.yml index 1f0683922b..fa148c005c 100644 --- a/metadata/openfoodfacts.github.scrachx.openfood.yml +++ b/metadata/openfoodfacts.github.scrachx.openfood.yml @@ -418,7 +418,7 @@ Builds: - versionName: 3.4.0 versionCode: 340 - commit: 3.4.0 + commit: 3.4.2 subdir: app gradle: - 'off' diff --git a/metadata/org.dash.electrum.electrum_dash.yml b/metadata/org.dash.electrum.electrum_dash.yml index a0a47c2c87..92e9898e21 100644 --- a/metadata/org.dash.electrum.electrum_dash.yml +++ b/metadata/org.dash.electrum.electrum_dash.yml @@ -377,7 +377,7 @@ Builds: libncursesw5-dev tk-dev build-essential ccache libgtk2.0-0:i386 libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 libidn11:i386 openjdk-8-jdk unzip libffi-dev libltdl-dev ffmpeg libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libportmidi-dev - libswscale-dev libavformat-dev libavcodec-dev virtualenv libgmp-dev + libswscale-dev libavformat-dev libavcodec-dev virtualenv libgmp-dev libcups2:i386 - cd build/srclib/cpython - ./configure - make -j`nproc` @@ -444,7 +444,7 @@ Builds: libncursesw5-dev tk-dev build-essential ccache libgtk2.0-0:i386 libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 libidn11:i386 openjdk-8-jdk unzip libffi-dev libltdl-dev ffmpeg libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libportmidi-dev - libswscale-dev libavformat-dev libavcodec-dev virtualenv libgmp-dev + libswscale-dev libavformat-dev libavcodec-dev virtualenv libgmp-dev libcups2:i386 - cd build/srclib/cpython - ./configure - make -j`nproc` diff --git a/metadata/org.emunix.unipatcher.yml b/metadata/org.emunix.unipatcher.yml index 5affb94acd..89155600c7 100644 --- a/metadata/org.emunix.unipatcher.yml +++ b/metadata/org.emunix.unipatcher.yml @@ -105,29 +105,16 @@ Builds: - app/src/main/cpp/xdelta3/xdelta3/examples ndk: r16b - - versionName: '0.17' - versionCode: 170000 - commit: v0.17 - subdir: app - submodules: true - gradle: - - free - scanignore: - - app/src/test - - app/src/main/cpp/xdelta3/xdelta3/examples - ndk: r16b - - versionName: 0.17.1 versionCode: 170100 + disable: fails to build commit: v0.17.1 subdir: app - submodules: true gradle: - free scanignore: - app/src/test - - app/src/main/cpp/xdelta3/xdelta3/examples - ndk: r16b + ndk: r21d AutoUpdateMode: Version v%v UpdateCheckMode: Tags diff --git a/metadata/org.gateshipone.odyssey.yml b/metadata/org.gateshipone.odyssey.yml index f8d02f0433..602e45f7c2 100644 --- a/metadata/org.gateshipone.odyssey.yml +++ b/metadata/org.gateshipone.odyssey.yml @@ -218,6 +218,8 @@ Builds: subdir: app gradle: - yes + rm: + - images/ic_launcher.zip AutoUpdateMode: Version release-%c UpdateCheckMode: Tags diff --git a/metadata/org.openobservatory.ooniprobe.yml b/metadata/org.openobservatory.ooniprobe.yml index 32c873ca19..2312d3c08c 100644 --- a/metadata/org.openobservatory.ooniprobe.yml +++ b/metadata/org.openobservatory.ooniprobe.yml @@ -258,9 +258,8 @@ Builds: subdir: app gradle: - stableFdroid - prebuild: - - sed -i -e '/com.google.gms/d' build.gradle ../build.gradle - - sed -i -e 's/21.0.6113669/21.3.6528147/' build.gradle + prebuild: sed -i -e '/fabric/d' -e 's/21.0.6113669/21.3.6528147/' -e '/com.google.gms/d' + ../build.gradle build.gradle ndk: r21d AutoUpdateMode: Version v%v diff --git a/metadata/org.ostrya.presencepublisher.yml b/metadata/org.ostrya.presencepublisher.yml index afd4dc3892..6255f493c7 100644 --- a/metadata/org.ostrya.presencepublisher.yml +++ b/metadata/org.ostrya.presencepublisher.yml @@ -123,15 +123,9 @@ Builds: gradle: - yes - - versionName: 2.2.0 - versionCode: 30 - commit: v2.2.0 - subdir: app - gradle: - - yes - - versionName: 2.2.1 versionCode: 31 + disable: fails to build commit: v2.2.1 subdir: app gradle: diff --git a/metadata/org.smc.inputmethod.indic.yml b/metadata/org.smc.inputmethod.indic.yml index d011c2d6b8..05d3b0c61c 100644 --- a/metadata/org.smc.inputmethod.indic.yml +++ b/metadata/org.smc.inputmethod.indic.yml @@ -206,26 +206,6 @@ Builds: - mv ../native/libs/* jniLibs/ ndk: r21d - - versionName: '3.2' - versionCode: 51 - commit: v3.2 - subdir: java - submodules: true - gradle: - - yes - forcevercode: true - rm: - - dictionaries/ - - dictionaries-indic/ - - java/jniLibs/ - prebuild: - - sed -i '/include "armeabi-v7a", "arm64-v8a"/c\include "armeabi-v7a"' build.gradle - - sed -i '/exclude "x86", "x86_64"/c\exclude "arm64-v8a", "x86", "x86_64"' build.gradle - build: - - $$NDK$$/ndk-build -e "APP_ABI=armeabi-v7a" -e "APP_CFLAGS += -w" -C ../native/jni - - mv ../native/libs/* jniLibs/ - ndk: r21d - - versionName: '3.2' versionCode: 52 commit: v3.2 diff --git a/metadata/ru.yanus171.feedexfork.yml b/metadata/ru.yanus171.feedexfork.yml index 0e616cb97f..055218ba6f 100644 --- a/metadata/ru.yanus171.feedexfork.yml +++ b/metadata/ru.yanus171.feedexfork.yml @@ -312,6 +312,7 @@ Builds: - versionName: 0.15.10 versionCode: 220 + disable: fails to build commit: v0.15.10 subdir: FlymFork gradle: