From 39bd283300f87fcbda3aa2485384736919ec178b Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 9 Aug 2021 19:41:54 +0800 Subject: [PATCH] misc fixes --- metadata/com.gianlu.aria2android.yml | 18 ++------- metadata/com.gianlu.aria2app.yml | 4 ++ metadata/com.gianlu.dnshero.yml | 17 ++------- metadata/com.github.cvzi.screenshottile.yml | 4 ++ .../com.github.k1rakishou.chan.fdroid.yml | 4 ++ .../com.github.premnirmal.tickerwidget.yml | 37 ++----------------- ....greenaddress.greenbits_android_wallet.yml | 2 +- metadata/com.roguetemple.hyperroid.yml | 1 + metadata/com.waist.line.yml | 25 +------------ metadata/eu.faircode.email.yml | 9 ++--- metadata/eu.kanade.tachiyomi.yml | 4 ++ metadata/host.stjin.anonaddy.yml | 2 +- metadata/hu.vmiklos.plees_tracker.yml | 4 ++ metadata/me.zhanghai.android.files.yml | 6 ++- metadata/net.redwarp.gifwallpaper.yml | 4 ++ ....ghostsinthelab.apps.guilelessbopomofo.yml | 3 +- metadata/org.smc.inputmethod.indic.yml | 34 +++++++++++++++++ metadata/rs.ltt.android.yml | 3 +- metadata/site.leos.apps.lespas.yml | 4 ++ 19 files changed, 92 insertions(+), 93 deletions(-) diff --git a/metadata/com.gianlu.aria2android.yml b/metadata/com.gianlu.aria2android.yml index fbae2b0dc9..4ff55345cb 100644 --- a/metadata/com.gianlu.aria2android.yml +++ b/metadata/com.gianlu.aria2android.yml @@ -316,26 +316,16 @@ Builds: - aria2lib/src/main/jniLibs ndk: r21d - - versionName: 2.6.2 - versionCode: 70 - commit: 1a94dc360d29dd5f67aa03147434cfcc326144a3 - timeout: 14400 - subdir: app - submodules: true - gradle: - - foss - prebuild: sed -i -e '/maven.fabric.io/d; /io.fabric/d' build.gradle ../build.gradle - ../CommonUtils/build.gradle - scandelete: - - aria2lib/src/main/jniLibs - ndk: r21d - - versionName: 2.6.3 versionCode: 71 commit: 8c64575899e9ae0a8c92fab5bf44d76b9a8377ea timeout: 14400 subdir: app submodules: true + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - foss prebuild: sed -i -e '/maven.fabric.io/d; /io.fabric/d' build.gradle ../build.gradle diff --git a/metadata/com.gianlu.aria2app.yml b/metadata/com.gianlu.aria2app.yml index 9b758a4af9..fc45a0a83e 100644 --- a/metadata/com.gianlu.aria2app.yml +++ b/metadata/com.gianlu.aria2app.yml @@ -716,6 +716,10 @@ Builds: timeout: 14400 subdir: app submodules: true + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - foss prebuild: sed -i -e '/maven.fabric.io/d' -e '/io.fabric/d' build.gradle ../build.gradle diff --git a/metadata/com.gianlu.dnshero.yml b/metadata/com.gianlu.dnshero.yml index ff4f80858b..c438dafc79 100644 --- a/metadata/com.gianlu.dnshero.yml +++ b/metadata/com.gianlu.dnshero.yml @@ -262,24 +262,15 @@ Builds: - sed -i -e '/maven.fabric.io/d; /io.fabric/d' build.gradle ../build.gradle ../CommonUtils/build.gradle - - versionName: 1.6.10 - versionCode: 36 - commit: 402068151d8a7db0861c2d829f4c0cc7daa73ddd - subdir: app - submodules: true - gradle: - - foss - prebuild: - - sed -i -e '/com.google.firebase/d' ../build.gradle ../CommonUtils/build.gradle - build.gradle - - sed -i -e '/maven.fabric.io/d; /io.fabric/d' build.gradle ../build.gradle - ../CommonUtils/build.gradle - - versionName: 1.6.11 versionCode: 37 commit: a5f2d1c18ff8847dc0f864413905558d89c4774d subdir: app submodules: true + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - foss prebuild: diff --git a/metadata/com.github.cvzi.screenshottile.yml b/metadata/com.github.cvzi.screenshottile.yml index 85ea452c1f..a56b5bf409 100644 --- a/metadata/com.github.cvzi.screenshottile.yml +++ b/metadata/com.github.cvzi.screenshottile.yml @@ -317,6 +317,10 @@ Builds: versionCode: 48 commit: e168f45e21895e4910ed72375ebff1686b48a123 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - yes prebuild: echo "android.useAndroidX=true" > ../gradle.properties diff --git a/metadata/com.github.k1rakishou.chan.fdroid.yml b/metadata/com.github.k1rakishou.chan.fdroid.yml index baaf6f0f79..69b0c1a23c 100644 --- a/metadata/com.github.k1rakishou.chan.fdroid.yml +++ b/metadata/com.github.k1rakishou.chan.fdroid.yml @@ -199,6 +199,10 @@ Builds: versionCode: 1105 commit: 0ecad57f07d27a7ef3abcfde6db12584575f2f7a subdir: Kuroba/app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - fdroid diff --git a/metadata/com.github.premnirmal.tickerwidget.yml b/metadata/com.github.premnirmal.tickerwidget.yml index 6882f22912..15e1c72527 100644 --- a/metadata/com.github.premnirmal.tickerwidget.yml +++ b/metadata/com.github.premnirmal.tickerwidget.yml @@ -1210,43 +1210,14 @@ Builds: {/,/^}/d' build.gradle - echo 'android { lintOptions { checkReleaseBuilds false } }' >> build.gradle - - versionName: 3.9.742 - versionCode: 300900742 - commit: ab474b851fab9705fc6da54911f4d1ad4f47521a - subdir: app - gradle: - - purefoss - prebuild: - - sed -i -e '/google-services/d; /firebase/d; /dl.bintray.com/d; /android.applicationVariants.all - {/,/^}/d' build.gradle - - echo 'android { lintOptions { checkReleaseBuilds false } }' >> build.gradle - - - versionName: 3.9.743 - versionCode: 300900743 - commit: e5381777c0224cf31b8d7dcddf21ab28373a4a46 - subdir: app - gradle: - - purefoss - prebuild: - - sed -i -e '/google-services/d; /firebase/d; /dl.bintray.com/d; /android.applicationVariants.all - {/,/^}/d' build.gradle - - echo 'android { lintOptions { checkReleaseBuilds false } }' >> build.gradle - - - versionName: 3.9.744 - versionCode: 300900744 - commit: 11829cf47a150fc225244f27e140f665135c2654 - subdir: app - gradle: - - purefoss - prebuild: - - sed -i -e '/google-services/d; /firebase/d; /dl.bintray.com/d; /android.applicationVariants.all - {/,/^}/d' build.gradle - - echo 'android { lintOptions { checkReleaseBuilds false } }' >> build.gradle - - versionName: 3.9.745 versionCode: 300900745 commit: 4aabf5dba102f69852a88f974e4af708f7553af3 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - purefoss prebuild: diff --git a/metadata/com.greenaddress.greenbits_android_wallet.yml b/metadata/com.greenaddress.greenbits_android_wallet.yml index 9a707d20f6..dc2623055a 100644 --- a/metadata/com.greenaddress.greenbits_android_wallet.yml +++ b/metadata/com.greenaddress.greenbits_android_wallet.yml @@ -2032,7 +2032,7 @@ Builds: timeout: 25200 sudo: - apt-get update || apt-get update - - apt-get install -y build-essential clang virtualenv openjdk-11-jdk + - apt-get install -y build-essential clang jq libffi-dev virtualenv openjdk-11-jdk - update-alternatives --auto java - pushd build/srclib/cpython - ./configure diff --git a/metadata/com.roguetemple.hyperroid.yml b/metadata/com.roguetemple.hyperroid.yml index c21ef87d62..7aaa7470de 100644 --- a/metadata/com.roguetemple.hyperroid.yml +++ b/metadata/com.roguetemple.hyperroid.yml @@ -222,6 +222,7 @@ Builds: - versionName: 12.0f versionCode: 12060 + disable: https://github.com/zenorogue/hyperrogue/issues/286 commit: dda9f29403693108f596229e6d335d079b44d226 subdir: hyperroid/app sudo: diff --git a/metadata/com.waist.line.yml b/metadata/com.waist.line.yml index 2b5d8bc061..a616847f0f 100644 --- a/metadata/com.waist.line.yml +++ b/metadata/com.waist.line.yml @@ -331,37 +331,16 @@ Builds: - cp $$BarcodeScanner$$/barcodescanner/build/outputs/aar/barcodescanner-release.aar libs/barcodescanner-release-2.1.5.aar - - versionName: 3.0.1 - versionCode: 30001 - commit: 92235356cc35c15c7f01eac487ce916078b92322 - subdir: platforms/android/app - gradle: - - yes - srclibs: - - BarcodeScanner@2.1.5 - rm: - - platforms/android/app/libs/barcodescanner-release-2.1.5.aar - - platforms/android/CordovaLib/build - prebuild: sed -i -e '/gradleVersion/d' build.gradle - build: - - pushd $$BarcodeScanner$$ - - rm local.properties - - gradle clean assembleRelease - - popd - - cp $$BarcodeScanner$$/barcodescanner/build/outputs/aar/barcodescanner-release.aar - libs/barcodescanner-release-2.1.5.aar - - versionName: 3.0.2 versionCode: 30002 - commit: dd6c3d95a2fc9e2296af07233b16eb1cc5285a2a + commit: 3.0.2 subdir: platforms/android/app gradle: - yes srclibs: - - BarcodeScanner@2.1.5 + - BarcodeScanner@0fc1fd2ff00683d2a2803ba6da63320bcb29fd2c rm: - platforms/android/app/libs/barcodescanner-release-2.1.5.aar - - platforms/android/CordovaLib/build prebuild: sed -i -e '/gradleVersion/d' build.gradle build: - pushd $$BarcodeScanner$$ diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml index 397cb4b99f..ff04782e35 100644 --- a/metadata/eu.faircode.email.yml +++ b/metadata/eu.faircode.email.yml @@ -4452,10 +4452,9 @@ Builds: - app/lib ndk: r21e - - versionName: '1.1658' - versionCode: 1658 - disable: Failed to find Platform SDK with path:platforms;android-31 - commit: 68ba7c92778bd5d099c22b6c1418fdb9af2500dc + - versionName: '1.1677' + versionCode: 1677 + commit: '1.1677' subdir: app submodules: true sudo: @@ -4469,7 +4468,7 @@ Builds: - app/lib ndk: r21e -AutoUpdateMode: None +AutoUpdateMode: Version UpdateCheckMode: Tags UpdateCheckData: app/build.gradle|getVersionCode.*return (\d+)|| CurrentVersion: '1.1677' diff --git a/metadata/eu.kanade.tachiyomi.yml b/metadata/eu.kanade.tachiyomi.yml index 3f04ea669f..6fa280bfb1 100644 --- a/metadata/eu.kanade.tachiyomi.yml +++ b/metadata/eu.kanade.tachiyomi.yml @@ -433,6 +433,10 @@ Builds: versionCode: 67 commit: 85791a9336b894b973ef65e77ec1aa38235ffac8 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - standard prebuild: diff --git a/metadata/host.stjin.anonaddy.yml b/metadata/host.stjin.anonaddy.yml index 7f394edbd0..37fd23f88d 100644 --- a/metadata/host.stjin.anonaddy.yml +++ b/metadata/host.stjin.anonaddy.yml @@ -77,7 +77,7 @@ Builds: - apt-get install -y openjdk-11-jdk - update-alternatives --auto java gradle: - - yes + - main AutoUpdateMode: Version v%v UpdateCheckMode: Tags diff --git a/metadata/hu.vmiklos.plees_tracker.yml b/metadata/hu.vmiklos.plees_tracker.yml index 85069fe9b7..ecc8fbebf6 100644 --- a/metadata/hu.vmiklos.plees_tracker.yml +++ b/metadata/hu.vmiklos.plees_tracker.yml @@ -150,6 +150,10 @@ Builds: versionCode: 22 commit: ac67d37d4ce99aa7c2359cb8113636cc652eaa5b 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/me.zhanghai.android.files.yml b/metadata/me.zhanghai.android.files.yml index 4fb1f11b51..f6a8a48a29 100644 --- a/metadata/me.zhanghai.android.files.yml +++ b/metadata/me.zhanghai.android.files.yml @@ -127,12 +127,16 @@ Builds: versionCode: 25 commit: 519e1ae1f9a4cf510b925896da9499be0229b0d7 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - yes rm: - app/src/main/java/me/zhanghai/android/files/nonfree prebuild: find -type f -exec sed -i '/\/\/#ifdef NONFREE/,/\/\/#endif/d' {} + - ndk: r22 + ndk: r22b AutoUpdateMode: Version v%v UpdateCheckMode: Tags ^v.+$ diff --git a/metadata/net.redwarp.gifwallpaper.yml b/metadata/net.redwarp.gifwallpaper.yml index 335318ea62..1feab25743 100644 --- a/metadata/net.redwarp.gifwallpaper.yml +++ b/metadata/net.redwarp.gifwallpaper.yml @@ -155,6 +155,10 @@ Builds: versionCode: 50 commit: 2bd5c73694fa81fc38d0d6bf3574d2ed68814d21 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.ghostsinthelab.apps.guilelessbopomofo.yml b/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml index ae174c6104..434ac10cc9 100644 --- a/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml +++ b/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml @@ -275,17 +275,18 @@ Builds: - versionName: 1.4.0 versionCode: 50 + disable: https://github.com/hiroshiyui/GuilelessBopomofo/issues/16 commit: 076d31ff732ca02b9a300903edfc8931b506b7bc subdir: app submodules: true sudo: + - /opt/android-sdk/tools/bin/sdkmanager 'cmake;3.18.1' > /dev/null - apt-get update || apt-get update - apt-get install -y libsqlite3-dev - apt-get install -y openjdk-11-jdk - update-alternatives --auto java gradle: - yes - prebuild: $$SDK$$/tools/bin/sdkmanager 'cmake;3.18.1' > /dev/null ndk: r22b AutoUpdateMode: Version %v diff --git a/metadata/org.smc.inputmethod.indic.yml b/metadata/org.smc.inputmethod.indic.yml index ad6aac3d9a..b119a0ffdd 100644 --- a/metadata/org.smc.inputmethod.indic.yml +++ b/metadata/org.smc.inputmethod.indic.yml @@ -280,6 +280,40 @@ Builds: - mv ../native/libs/* jniLibs/ ndk: r21d + - versionName: '3.4' + versionCode: 75 + commit: v3.4 + subdir: java + submodules: true + gradle: + - yes + rm: + - dictionaries/ + - dictionaries-indic/ + - java/jniLibs/* + prebuild: sed -i '/include/c\include "armeabi-v7a"' build.gradle + build: + - $$NDK$$/ndk-build -e "APP_ABI=armeabi-v7a" -e "APP_CFLAGS += -w" -C ../native/jni + - mv ../native/libs/* jniLibs/ + ndk: r21e + + - versionName: '3.4' + versionCode: 76 + commit: v3.4 + subdir: java + submodules: true + gradle: + - yes + rm: + - dictionaries/ + - dictionaries-indic/ + - java/jniLibs/* + prebuild: sed -i '/include/c\include "arm64-v8a"' build.gradle + build: + - $$NDK$$/ndk-build -e "APP_ABI=arm64-v8a" -e "APP_CFLAGS += -w" -C ../native/jni + - mv ../native/libs/* jniLibs/ + ndk: r21e + MaintainerNotes: |- * needs testing * dictionary binaries? diff --git a/metadata/rs.ltt.android.yml b/metadata/rs.ltt.android.yml index eef15abcb3..ff790ceec2 100644 --- a/metadata/rs.ltt.android.yml +++ b/metadata/rs.ltt.android.yml @@ -44,6 +44,7 @@ Builds: - versionName: 0.2.0 versionCode: 6 + disable: Upstream binary not available commit: 513925ab0cdfa75dd0f58a3c4308e348ade78784 subdir: app sudo: @@ -58,7 +59,7 @@ Builds: rs.ltt.android - cd rs.ltt.android gradle: - - yes + - fdroid AutoUpdateMode: Version %v UpdateCheckMode: Tags diff --git a/metadata/site.leos.apps.lespas.yml b/metadata/site.leos.apps.lespas.yml index 455747ad15..0888ea75a4 100644 --- a/metadata/site.leos.apps.lespas.yml +++ b/metadata/site.leos.apps.lespas.yml @@ -170,6 +170,10 @@ Builds: versionCode: 26 commit: 8501847d5a999e0f16a9bf05d4c67d9832746f8e subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - yes