From 15d3259689b2d5541bcf3334c6d7c97909acab94 Mon Sep 17 00:00:00 2001 From: linsui Date: Sun, 30 Jan 2022 12:47:45 +0800 Subject: [PATCH] misc fixes --- metadata/chat.fluffy.fluffychat.yml | 3 +-- metadata/com.flx_apps.digitaldetox.yml | 4 ++++ metadata/com.ktprograms.ohmsnow.yml | 4 ++++ metadata/de.spiritcroc.riotx.yml | 4 ++-- metadata/fr.gouv.android.stopcovid.yml | 2 -- metadata/net.mullvad.mullvadvpn.yml | 14 -------------- 6 files changed, 11 insertions(+), 20 deletions(-) diff --git a/metadata/chat.fluffy.fluffychat.yml b/metadata/chat.fluffy.fluffychat.yml index 3f519f3e36..4380918098 100644 --- a/metadata/chat.fluffy.fluffychat.yml +++ b/metadata/chat.fluffy.fluffychat.yml @@ -182,12 +182,11 @@ Builds: - apt-get install -y ninja-build output: build/app/outputs/flutter-apk/app-release.apk srclibs: - - flutter@2.5.1 + - flutter@2.8.1 rm: - ios - linux - macos - - snap - test - web - windows diff --git a/metadata/com.flx_apps.digitaldetox.yml b/metadata/com.flx_apps.digitaldetox.yml index fd77731296..8af7bf5cf6 100644 --- a/metadata/com.flx_apps.digitaldetox.yml +++ b/metadata/com.flx_apps.digitaldetox.yml @@ -46,6 +46,10 @@ Builds: versionCode: 12000 commit: 1443d9e93e14816d2df5037945c0b13d5083a3bd subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - yes diff --git a/metadata/com.ktprograms.ohmsnow.yml b/metadata/com.ktprograms.ohmsnow.yml index 8f1a2974d3..e9e1d25bdc 100644 --- a/metadata/com.ktprograms.ohmsnow.yml +++ b/metadata/com.ktprograms.ohmsnow.yml @@ -95,6 +95,10 @@ Builds: versionCode: 12 commit: 020701d58b10ab88aa9940d5167f7ebd42322db7 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - yes diff --git a/metadata/de.spiritcroc.riotx.yml b/metadata/de.spiritcroc.riotx.yml index 7644bde94c..8619abf99b 100644 --- a/metadata/de.spiritcroc.riotx.yml +++ b/metadata/de.spiritcroc.riotx.yml @@ -785,13 +785,13 @@ Builds: gradle: - fdroid srclibs: - - jitsi-meet@android-sdk-3.1.0 + - jitsi-meet@android-sdk-3.10.0 prebuild: - sed -i -e '/com.google.gms.google-services/d' build.gradle ../build.gradle - sed -i -e 's/enable true/enable false/g' build.gradle - sed -i -e 's|"https://github.com/vector-im.*"|"https://jitpack.io/"|' -e "s|'https://gitlab.matrix.org.*'|'https://jitpack.io/'|" ../build.gradle - - sed -i -e '/repositories {/amavenLocal()' -e '/repositories {/amavenCentral()' + - sed -i -e '/repositories {/a mavenLocal()' -e '/repositories {/a mavenCentral()' ../build.gradle - sed -i -e '/gplayImplementation(.*) {/,/}/d; /gplayImplementation/d' build.gradle - sed -i -e 's/org.matrix.android:olm:3.2.7/org.matrix.android:olm-sdk:3.2.10/' diff --git a/metadata/fr.gouv.android.stopcovid.yml b/metadata/fr.gouv.android.stopcovid.yml index 7631c7fc30..99cef056e3 100644 --- a/metadata/fr.gouv.android.stopcovid.yml +++ b/metadata/fr.gouv.android.stopcovid.yml @@ -648,8 +648,6 @@ Builds: ../coreui/src/main/res/values/styles.xml ../stopcovid/src/main/res/layout/dcc_widget_no_fav_widget.xml - sed -i -e 's//\n /g' ../lint.xml - scanignore: - - stopcovid/src/main/assets/CertList-Plus/*.pb.gz MaintainerNotes: |- * Tracking – uses custom Analytics diff --git a/metadata/net.mullvad.mullvadvpn.yml b/metadata/net.mullvad.mullvadvpn.yml index 9a2132b178..0ed73a8b68 100644 --- a/metadata/net.mullvad.mullvadvpn.yml +++ b/metadata/net.mullvad.mullvadvpn.yml @@ -100,20 +100,6 @@ Builds: - ./build-apk.sh --fdroid ndk: r20b - - versionName: 2022.1-beta1 - versionCode: 22010001 - commit: 377af2c331f0866076017426ff75a5d874d46d1e - init: NDK_PATH="$$NDK$$" android/fdroid-build/init.sh - output: android/build/outputs/apk/fdroid/android-fdroid-unsigned.apk - rm: - - gui - - graphics - - windows - build: - - NDK_PATH="$$NDK$$" source android/fdroid-build/env.sh - - ./build-apk.sh --fdroid - ndk: r20b - - versionName: 2022.1-beta2 versionCode: 22010002 commit: 06b9617f924ae2d00be2e3fcf534f29ae81376e1