From 4224876a2525666d8c70f0c639c486db3b571aba Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Fri, 26 Mar 2021 08:32:19 +0100 Subject: [PATCH] Misc fixes --- metadata/com.antony.muzei.pixiv.yml | 1 + metadata/com.enjoyingfoss.feeel.yml | 2 +- metadata/com.flxrs.dankchat.yml | 4 +++ metadata/com.gelakinetic.mtgfam.yml | 2 -- metadata/com.github.vauvenal5.yaga.yml | 26 ------------------- ....greenaddress.greenbits_android_wallet.yml | 2 ++ metadata/com.jakewharton.sdksearch.yml | 2 ++ metadata/com.ktprograms.ohmsnow.yml | 1 + metadata/com.kunzisoft.keepass.libre.yml | 2 +- metadata/com.limelight.yml | 1 + metadata/com.lucao.limpazap.yml | 1 + metadata/com.securefilemanager.app.yml | 4 +++ metadata/com.tutpro.baresip.plus.yml | 2 ++ metadata/com.tutpro.baresip.yml | 2 ++ metadata/eu.pretix.pretixprint.yml | 1 + .../io.github.muntashirakon.AppManager.yml | 1 + metadata/me.wolszon.fastshopping.yml | 2 +- .../net.kollnig.missioncontrol.fdroid.yml | 2 +- metadata/org.mbach.lemonde.yml | 1 + metadata/org.sufficientlysecure.keychain.yml | 4 +-- metadata/org.zerodogg.migraineLog.yml | 1 - metadata/ru.playsoftware.j2meloader.yml | 2 +- 22 files changed, 30 insertions(+), 36 deletions(-) diff --git a/metadata/com.antony.muzei.pixiv.yml b/metadata/com.antony.muzei.pixiv.yml index b8d62ecc0b..7e49839cf5 100644 --- a/metadata/com.antony.muzei.pixiv.yml +++ b/metadata/com.antony.muzei.pixiv.yml @@ -102,6 +102,7 @@ Builds: - versionName: 3.4.2 versionCode: 299 + disable: old version code commit: 3.4.2 subdir: app gradle: diff --git a/metadata/com.enjoyingfoss.feeel.yml b/metadata/com.enjoyingfoss.feeel.yml index 719b3cb442..4270ab2e73 100644 --- a/metadata/com.enjoyingfoss.feeel.yml +++ b/metadata/com.enjoyingfoss.feeel.yml @@ -99,7 +99,7 @@ Builds: commit: 2.0.2 output: build/app/outputs/apk/release/app-release.apk srclibs: - - flutter@1.25.0-8.1.pre + - 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.flxrs.dankchat.yml b/metadata/com.flxrs.dankchat.yml index 3655bb2538..875266f1b9 100644 --- a/metadata/com.flxrs.dankchat.yml +++ b/metadata/com.flxrs.dankchat.yml @@ -382,6 +382,8 @@ Builds: - versionName: 2.6.0 versionCode: 180 + disable: 'fails to build: DeveloperSettingsFragment.kt:16: Error: Upgrade Fragment + version to at least 1.3.0.' commit: v2.6.0 subdir: app gradle: @@ -390,6 +392,8 @@ Builds: - versionName: 2.6.1 versionCode: 181 + disable: 'fails to build: DeveloperSettingsFragment.kt:16: Error: Upgrade Fragment + version to at least 1.3.0.' commit: v2.6.1 subdir: app gradle: diff --git a/metadata/com.gelakinetic.mtgfam.yml b/metadata/com.gelakinetic.mtgfam.yml index 3d4c2525f5..406f73c389 100644 --- a/metadata/com.gelakinetic.mtgfam.yml +++ b/metadata/com.gelakinetic.mtgfam.yml @@ -491,8 +491,6 @@ Builds: gradle: - yes forceversion: true - rm: - - mobile/annotations.jar scanignore: - mobile/src/main/res/raw/datagz diff --git a/metadata/com.github.vauvenal5.yaga.yml b/metadata/com.github.vauvenal5.yaga.yml index d97fa5f3e2..fc08e18be1 100644 --- a/metadata/com.github.vauvenal5.yaga.yml +++ b/metadata/com.github.vauvenal5.yaga.yml @@ -220,32 +220,6 @@ Builds: - $$flutter$$/bin/flutter pub run build_runner build --delete-conflicting-outputs - $$flutter$$/bin/flutter build apk --flavor fdroid - - versionName: 0.22.7 - versionCode: 2207 - commit: v0.22.7 - output: build/app/outputs/flutter-apk/app-fdroid-release.apk - srclibs: - - flutter@1.22.4 - build: - - $$flutter$$/bin/flutter config --no-analytics - - $$flutter$$/bin/flutter pub get - - $$flutter$$/bin/flutter pub run flutter_launcher_icons:main - - $$flutter$$/bin/flutter pub run build_runner build --delete-conflicting-outputs - - $$flutter$$/bin/flutter build apk --flavor fdroid - - - versionName: 0.22.8 - versionCode: 2208 - commit: v0.22.8 - output: build/app/outputs/flutter-apk/app-fdroid-release.apk - srclibs: - - flutter@1.22.4 - build: - - $$flutter$$/bin/flutter config --no-analytics - - $$flutter$$/bin/flutter pub get - - $$flutter$$/bin/flutter pub run flutter_launcher_icons:main - - $$flutter$$/bin/flutter pub run build_runner build --delete-conflicting-outputs - - $$flutter$$/bin/flutter build apk --flavor fdroid - - versionName: 0.23.1 versionCode: 2301 commit: v0.23.1 diff --git a/metadata/com.greenaddress.greenbits_android_wallet.yml b/metadata/com.greenaddress.greenbits_android_wallet.yml index a28495fa2a..3da46757b0 100644 --- a/metadata/com.greenaddress.greenbits_android_wallet.yml +++ b/metadata/com.greenaddress.greenbits_android_wallet.yml @@ -1903,6 +1903,8 @@ Builds: - versionName: 3.5.4 versionCode: 354 + disable: 'fails to build: Type com.blockstream.libwally.Wally$Obj is defined multiple + times' commit: release_3.5.4 timeout: 25200 subdir: app diff --git a/metadata/com.jakewharton.sdksearch.yml b/metadata/com.jakewharton.sdksearch.yml index 7ce0c99485..84315fd932 100644 --- a/metadata/com.jakewharton.sdksearch.yml +++ b/metadata/com.jakewharton.sdksearch.yml @@ -24,6 +24,8 @@ Builds: prebuild: sed -i -e 's,"https://kotlin.bintray.com/kotlinx","https://jitpack.io",g' -e '/dl.bintray.com/d' -e 's,org.jetbrains.kotlin:kotlin-frontend-plugin,com.github.Kotlin.kotlin-frontend-plugin:kotlin-frontend,g' build.gradle + scanignore: + - roboto/src/main/res/font/roboto_mono_regular.ttf AutoUpdateMode: None UpdateCheckMode: Tags diff --git a/metadata/com.ktprograms.ohmsnow.yml b/metadata/com.ktprograms.ohmsnow.yml index 2c13c4b113..2f48f75589 100644 --- a/metadata/com.ktprograms.ohmsnow.yml +++ b/metadata/com.ktprograms.ohmsnow.yml @@ -49,6 +49,7 @@ Builds: - versionName: v0.1.5-beta versionCode: 6 + disable: 'fails to build: resource drawable/band_6 not found.' commit: v0.1.5-beta subdir: app gradle: diff --git a/metadata/com.kunzisoft.keepass.libre.yml b/metadata/com.kunzisoft.keepass.libre.yml index 937485abcb..d2892426e0 100644 --- a/metadata/com.kunzisoft.keepass.libre.yml +++ b/metadata/com.kunzisoft.keepass.libre.yml @@ -360,7 +360,7 @@ Builds: - libre scanignore: - app/src/main/assets/publicsuffixes - ndk: r21d + ndk: r21e MaintainerNotes: |- The file at `app/src/main/assets/publicsuffixes` is a version of the diff --git a/metadata/com.limelight.yml b/metadata/com.limelight.yml index fbced171f8..3949ee974d 100644 --- a/metadata/com.limelight.yml +++ b/metadata/com.limelight.yml @@ -2713,6 +2713,7 @@ Builds: - versionName: 9.8.4 versionCode: 255 + disable: requires NDK 22 which is not compatible with OpenSSL 1.1.1 https://github.com/openssl/openssl/pull/13694 commit: v9.8.4 subdir: app submodules: true diff --git a/metadata/com.lucao.limpazap.yml b/metadata/com.lucao.limpazap.yml index 11f160e6cf..649c44c97a 100644 --- a/metadata/com.lucao.limpazap.yml +++ b/metadata/com.lucao.limpazap.yml @@ -26,6 +26,7 @@ Builds: - versionName: 3.0.0 versionCode: 12 + disable: old version code commit: '3.0' output: build/app/outputs/flutter-apk/app-release.apk srclibs: diff --git a/metadata/com.securefilemanager.app.yml b/metadata/com.securefilemanager.app.yml index ccc7ff967c..11d9d72100 100644 --- a/metadata/com.securefilemanager.app.yml +++ b/metadata/com.securefilemanager.app.yml @@ -30,6 +30,10 @@ Builds: versionCode: 6 commit: v0.1.4-beta 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/com.tutpro.baresip.plus.yml b/metadata/com.tutpro.baresip.plus.yml index 39552fc79c..11cf60e280 100644 --- a/metadata/com.tutpro.baresip.plus.yml +++ b/metadata/com.tutpro.baresip.plus.yml @@ -533,6 +533,8 @@ Builds: - versionName: 15.1.0 versionCode: 36 + disable: fails to build "baresip_link" is translated here but not found in default + locale commit: v15.1.0 subdir: app sudo: diff --git a/metadata/com.tutpro.baresip.yml b/metadata/com.tutpro.baresip.yml index 2efe2af710..269be7da0f 100644 --- a/metadata/com.tutpro.baresip.yml +++ b/metadata/com.tutpro.baresip.yml @@ -1654,6 +1654,8 @@ Builds: - versionName: 29.1.0 versionCode: 161 + disable: 'fails to build: "baresip_link" is translated here but not found in default + locale' commit: 29.1.0 subdir: app gradle: diff --git a/metadata/eu.pretix.pretixprint.yml b/metadata/eu.pretix.pretixprint.yml index 15dde185ff..749593ebfa 100644 --- a/metadata/eu.pretix.pretixprint.yml +++ b/metadata/eu.pretix.pretixprint.yml @@ -100,6 +100,7 @@ Builds: - versionName: 2.3.2 versionCode: 26 + disable: 'fails to build: USB.kt: (19, 27): Unresolved reference: io' commit: 2.3.2 subdir: pretixprint/app submodules: true diff --git a/metadata/io.github.muntashirakon.AppManager.yml b/metadata/io.github.muntashirakon.AppManager.yml index 17acf78bc1..3b1c064f2d 100644 --- a/metadata/io.github.muntashirakon.AppManager.yml +++ b/metadata/io.github.muntashirakon.AppManager.yml @@ -49,6 +49,7 @@ Builds: - versionName: 2.5.20 versionCode: 375 + disable: fails to clone submodule toybox commit: v2.5.20 subdir: app submodules: true diff --git a/metadata/me.wolszon.fastshopping.yml b/metadata/me.wolszon.fastshopping.yml index 028a08cb77..bd235ec19d 100644 --- a/metadata/me.wolszon.fastshopping.yml +++ b/metadata/me.wolszon.fastshopping.yml @@ -142,7 +142,7 @@ Builds: - $$flutter$$/bin/flutter build apk --flavor foss - versionName: 3.0.3 - versionCode: 22 + versionCode: 21 commit: v3.0.3 output: build/app/outputs/apk/foss/release/app-foss-release.apk srclibs: diff --git a/metadata/net.kollnig.missioncontrol.fdroid.yml b/metadata/net.kollnig.missioncontrol.fdroid.yml index f0ca859470..aad693ab54 100644 --- a/metadata/net.kollnig.missioncontrol.fdroid.yml +++ b/metadata/net.kollnig.missioncontrol.fdroid.yml @@ -178,7 +178,7 @@ Builds: subdir: app gradle: - fdroid - prebuild: sed -i -e 's/21.0.6113669/21.3.6528147/' build.gradle + prebuild: sed -i -e 's/21.0.6113669/21.4.7075529/' build.gradle ndk: r21e AutoUpdateMode: Version %c diff --git a/metadata/org.mbach.lemonde.yml b/metadata/org.mbach.lemonde.yml index 06b2c3a3c6..3051da1bc8 100644 --- a/metadata/org.mbach.lemonde.yml +++ b/metadata/org.mbach.lemonde.yml @@ -282,6 +282,7 @@ Builds: - versionName: 2.1.6 versionCode: 29 + disable: 'fails to build: Unexpected token vm.js:80:10' commit: 2.1.6 subdir: android/app sudo: diff --git a/metadata/org.sufficientlysecure.keychain.yml b/metadata/org.sufficientlysecure.keychain.yml index f88663d496..7eecce7a17 100644 --- a/metadata/org.sufficientlysecure.keychain.yml +++ b/metadata/org.sufficientlysecure.keychain.yml @@ -733,7 +733,7 @@ Builds: submodules: true gradle: - fdroid - prebuild: echo 'org.gradle.jvmargs=-Xmx1g' >> ../gradle.properties + prebuild: echo -e '\norg.gradle.jvmargs=-Xmx1g' >> ../gradle.properties scandelete: - extern/bouncycastle/libs - extern/bouncycastle/test @@ -748,7 +748,7 @@ Builds: submodules: true gradle: - fdroid - prebuild: echo 'org.gradle.jvmargs=-Xmx1g' >> ../gradle.properties + prebuild: echo -e '\norg.gradle.jvmargs=-Xmx1g' >> ../gradle.properties scandelete: - extern/bouncycastle/libs - extern/bouncycastle/test diff --git a/metadata/org.zerodogg.migraineLog.yml b/metadata/org.zerodogg.migraineLog.yml index c0bed8278f..a486e2e30e 100644 --- a/metadata/org.zerodogg.migraineLog.yml +++ b/metadata/org.zerodogg.migraineLog.yml @@ -97,7 +97,6 @@ Builds: rm: - ios - test - - scripts prebuild: - echo "sdk.dir=$$SDK$$" > android/local.properties - echo "flutter.sdk=$$flutter$$" >> android/local.properties diff --git a/metadata/ru.playsoftware.j2meloader.yml b/metadata/ru.playsoftware.j2meloader.yml index ddf5c41698..f354f3fbb7 100644 --- a/metadata/ru.playsoftware.j2meloader.yml +++ b/metadata/ru.playsoftware.j2meloader.yml @@ -361,7 +361,7 @@ Builds: subdir: app gradle: - fdroid - prebuild: sed -i -e 's/5.2-/5.1-/' ../gradle/wrapper/gradle-wrapper.properties + prebuild: sed -i -e 's/21.3.6528147/21.4.7075529/' build.gradle scanignore: - app/src/main/java/javax/microedition/shell/AppClassLoader.java ndk: r21e