From d1b3a1bac2704abdd3f98cf04797fd236073bc50 Mon Sep 17 00:00:00 2001 From: linsui Date: Sun, 25 Apr 2021 19:46:47 +0800 Subject: [PATCH] misc fixes --- metadata/com.agateau.tinywheels.android.yml | 4 +- metadata/com.exifthumbnailadder.app.yml | 3 ++ metadata/com.quinncasey.paperless_share.yml | 2 +- metadata/de.corona.tracing.yml | 1 + metadata/org.blokada.fem.fdroid.yml | 43 +++---------------- ....ghostsinthelab.apps.guilelessbopomofo.yml | 3 +- 6 files changed, 16 insertions(+), 40 deletions(-) diff --git a/metadata/com.agateau.tinywheels.android.yml b/metadata/com.agateau.tinywheels.android.yml index f1e2bde376..d158022c1d 100644 --- a/metadata/com.agateau.tinywheels.android.yml +++ b/metadata/com.agateau.tinywheels.android.yml @@ -224,9 +224,9 @@ Builds: subdir: android sudo: - apt-get update || apt-get update - - apt-get install -y python3-pip python3-setuptools imagemagick-6.q16 + - apt-get install -y imagemagick-6.q16 gradle: - - yes + - itchio prebuild: - sed -i -e 's#./gradlew#gradle#' ../Makefile - git cherry-pick --no-commit 4a56032cc4e823ba8d3fd35d5b1941951537b208 diff --git a/metadata/com.exifthumbnailadder.app.yml b/metadata/com.exifthumbnailadder.app.yml index f4519ed8bc..1b48b6f9b1 100644 --- a/metadata/com.exifthumbnailadder.app.yml +++ b/metadata/com.exifthumbnailadder.app.yml @@ -30,6 +30,9 @@ Builds: subdir: app gradle: - standard + scandelete: + - library + ndk: r22b AutoUpdateMode: Version %v UpdateCheckMode: Tags diff --git a/metadata/com.quinncasey.paperless_share.yml b/metadata/com.quinncasey.paperless_share.yml index 3854edb49d..9c6b3d2f71 100644 --- a/metadata/com.quinncasey.paperless_share.yml +++ b/metadata/com.quinncasey.paperless_share.yml @@ -32,7 +32,7 @@ Builds: commit: v1.0.6 output: build/app/outputs/flutter-apk/app-release.apk srclibs: - - flutter@1.22.4 + - flutter@2.0.5 build: - export PATH=$$flutter$$/bin:$PATH - $$flutter$$/bin/flutter config --no-analytics diff --git a/metadata/de.corona.tracing.yml b/metadata/de.corona.tracing.yml index 618f424ad6..ecb4d47ba9 100644 --- a/metadata/de.corona.tracing.yml +++ b/metadata/de.corona.tracing.yml @@ -169,6 +169,7 @@ Builds: subdir: Corona-Warn-App gradle: - device + prebuild: sed -i -e 's/21.2.6472646/21.4.7075529/' build.gradle scanignore: - Corona-Warn-App/src/main/assets/default_app_config_android.bin - Corona-Warn-App/src/main/assets/default_qr_code_poster_template_android.bin diff --git a/metadata/org.blokada.fem.fdroid.yml b/metadata/org.blokada.fem.fdroid.yml index 0cfa8c6097..0ddf13e58f 100644 --- a/metadata/org.blokada.fem.fdroid.yml +++ b/metadata/org.blokada.fem.fdroid.yml @@ -190,51 +190,23 @@ Builds: - ./build.blocka.sh ndk: r21d - - versionName: 5.11.0 - versionCode: 511000000 - disable: not yet released - commit: android-v5.11.0 - subdir: android5/app - gradle: - - droid - srclibs: - - rustup@1.22.1 - rm: - - android5/app/src/engine/jniLibs - prebuild: - - unzip -P default_blocklist src/main/assets/default_blocklist.zip default_blocklist - -d src/main/assets - - rm src/main/assets/default_blocklist.zip - - sed -i -e 's/6.6-rc-6/6.6/' ../gradle/wrapper/gradle-wrapper.properties - build: - - $$rustup$$/rustup-init.sh -y - - source $HOME/.cargo/env - - rustup default stable - - rustup target add armv7-linux-androideabi - - rustup target add aarch64-linux-android - - cargo install cargo-ndk --version 1.0.0 - - git submodule update --init --recursive - - export ANDROID_NDK=$$NDK$$ - - cd ./../.. - - ./build.boringtun.sh - - ./build.blocka.sh - ndk: r21e - - versionName: 5.11.1 versionCode: 511000001 - commit: ios-v5.10.1 + disable: https://github.com/blokadaorg/blokada/issues/860 + commit: android-v5.11.1 subdir: android5/app + submodules: true gradle: - droid srclibs: - - rustup@1.22.1 + - rustup@1.23.1 rm: - android5/app/src/engine/jniLibs prebuild: - unzip -P default_blocklist src/main/assets/default_blocklist.zip default_blocklist -d src/main/assets - rm src/main/assets/default_blocklist.zip - - sed -i -e 's/6.6-rc-6/6.6/' ../gradle/wrapper/gradle-wrapper.properties + - sed -i -e 's/21.3.6528147/21.4.7075529/' build.gradle build: - $$rustup$$/rustup-init.sh -y - source $HOME/.cargo/env @@ -242,14 +214,13 @@ Builds: - rustup target add armv7-linux-androideabi - rustup target add aarch64-linux-android - cargo install cargo-ndk --version 1.0.0 - - git submodule update --init --recursive - export ANDROID_NDK=$$NDK$$ - - cd ./../.. + - cd ../.. - ./build.boringtun.sh - ./build.blocka.sh ndk: r21e AutoUpdateMode: Version android-v%v -UpdateCheckMode: Tags .*[0-9]$ +UpdateCheckMode: Tags ^android-v[0-9.]+$ CurrentVersion: 5.11.1 CurrentVersionCode: 511000001 diff --git a/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml b/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml index da752a2b64..6b23eaab85 100644 --- a/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml +++ b/metadata/org.ghostsinthelab.apps.guilelessbopomofo.yml @@ -151,9 +151,10 @@ Builds: - apt-get install -y libsqlite3-dev gradle: - yes + prebuild: sed -i -e 's/21.3.6528147/21.4.7075529/' build.gradle scandelete: - app/libs/libchewing/src/tools - ndk: r21d + ndk: r21e AutoUpdateMode: Version %v UpdateCheckMode: Tags