From 1df70f8754c43da3c06eefa62ff6f5c2c3fee2c7 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Wed, 7 Apr 2021 08:48:18 +0200 Subject: [PATCH] Misc fixes after build --- metadata/app.zeusln.zeus.yml | 1 + metadata/ch.blinkenlights.android.vanilla.yml | 24 ------------------- metadata/ch.protonvpn.android.yml | 7 +++--- ....greenaddress.greenbits_android_wallet.yml | 1 + metadata/com.invoiceninja.app.yml | 1 + metadata/com.kmac5dev.mindfulnotifier.yml | 2 +- metadata/com.rtbishop.look4sat.yml | 7 ------ metadata/dev.lucanlm.antimine.yml | 1 + metadata/oppen.gemini.ariane.yml | 4 ++++ metadata/org.adaway.yml | 1 + metadata/org.windvolt.yml | 7 ------ metadata/org.xcsoar.yml | 21 ---------------- 12 files changed, 14 insertions(+), 63 deletions(-) diff --git a/metadata/app.zeusln.zeus.yml b/metadata/app.zeusln.zeus.yml index ba6efb1ae9..f59bf780f9 100644 --- a/metadata/app.zeusln.zeus.yml +++ b/metadata/app.zeusln.zeus.yml @@ -100,6 +100,7 @@ Builds: - versionName: 0.5.1 versionCode: 24 + disable: g++ Command not found https://gitlab.com/fdroid/fdroiddata/-/merge_requests/8691 commit: v0.5.1 subdir: android/app sudo: diff --git a/metadata/ch.blinkenlights.android.vanilla.yml b/metadata/ch.blinkenlights.android.vanilla.yml index ec7d00ce91..7e9f6aecd1 100644 --- a/metadata/ch.blinkenlights.android.vanilla.yml +++ b/metadata/ch.blinkenlights.android.vanilla.yml @@ -361,30 +361,6 @@ Builds: - tr -d '\r' < gradle-wrapper.properties_orig >gradle-wrapper.properties - popd - - versionName: 1.0.92 - versionCode: 10920 - commit: 1.0.92 - subdir: app - gradle: - - yes - prebuild: - - pushd ../gradle/wrapper - - mv gradle-wrapper.properties gradle-wrapper.properties_orig - - tr -d '\r' < gradle-wrapper.properties_orig >gradle-wrapper.properties - - popd - - - versionName: 1.0.92 - versionCode: 10922 - commit: 1.0.92 - subdir: app - gradle: - - yes - prebuild: - - pushd ../gradle/wrapper - - mv gradle-wrapper.properties gradle-wrapper.properties_orig - - tr -d '\r' < gradle-wrapper.properties_orig >gradle-wrapper.properties - - popd - - versionName: 1.0.92 versionCode: 10923 commit: 1.0.92 diff --git a/metadata/ch.protonvpn.android.yml b/metadata/ch.protonvpn.android.yml index ba414cc7b8..66bb75070a 100644 --- a/metadata/ch.protonvpn.android.yml +++ b/metadata/ch.protonvpn.android.yml @@ -547,8 +547,6 @@ Builds: sudo: - apt-get update || apt-get update - apt-get install -y --no-install-recommends libgmp-dev - patch: - - openvpn-build.patch gradle: - prod output: build/outputs/apk/prod/release/ProtonVPN-*-prod-release-unsigned.apk @@ -560,9 +558,12 @@ Builds: - openvpn/src/main/cpp/mbedtls/tests - openvpn/src/main/cpp/openvpn3/test/unittests - strongswan/testing/hosts/alice/etc/raddb/certs/random + - openvpn/src/main/cpp/mbedtls/programs/fuzz/corpuses/* prebuild: - sed -i -e '/triple/d' -e '/play\ {/,+4d' build.gradle - sed -i -e '/kotlinx/d' ../build.gradle + - sed -i -e 's/21.3.6528147/21.4.7075529/' ../openvpn/build.gradle.kts + - sed -i -e 's/21.3.6528147/21.4.7075529/' build.gradle - pushd ../strongswan - git clone git://git.strongswan.org/android-ndk-boringssl.git -b ndk-static src/frontends/android/app/src/main/jni/openssl @@ -587,7 +588,7 @@ Builds: - rm -fr openvpn/build/tmp - rm -fr openvpn/.cxx - popd - ndk: r21d + ndk: r21e gradleprops: - buildUniversalApk diff --git a/metadata/com.greenaddress.greenbits_android_wallet.yml b/metadata/com.greenaddress.greenbits_android_wallet.yml index 24c0e95e48..1228a1e8b7 100644 --- a/metadata/com.greenaddress.greenbits_android_wallet.yml +++ b/metadata/com.greenaddress.greenbits_android_wallet.yml @@ -1928,6 +1928,7 @@ Builds: - versionName: 3.5.5 versionCode: 355 + disable: fails to build https://github.com/Blockstream/green_android/issues/114 commit: release_3.5.5 timeout: 25200 subdir: app diff --git a/metadata/com.invoiceninja.app.yml b/metadata/com.invoiceninja.app.yml index e4b2b5ac17..40eb524b0f 100644 --- a/metadata/com.invoiceninja.app.yml +++ b/metadata/com.invoiceninja.app.yml @@ -41,6 +41,7 @@ Builds: - versionName: 5.0.45 versionCode: 45 + disable: no git tag commit: v5.0.45 output: build/app/outputs/flutter-apk/app-release.apk srclibs: diff --git a/metadata/com.kmac5dev.mindfulnotifier.yml b/metadata/com.kmac5dev.mindfulnotifier.yml index d59a51bcf5..5335dcef32 100644 --- a/metadata/com.kmac5dev.mindfulnotifier.yml +++ b/metadata/com.kmac5dev.mindfulnotifier.yml @@ -68,7 +68,7 @@ Builds: commit: v1.0.10 output: build/app/outputs/apk/release/app-release.apk srclibs: - - flutter@1.22.5 + - flutter@2.0.3 prebuild: echo 'android.applicationVariants.all { variant -> variant.outputs.all { output -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle build: diff --git a/metadata/com.rtbishop.look4sat.yml b/metadata/com.rtbishop.look4sat.yml index c618cb78b2..962296fcaf 100644 --- a/metadata/com.rtbishop.look4sat.yml +++ b/metadata/com.rtbishop.look4sat.yml @@ -76,13 +76,6 @@ Builds: gradle: - yes - - versionName: 2.3.0 - versionCode: 230 - commit: v2.3.0 - subdir: app - gradle: - - yes - - versionName: 2.3.2 versionCode: 232 commit: v2.3.2 diff --git a/metadata/dev.lucanlm.antimine.yml b/metadata/dev.lucanlm.antimine.yml index c2b36fdb8e..3614e85696 100644 --- a/metadata/dev.lucanlm.antimine.yml +++ b/metadata/dev.lucanlm.antimine.yml @@ -442,6 +442,7 @@ Builds: - versionName: 10.0.2 versionCode: 1000021 + disable: contains binaries https://github.com/lucasnlm/antimine-android/issues/261 commit: 10.0.2 subdir: app gradle: diff --git a/metadata/oppen.gemini.ariane.yml b/metadata/oppen.gemini.ariane.yml index 338866a516..1b09e7e122 100644 --- a/metadata/oppen.gemini.ariane.yml +++ b/metadata/oppen.gemini.ariane.yml @@ -32,6 +32,10 @@ Builds: versionCode: 42 commit: 2.4.0 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - yes diff --git a/metadata/org.adaway.yml b/metadata/org.adaway.yml index ac27fc9837..fa07c41699 100644 --- a/metadata/org.adaway.yml +++ b/metadata/org.adaway.yml @@ -594,6 +594,7 @@ Builds: subdir: app gradle: - yes + prebuild: sed -i -e 's/22.1.7171670/22.0.7026061/' build.gradle scanignore: - Resources/symlink_hosts_to_data.zip ndk: r22 diff --git a/metadata/org.windvolt.yml b/metadata/org.windvolt.yml index 1e35b89be1..409d04ade2 100644 --- a/metadata/org.windvolt.yml +++ b/metadata/org.windvolt.yml @@ -28,13 +28,6 @@ Builds: gradle: - yes - - versionName: '1.10' - versionCode: 110 - commit: V1.10 - subdir: app - gradle: - - yes - AutoUpdateMode: Version V%v UpdateCheckMode: Tags CurrentVersion: '1.04' diff --git a/metadata/org.xcsoar.yml b/metadata/org.xcsoar.yml index d1238f0011..2c9a2ebbe8 100644 --- a/metadata/org.xcsoar.yml +++ b/metadata/org.xcsoar.yml @@ -306,27 +306,6 @@ Builds: build: make TARGET=ANDROID7NEON DEBUG=n TESTING=n -j`nproc` ndk: r15c - - versionName: '7.2' - versionCode: 123 - commit: v7.2 - submodules: true - sudo: - - apt-get update || apt-get update - - apt-get install -y g++ vorbis-tools librsvg2-bin imagemagick - output: output/ANDROID7NEON/opt/build/unsigned.apk - rm: - - android/ioio/release/*.zip - - android/ioio/release/apps/*.zip - - android/ioio/release/software/*.zip - - android/ioio/release/firmware/device-bootloader/*.zip - - android/ioio/release/firmware/bootloader/*.zip - - android/ioio/software/IOIODude/lib - - android/ioio/software/IOIOLib/target/pc/lib - - android/ioio/software/applications/IOIOConnectionTester/lib - - android/ioio/software/applications/pc/jar-in-jar-loader.zip - build: make TARGET=ANDROID7NEON DEBUG=n TESTING=n -j`nproc` - ndk: r15c - - versionName: '7.3' versionCode: 124 commit: v7.3