From 73a22c5922eaec3e9e4372277d01f73528c2bce3 Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 31 May 2021 22:55:04 +0800 Subject: [PATCH] Misc fixes --- metadata/at.bitfire.davdroid.yml | 4 +++ metadata/be.mygod.vpnhotspot.foss.yml | 4 +++ .../com.github.jameshnsears.quoteunquote.yml | 27 ------------------- metadata/com.iskrembilen.quasseldroid.yml | 2 -- metadata/com.kmac5dev.mindfulnotifier.yml | 6 ++--- metadata/de.grobox.liberario.yml | 2 +- ....ghostsinthelab.apps.guilelessbopomofo.yml | 3 ++- metadata/org.jellyfin.mobile.yml | 1 + metadata/org.softeg.slartus.forpdaplus.yml | 11 -------- 9 files changed, 14 insertions(+), 46 deletions(-) diff --git a/metadata/at.bitfire.davdroid.yml b/metadata/at.bitfire.davdroid.yml index e74e782ff8..6408a4a04d 100644 --- a/metadata/at.bitfire.davdroid.yml +++ b/metadata/at.bitfire.davdroid.yml @@ -1466,6 +1466,10 @@ Builds: submodules: true gradle: - standard + prebuild: + - sed -i -e 's/com.google.android:flexbox/com.github.google:flexbox-layout/' + build.gradle + - sed -i -e '/flexbox-layout/d' ../build.gradle AutoUpdateMode: Version v%v UpdateCheckMode: Tags ^v[0-9.]+-ose[0-9]*$ diff --git a/metadata/be.mygod.vpnhotspot.foss.yml b/metadata/be.mygod.vpnhotspot.foss.yml index 17973f81a4..33625389c1 100644 --- a/metadata/be.mygod.vpnhotspot.foss.yml +++ b/metadata/be.mygod.vpnhotspot.foss.yml @@ -31,6 +31,10 @@ Builds: versionCode: 260 commit: v2.11.7 subdir: mobile + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk + - update-alternatives --auto java gradle: - freedom diff --git a/metadata/com.github.jameshnsears.quoteunquote.yml b/metadata/com.github.jameshnsears.quoteunquote.yml index 53758c6bfb..c1809f2528 100644 --- a/metadata/com.github.jameshnsears.quoteunquote.yml +++ b/metadata/com.github.jameshnsears.quoteunquote.yml @@ -98,33 +98,6 @@ Builds: - fdroid prebuild: sed -i -e '/firebase/d' build.gradle - - versionName: 2.4.6-fdroid - versionCode: 65 - commit: 2.4.6-fdroid - subdir: app - submodules: true - gradle: - - fdroid - prebuild: sed -i -e '/firebase/d' build.gradle - - - versionName: 2.4.8-fdroid - versionCode: 67 - commit: 2.4.8-fdroid - subdir: app - submodules: true - gradle: - - fdroid - prebuild: sed -i -e '/firebase/d' build.gradle - - - versionName: 2.4.9-fdroid - versionCode: 68 - commit: 2.4.9-fdroid - subdir: app - submodules: true - gradle: - - fdroid - prebuild: sed -i -e '/firebase/d' build.gradle - - versionName: 2.5.0-fdroid versionCode: 69 commit: 2.5.0-fdroid diff --git a/metadata/com.iskrembilen.quasseldroid.yml b/metadata/com.iskrembilen.quasseldroid.yml index 427c3e6161..333327ccf8 100644 --- a/metadata/com.iskrembilen.quasseldroid.yml +++ b/metadata/com.iskrembilen.quasseldroid.yml @@ -471,8 +471,6 @@ Builds: subdir: app gradle: - yes - scandelete: - - buildSrc AutoUpdateMode: None UpdateCheckMode: None diff --git a/metadata/com.kmac5dev.mindfulnotifier.yml b/metadata/com.kmac5dev.mindfulnotifier.yml index 3f37bdc6c0..206278b507 100644 --- a/metadata/com.kmac5dev.mindfulnotifier.yml +++ b/metadata/com.kmac5dev.mindfulnotifier.yml @@ -118,11 +118,9 @@ Builds: - versionName: 1.0.14 versionCode: 24 commit: v1.0.14 - output: build/app/outputs/apk/release/app-release.apk + output: build/app/outputs/flutter-apk/app-release.apk srclibs: - - flutter@2.0.3 - prebuild: echo 'android.applicationVariants.all { variant -> variant.outputs.all - { output -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle + - flutter@2.2.1 build: - $$flutter$$/bin/flutter config --no-analytics - $$flutter$$/bin/flutter pub get diff --git a/metadata/de.grobox.liberario.yml b/metadata/de.grobox.liberario.yml index d8b8194354..caf96fa092 100644 --- a/metadata/de.grobox.liberario.yml +++ b/metadata/de.grobox.liberario.yml @@ -410,7 +410,7 @@ Builds: gradle: - yes srclibs: - - gradlewitnessakwizgran@3119debde6c8aadebebcb0a7eb16dbb2e40c4046 + - gradlewitnessakwizgran@0bd93192051f6327e4dea5b296bf32644dd0dae1 rm: - app/libs/gradle-witness.jar prebuild: diff --git a/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml b/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml index e571fe987e..7eb11d7fac 100644 --- a/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml +++ b/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml @@ -205,7 +205,8 @@ Builds: - apt-get install -y libsqlite3-dev gradle: - yes - ndk: r21e + prebuild: $$SDK$$/tools/bin/sdkmanager 'cmake;3.18.1' > /dev/null + ndk: r22b AutoUpdateMode: Version %v UpdateCheckMode: Tags diff --git a/metadata/org.jellyfin.mobile.yml b/metadata/org.jellyfin.mobile.yml index 62f9f258e1..cc0e7ed341 100644 --- a/metadata/org.jellyfin.mobile.yml +++ b/metadata/org.jellyfin.mobile.yml @@ -38,6 +38,7 @@ Builds: - versionName: 2.3.0-beta.3 versionCode: 2030003 + disable: DOES NOT VERIFY https://github.com/jellyfin/jellyfin-android/issues/414 commit: v2.3.0-beta.3 subdir: app gradle: diff --git a/metadata/org.softeg.slartus.forpdaplus.yml b/metadata/org.softeg.slartus.forpdaplus.yml index 3bf76671ed..e4848b6f09 100644 --- a/metadata/org.softeg.slartus.forpdaplus.yml +++ b/metadata/org.softeg.slartus.forpdaplus.yml @@ -320,17 +320,6 @@ Builds: scanignore: - app/src/main/assets/databases/*.zip - - versionName: 3.5.8.2 - versionCode: 650 - commit: 3.5.8.2 - subdir: app - gradle: - - rel - prebuild: sed -i -e '/applicationVariants.all/,/^ }/d' -e '/signingConfig/d' - build.gradle - scanignore: - - app/src/main/assets/databases/*.zip - AutoUpdateMode: Version %v UpdateCheckMode: HTTP UpdateCheckData: https://raw.githubusercontent.com/slartus/4pdaClient-plus/master/updateinfo.json|"versionCode":\s*(\d+)|.|"ver":\s*"([\d.]+)