From 3fc65233a658324801aac9e2007ace100e256324 Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 9 Oct 2023 16:56:59 +0800 Subject: [PATCH] misc fixes --- metadata/app.pachli.yml | 2 + metadata/com.alovoa.expo.yml | 57 +---------------------------- metadata/fr.free.nrw.commons.yml | 1 + metadata/io.ente.photos.fdroid.yml | 49 ------------------------- metadata/org.metabrainz.android.yml | 4 +- 5 files changed, 6 insertions(+), 107 deletions(-) diff --git a/metadata/app.pachli.yml b/metadata/app.pachli.yml index f45d13beaa..ed71616fbb 100644 --- a/metadata/app.pachli.yml +++ b/metadata/app.pachli.yml @@ -58,6 +58,8 @@ Builds: - update-alternatives --auto java gradle: - blue + scandelete: + - plugins/markdown2resource/build AutoUpdateMode: Version UpdateCheckMode: Tags ^v[\d.]+$ diff --git a/metadata/com.alovoa.expo.yml b/metadata/com.alovoa.expo.yml index 706414f324..4d451b2a11 100644 --- a/metadata/com.alovoa.expo.yml +++ b/metadata/com.alovoa.expo.yml @@ -285,64 +285,9 @@ Builds: - gradle assembleRelease ndk: r23b - - versionName: 1.6.0 - versionCode: 15 - commit: 53c361e813c2da489dcfcda35a79ba3eaacd335f - sudo: - - sysctl fs.inotify.max_user_watches=524288 - - curl -Lo node.tar.gz https://nodejs.org/dist/v18.16.0/node-v18.16.0-linux-x64.tar.gz - - echo "fc83046a93d2189d919005a348db3b2372b598a145d84eb9781a3a4b0f032e95 node.tar.gz" - | sha256sum -c - - - tar xzf node.tar.gz --strip-components=1 -C /usr/local/ - - npm -g install yarn - init: yarn install - output: android/app/build/outputs/apk/release/app-release.apk - prebuild: - - sdkmanager 'cmake;3.22.1' - - yarn expo prebuild - - cp -r script/res/node_modules/* node_modules/ - - cp script/res/android/app/src/main/res/values/styles.xml android/app/src/main/res/values/styles.xml - - cp script/res/android/app/src/main/res/values-night/colors.xml android/app/src/main/res/values-night/colors.xml - - rm -fr script/res ios - scanignore: - - android/build.gradle - - node_modules/react-native/sdks/hermesc - - node_modules/expo/android/build.gradle - - node_modules/expo-application/android/build.gradle - - node_modules/expo-asset/node_modules/expo-file-system/android/build.gradle - - node_modules/expo-constants/android/build.gradle - - node_modules/expo-file-system/android/build.gradle - - node_modules/expo-font/android/build.gradle - - node_modules/expo-image-loader/android/build.gradle - - node_modules/expo-image-manipulator/android/build.gradle - - node_modules/expo-image-picker/android/build.gradle - - node_modules/expo-keep-awake/android/build.gradle - - node_modules/expo-localization/android/build.gradle - - 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-sharing/android/build.gradle - - node_modules/expo-splash-screen/android/build.gradle - - node_modules/expo-web-browser/android/build.gradle - - node_modules/jsc-android - - node_modules/@react-native-async-storage/async-storage/android/build.gradle - - node_modules/react-native-file-access/android/build.gradle - - node_modules/react-native-pager-view/android/build.gradle - - node_modules/react-native-safe-area-context/android/build.gradle - - node_modules/react-native-screens/android/build.gradle - - node_modules/react-native-svg/android/build.gradle - - node_modules/react-native-vector-icons/android/build.gradle - scandelete: - - node_modules/ - build: - - cd android/app - - gradle assembleRelease - ndk: r23b - - versionName: 1.6.1 versionCode: 16 + disable: https://github.com/Alovoa/alovoa-expo/issues/16 commit: 90bee5e2823f0dbefaf00b152a97a7516697e33f sudo: - sysctl fs.inotify.max_user_watches=524288 diff --git a/metadata/fr.free.nrw.commons.yml b/metadata/fr.free.nrw.commons.yml index 7d96e7b2fe..13db929b1c 100644 --- a/metadata/fr.free.nrw.commons.yml +++ b/metadata/fr.free.nrw.commons.yml @@ -183,6 +183,7 @@ Builds: - versionName: 4.2.0 versionCode: 1035 + disable: https://github.com/commons-app/apps-android-commons/issues/5333 commit: b314fe1896f550bcfb42127334325794285bfe0d subdir: app gradle: diff --git a/metadata/io.ente.photos.fdroid.yml b/metadata/io.ente.photos.fdroid.yml index 7703cdc3ff..be3d9df54e 100644 --- a/metadata/io.ente.photos.fdroid.yml +++ b/metadata/io.ente.photos.fdroid.yml @@ -1099,54 +1099,6 @@ Builds: - thirdparty/flutter/bin/flutter build apk --flavor fdroid -t lib/main.dart ndk: r21 - - versionName: 0.7.98 - versionCode: 498 - commit: d922e0895c13f96b4f12483beb136b3cc45df26d - submodules: true - sudo: - - apt-get update - - apt-get install -y automake libtool make - output: build/app/outputs/apk/fdroid/release/app-fdroid-release.apk - srclibs: - - libsodium@ee009287afd480b60a9a4d75b19afdc0f705e9d9 - - transistor-background-fetch@fb883de16ff3fbaaaa5ce84d829911c8a5894d2 - rm: - - ios - - android/app/src/main/jniLibs/*/*libtensor*.so - prebuild: - - export PUB_CACHE=$(pwd)/.pub-cache - - thirdparty/flutter/bin/flutter config --no-analytics - - thirdparty/flutter/bin/flutter pub get - scanignore: - - .pub-cache/hosted/pub.dev/background_fetch-*/android/build.gradle - - thirdparty/flutter/packages/flutter_tools/gradle/flutter.gradle - - thirdparty/flutter/bin/cache - scandelete: - - thirdparty/flutter - - .pub-cache - build: - - export PUB_CACHE=$(pwd)/.pub-cache - - pushd $$libsodium$$ - - ./autogen.sh -s - - ./dist-build/android-armv7-a.sh - - ./dist-build/android-armv8-a.sh - - ./dist-build/android-x86.sh - - ./dist-build/android-x86_64.sh - - popd - - cp $$libsodium$$/libsodium-android-armv7-a/lib/libsodium.so $PUB_CACHE/hosted/pub.dev/flutter_sodium-0.2.0/android/src/main/jniLibs/armeabi-v7a/ - - cp $$libsodium$$/libsodium-android-westmere/lib/libsodium.so $PUB_CACHE/hosted/pub.dev/flutter_sodium-0.2.0/android/src/main/jniLibs/x86_64/ - - cp $$libsodium$$/libsodium-android-armv8-a+crypto/lib/libsodium.so $PUB_CACHE/hosted/pub.dev/flutter_sodium-0.2.0/android/src/main/jniLibs/arm64-v8a/ - - cp $$libsodium$$/libsodium-android-i686/lib/libsodium.so $PUB_CACHE/hosted/pub.dev/flutter_sodium-0.2.0/android/src/main/jniLibs/x86/ - - pushd $$transistor-background-fetch$$/android/tsbackgroundfetch/ - - gradle assembleRelease - - gradle publishToMavenLocal - - popd - - mv $$transistor-background-fetch$$/android/tsbackgroundfetch/build/outputs/aar/tsbackgroundfetch-release.aar - $PUB_CACHE/hosted/pub.dev/background_fetch-1.1.6/android/libs/com/transistorsoft/tsbackgroundfetch/0.5.7/tsbackgroundfetch-0.5.7.aar - - thirdparty/flutter/bin/flutter packages pub run flutter_launcher_icons:main - - thirdparty/flutter/bin/flutter build apk --flavor fdroid -t lib/main.dart - ndk: r21 - - versionName: 0.7.100 versionCode: 500 commit: 58d767c5795413f645c941cd13278bfc7bf81957 @@ -1167,7 +1119,6 @@ Builds: - thirdparty/flutter/bin/flutter pub get scanignore: - .pub-cache/hosted/pub.dev/background_fetch-*/android/build.gradle - - thirdparty/flutter/packages/flutter_tools/gradle/flutter.gradle - thirdparty/flutter/bin/cache scandelete: - thirdparty/flutter diff --git a/metadata/org.metabrainz.android.yml b/metadata/org.metabrainz.android.yml index 1f21f430c5..6408c4d440 100644 --- a/metadata/org.metabrainz.android.yml +++ b/metadata/org.metabrainz.android.yml @@ -111,11 +111,11 @@ Builds: sudo: - apt-get update - apt-get install -y openjdk-17-jdk-headless - - update-java-alternatives -a + - update-alternatives --auto java gradle: - yes srclibs: - - Onboarding-Android@1.0.4 + - Onboarding-Android@1.1.2 prebuild: - mv $$Onboarding-Android$$ ../ - sed -i -e '/Onboarding/d' -e '/dependencies {/a implementation project(":onboard")'