From 51e2ad36d9e56026050e8a929a77ff91afcb1d88 Mon Sep 17 00:00:00 2001 From: Licaon_Kter Date: Sat, 2 May 2020 12:03:20 +0300 Subject: [PATCH] Misc fixes after cycle --- metadata/ch.protonvpn.android.yml | 3 ++ metadata/com.agateau.tinywheels.android.yml | 1 + metadata/com.mattermost.rnbeta.yml | 1 + metadata/de.moekadu.metronome.yml | 13 ++------ metadata/im.pattle.app.yml | 1 + metadata/network.ubic.ubic.yml | 34 +-------------------- metadata/org.adaway.yml | 2 +- metadata/org.commonvoice.saverio.yml | 7 ----- metadata/org.mbach.lemonde.yml | 13 +------- metadata/threads.server.yml | 1 + 10 files changed, 13 insertions(+), 63 deletions(-) diff --git a/metadata/ch.protonvpn.android.yml b/metadata/ch.protonvpn.android.yml index dcda4dc803..8959f3b9e2 100644 --- a/metadata/ch.protonvpn.android.yml +++ b/metadata/ch.protonvpn.android.yml @@ -18,6 +18,9 @@ Builds: commit: 2.1.3 subdir: app submodules: true + sudo: + - apt-get update || apt-get update + - apt-get install -y --no-install-recommends libgmp-dev patch: - openvpn-build.patch gradle: diff --git a/metadata/com.agateau.tinywheels.android.yml b/metadata/com.agateau.tinywheels.android.yml index 706281c5f3..7d0d32445e 100644 --- a/metadata/com.agateau.tinywheels.android.yml +++ b/metadata/com.agateau.tinywheels.android.yml @@ -130,6 +130,7 @@ Builds: - versionName: 0.16.0 versionCode: 16 + disable: fails to build commit: 0.16.0 subdir: android sudo: diff --git a/metadata/com.mattermost.rnbeta.yml b/metadata/com.mattermost.rnbeta.yml index ac66fce61f..810042d974 100644 --- a/metadata/com.mattermost.rnbeta.yml +++ b/metadata/com.mattermost.rnbeta.yml @@ -476,6 +476,7 @@ MaintainerNotes: |- scanignore is used to allow the "node_modules/react-native/android" local Maven repository. +ArchivePolicy: 4 versions AutoUpdateMode: None UpdateCheckMode: Tags CurrentVersion: 1.30.1 diff --git a/metadata/de.moekadu.metronome.yml b/metadata/de.moekadu.metronome.yml index 1a60392dbb..7917194e8b 100644 --- a/metadata/de.moekadu.metronome.yml +++ b/metadata/de.moekadu.metronome.yml @@ -31,14 +31,7 @@ Builds: gradle: - yes - - versionName: 1.6.0 - versionCode: 14 - commit: v1.6.0 - subdir: app - gradle: - - yes - AutoUpdateMode: Version v%v -UpdateCheckMode: Tags -CurrentVersion: 1.6.0 -CurrentVersionCode: 14 +UpdateCheckMode: Tags .*[0-9]$ +CurrentVersion: 1.5.1 +CurrentVersionCode: 13 diff --git a/metadata/im.pattle.app.yml b/metadata/im.pattle.app.yml index d82f5f3ace..e3cd77f5d1 100644 --- a/metadata/im.pattle.app.yml +++ b/metadata/im.pattle.app.yml @@ -100,6 +100,7 @@ Builds: - versionName: 0.15.0 versionCode: 741 + disable: remove non-foss is wip commit: v0.15.0 output: build/app/outputs/apk/fdroid/release/app-fdroid-release.apk srclibs: diff --git a/metadata/network.ubic.ubic.yml b/metadata/network.ubic.ubic.yml index 20ad96d973..17949ebaa4 100644 --- a/metadata/network.ubic.ubic.yml +++ b/metadata/network.ubic.ubic.yml @@ -86,41 +86,9 @@ Builds: - mv $$openssl_for_ios_and_android$$/libs/x86/lib/*.a ../distribution/openssl/x86/lib/ ndk: r14b - - versionName: '4.3' - versionCode: 12 - disable: fails to build - commit: '4.3' - subdir: app - sudo: - - apt-get update || apt-get update - - apt-get install -y ninja-build - gradle: - - yes - srclibs: - - openssl_for_ios_and_android@android_openssl-1.1.0f_curl-7.54.1 - prebuild: - - sed -i -e 's/zlib \\/no-zlib \\/' $$openssl_for_ios_and_android$$/build-openssl4android.sh - - sed -i '/systemProp\.http\.proxy/d' ~/.gradle/gradle.properties - scandelete: - - app/CMakeFiles/ - - distribution/ - build: - - pushd $$openssl_for_ios_and_android$$ - - ./build-openssl4android.sh android - - popd - - mv $$openssl_for_ios_and_android$$/libs/armeabi/lib/*.a ../distribution/openssl/armeabi/lib/ - - pushd $$openssl_for_ios_and_android$$ - - ./build-openssl4android.sh android-armeabi - - popd - - mv $$openssl_for_ios_and_android$$/libs/armeabi-v7a/lib/*.a ../distribution/openssl/armeabi-v7a/lib/ - - pushd $$openssl_for_ios_and_android$$ - - ./build-openssl4android.sh android-x86 - - popd - - mv $$openssl_for_ios_and_android$$/libs/x86/lib/*.a ../distribution/openssl/x86/lib/ - ndk: r14b - - versionName: '6.3' versionCode: 17 + disable: fails to build commit: '6.3' subdir: app sudo: diff --git a/metadata/org.adaway.yml b/metadata/org.adaway.yml index d9c83f5f46..e15d684d95 100644 --- a/metadata/org.adaway.yml +++ b/metadata/org.adaway.yml @@ -507,7 +507,7 @@ Builds: subdir: app gradle: - yes - ndk: r20b + ndk: r21 AutoUpdateMode: Version v%v UpdateCheckMode: Tags .*[0-9]$ diff --git a/metadata/org.commonvoice.saverio.yml b/metadata/org.commonvoice.saverio.yml index b4de9e0bbc..8340c7fccb 100644 --- a/metadata/org.commonvoice.saverio.yml +++ b/metadata/org.commonvoice.saverio.yml @@ -61,13 +61,6 @@ Builds: gradle: - yes - - versionName: 1.1.1 - versionCode: 91 - commit: 1.1.1 - subdir: app - gradle: - - yes - - versionName: 1.2.1 versionCode: 93 commit: 1.2.1 diff --git a/metadata/org.mbach.lemonde.yml b/metadata/org.mbach.lemonde.yml index 570093f7dd..118faa4ec5 100644 --- a/metadata/org.mbach.lemonde.yml +++ b/metadata/org.mbach.lemonde.yml @@ -152,18 +152,7 @@ Builds: ../build.gradle - sed -i -e 's/gradle-4.10/gradle-5.6.2/' gradle/wrapper/gradle-wrapper.properties - - versionName: '2.0' - versionCode: 22 - commit: v2.0 - subdir: app - gradle: - - yes - prebuild: - - sed -i -e 's/com.android.tools.build:gradle:3.2.0-alpha05/com.android.tools.build:gradle:3.1.2/g' - ../build.gradle - - sed -i -e 's/gradle-4.10/gradle-5.6.2/' gradle/wrapper/gradle-wrapper.properties - -AutoUpdateMode: Version v%v +AutoUpdateMode: None UpdateCheckMode: Tags CurrentVersion: '2.0' CurrentVersionCode: 22 diff --git a/metadata/threads.server.yml b/metadata/threads.server.yml index de4a1b2fa2..1f2557a60e 100644 --- a/metadata/threads.server.yml +++ b/metadata/threads.server.yml @@ -57,6 +57,7 @@ Builds: subdir: app gradle: - yes + ndk: r21 AutoUpdateMode: Version %v UpdateCheckMode: Tags