From a099be89d635d6aab5c42b3965c263ae5a2e3c7f Mon Sep 17 00:00:00 2001 From: linsui Date: Wed, 19 Jul 2023 14:43:33 +0800 Subject: [PATCH] misc fixes --- metadata/com.alovoa.expo.yml | 2 ++ metadata/com.klee.sapio.yml | 1 + metadata/com.massive.yml | 4 --- metadata/com.wmstein.tourcount.yml | 1 + metadata/de.spiritcroc.riotx.yml | 34 ++++++++++------------ metadata/network.loki.messenger.fdroid.yml | 7 +++-- 6 files changed, 24 insertions(+), 25 deletions(-) diff --git a/metadata/com.alovoa.expo.yml b/metadata/com.alovoa.expo.yml index cffcfa47d3..b6f7455a77 100644 --- a/metadata/com.alovoa.expo.yml +++ b/metadata/com.alovoa.expo.yml @@ -177,6 +177,7 @@ Builds: - versionName: 1.4.2 versionCode: 11 + disable: https://github.com/Alovoa/alovoa-expo/issues/7 commit: 382a8dfe540bd78240f700e32555da628bddae91 sudo: - sysctl fs.inotify.max_user_watches=524288 @@ -210,6 +211,7 @@ Builds: - node_modules/expo-location/android/build.gradle - node_modules/expo-media-library/android/build.gradle - node_modules/expo-modules-core/android/build.gradle + - node_modules/expo-modules-autolinking/scripts/android/autolinking_implementation.gradle - node_modules/expo-secure-store/android/build.gradle - node_modules/expo-splash-screen/android/build.gradle - node_modules/expo-web-browser/android/build.gradle diff --git a/metadata/com.klee.sapio.yml b/metadata/com.klee.sapio.yml index b4e505325d..31d30efcc4 100644 --- a/metadata/com.klee.sapio.yml +++ b/metadata/com.klee.sapio.yml @@ -138,6 +138,7 @@ Builds: - update-java-alternatives -a gradle: - yes + prebuild: sed -i -e '/org.gradle.java.home/d' ../gradle.properties AutoUpdateMode: Version UpdateCheckMode: Tags diff --git a/metadata/com.massive.yml b/metadata/com.massive.yml index 16dc968a1f..829b2de105 100644 --- a/metadata/com.massive.yml +++ b/metadata/com.massive.yml @@ -2845,12 +2845,9 @@ Builds: init: yarn install gradle: - yes - output: build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk scanignore: - - android/build.gradle - node_modules/jsc-android - node_modules/react-native/* - - node_modules/react-native-file-access/android/build.gradle - node_modules/react-native-screens/android/build.gradle - node_modules/@react-native-masked-view/masked-view/android/build.gradle - node_modules/react-native-safe-area-context/android/build.gradle @@ -2860,7 +2857,6 @@ Builds: - node_modules/react-native-share/android/build.gradle - node_modules/@types/react-native-svg-charts/node_modules/react-native-svg/android/build.gradle - node_modules/react-native-vector-icons/android/build.gradle - - node_modules/react-native-document-picker/android/build.gradle - node_modules/react-native-pager-view/android/build.gradle scandelete: - node_modules/ diff --git a/metadata/com.wmstein.tourcount.yml b/metadata/com.wmstein.tourcount.yml index 3917910441..1d46cad9d3 100644 --- a/metadata/com.wmstein.tourcount.yml +++ b/metadata/com.wmstein.tourcount.yml @@ -318,6 +318,7 @@ Builds: - versionName: 3.4.0 versionCode: 340 + disable: https://github.com/wistein/TourCount/issues/22 commit: 23e86504300f734bd6921c463fc14a7e6b215732 subdir: tourcount sudo: diff --git a/metadata/de.spiritcroc.riotx.yml b/metadata/de.spiritcroc.riotx.yml index 22275c10a6..ebbb11bb54 100644 --- a/metadata/de.spiritcroc.riotx.yml +++ b/metadata/de.spiritcroc.riotx.yml @@ -1,5 +1,8 @@ AntiFeatures: - - NonFreeNet + NonFreeNet: + en-US: AntiFeature NonFreeNet is added because each chat has a "Add Matrix + apps" button which by default links to the proprietary scalar.vector.im + service. Categories: - Internet - Phone & SMS @@ -1524,28 +1527,24 @@ Builds: subdir: vector-app sudo: - apt-get update - - apt-get install -y jq libopus0 make g++ cmake maven - - curl -Lo node.tar.gz https://nodejs.org/dist/v16.17.1/node-v16.17.1-linux-x64.tar.gz - - echo "da5658693243b3ecf6a4cba6751a71df1eb9e9703ca93b42a9404aed85f58ad0 node.tar.gz" + - apt-get install -y jq maven + - sysctl fs.inotify.max_user_watches=524288 + - curl -Lo node.tar.gz https://nodejs.org/dist/v16.20.0/node-v16.20.0-linux-x64.tar.gz + - echo "7abc0e558fa3b3c4cc0fd3c7fa5dbe61500ba7213f5e87ed560c65a733c6a5c4 node.tar.gz" | sha256sum -c - - tar xzf node.tar.gz --strip-components=1 -C /usr/local/ - - sysctl fs.inotify.max_user_watches=524288 || true - - cd /opt/android-sdk/ndk - - rm -fr $(ls | sed 's/21.3.6528147//') - patch: - - build_gradle_remove_jitsi_repo_40105060.patch gradle: - fdroid + - rustCrypto srclibs: - - jitsi-meet@android-sdk-6.2.2 + - jitsi-meet@android-sdk-8.1.1 prebuild: - sed -i -e 's/def isCiBuild =.*/def isCiBuild = true/' ../tools/gradle/doctor.gradle - - sed -i -e '/applicationIdSuffix/d' -e '/^repositories {/a mavenLocal()' build.gradle - - sed -i -e '/com.google.gms.google-services/d' build.gradle ../build.gradle - - sed -i -e 's/enable true/enable false/g' -e '/firebase.appdistribution/d' - -e '/AppDistribution {/,/}/d' build.gradle - - sed -i -e '/repositories {/a\ mavenLocal()' -e '/firebase/d' ../build.gradle - - sed -i -e '/gplayImplementation(.*) {/,/}/d; /gplayImplementation/d' build.gradle + - sed -i -e '/AppDistribution {/,/^ }/d' -e 's/enable true/enable + false/g' build.gradle + - sed -i -e '/repositories {/a mavenLocal()' -e 's|https.*android-sdk-8.1.1|https://jitpack.io|' + ../build.gradle + - sed -i -e '/com.google.firebase/d' -e '/gms/d' {.,..}/build.gradle build: - cd $$jitsi-meet$$ - export LIBRE_BUILD=true @@ -1557,9 +1556,6 @@ Builds: - cp -r node_modules/jsc-android/dist/org/webkit/android-jsc "$HOME/.m2/repository/org/webkit" ndk: r21d -MaintainerNotes: AntiFeature NonFreeNet is added because each chat has a "Add Matrix - apps" button which by default links to the proprietary scalar.vector.im service. - AutoUpdateMode: Version UpdateCheckMode: Tags CurrentVersion: 1.6.3.sc69 diff --git a/metadata/network.loki.messenger.fdroid.yml b/metadata/network.loki.messenger.fdroid.yml index d549995bce..c3e815946c 100644 --- a/metadata/network.loki.messenger.fdroid.yml +++ b/metadata/network.loki.messenger.fdroid.yml @@ -654,6 +654,7 @@ Builds: versionCode: 3545 commit: 1bb3939930d74f94da05d4d963c699dca96937af subdir: app + submodules: true gradle: - play srclibs: @@ -668,8 +669,7 @@ Builds: - ln -s $$session-lazysodium-android$$/session-lazysodium-java .. - sed -i -e '/gms/d' -e 's/raw.github.com.*"/jitpack.io"/' ../build.gradle - sed -i -e '/gms/d' -e '/firebase-messaging/,/^ }/d' -e '/enable true/d' - -e '/circular-progress-button/s/1.1.3-S2/1.1.3/' -e '/android-database-sqlcipher/s/org.signal/net.zetetic/' - -e '/android-database-sqlcipher/s/3.5.9-S3/4.0.0/' -e '/defaultConfig/a applicationId + -e '/circular-progress-button/s/1.1.3-S2/1.1.3/' -e '/defaultConfig/a applicationId "network.loki.messenger.fdroid"' build.gradle - sed -i -z -E -e 's/<[^<]+pref_key_use_fcm[^>]+>//' src/main/res/xml/preferences_notifications.xml - sed -i -E -e '/app_name/s/>(.+)\1 F-Droid