From ecd2edcff89e7d6a8cc5cdc8251f8e08cb77e5a5 Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 17 Jun 2024 19:40:20 +0800 Subject: [PATCH] misc fixes --- metadata/business.braid.f_wallet.yml | 1 + metadata/com.b44t.messenger.yml | 6 +++--- metadata/com.orz12.PiliPalaX.yml | 3 +++ metadata/com.presley.fit_book.yml | 27 +++++++++++++++++++++++++++ metadata/kshib.raven.yml | 18 +++++++++--------- metadata/me.mudkip.moememos.yml | 2 +- metadata/net.cozic.joplin.yml | 1 - 7 files changed, 44 insertions(+), 14 deletions(-) diff --git a/metadata/business.braid.f_wallet.yml b/metadata/business.braid.f_wallet.yml index 5927d28a5f..4d4b3d21d0 100644 --- a/metadata/business.braid.f_wallet.yml +++ b/metadata/business.braid.f_wallet.yml @@ -154,6 +154,7 @@ Builds: - versionName: 1.1.5 versionCode: 115 + disable: https://gitlab.com/TheOneWithTheBraid/f_wallet/-/issues/15 commit: c6071d15453f6deebd5dddc7a120ec40326339a4 output: build/app/outputs/flutter-apk/app-release.apk srclibs: diff --git a/metadata/com.b44t.messenger.yml b/metadata/com.b44t.messenger.yml index 2e751fb672..dba258c766 100644 --- a/metadata/com.b44t.messenger.yml +++ b/metadata/com.b44t.messenger.yml @@ -3585,7 +3585,7 @@ Builds: --target aarch64-linux-android - source $HOME/.cargo/env - PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/ ANDROID_NDK_ROOT=$$NDK$$ - scripts/ndk-make.sh armeabi-v7a + scripts/ndk-make.sh arm64-v8a ndk: r23c - versionName: 1.46.5 @@ -3607,7 +3607,7 @@ Builds: --target i686-linux-android - source $HOME/.cargo/env - PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/ ANDROID_NDK_ROOT=$$NDK$$ - scripts/ndk-make.sh armeabi-v7a + scripts/ndk-make.sh x86 ndk: r23c - versionName: 1.46.5 @@ -3629,7 +3629,7 @@ Builds: --target x86_64-linux-android - source $HOME/.cargo/env - PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/ ANDROID_NDK_ROOT=$$NDK$$ - scripts/ndk-make.sh armeabi-v7a + scripts/ndk-make.sh x86_64 ndk: r23c AutoUpdateMode: Version diff --git a/metadata/com.orz12.PiliPalaX.yml b/metadata/com.orz12.PiliPalaX.yml index 5a1bdaf724..86fa7dcebd 100644 --- a/metadata/com.orz12.PiliPalaX.yml +++ b/metadata/com.orz12.PiliPalaX.yml @@ -1418,6 +1418,7 @@ Builds: - versionName: 1.0.21-beta.3 versionCode: 1611 + disable: https://github.com/orz12/pilipala/issues/106 commit: 3affa2195e1b200f72070d9f50c90d85682897e5 sudo: - apt-get update @@ -1476,6 +1477,7 @@ Builds: - versionName: 1.0.21-beta.3 versionCode: 1612 + disable: https://github.com/orz12/pilipala/issues/106 commit: 3affa2195e1b200f72070d9f50c90d85682897e5 sudo: - apt-get update @@ -1535,6 +1537,7 @@ Builds: - versionName: 1.0.21-beta.3 versionCode: 1613 + disable: https://github.com/orz12/pilipala/issues/106 commit: 3affa2195e1b200f72070d9f50c90d85682897e5 sudo: - apt-get update diff --git a/metadata/com.presley.fit_book.yml b/metadata/com.presley.fit_book.yml index 21dc99a6d2..bac4ed0f0e 100644 --- a/metadata/com.presley.fit_book.yml +++ b/metadata/com.presley.fit_book.yml @@ -999,6 +999,7 @@ Builds: - versionName: 1.0.39 versionCode: 401 + disable: https://github.com/brandonp2412/FitBook/issues/12 commit: 88c699b1bef0fd39bf933f05382d0708171990f5 submodules: true sudo: @@ -1008,6 +1009,8 @@ Builds: - chown vagrant -R /home/brandon output: build/app/outputs/flutter-apk/app-x86_64-release.apk binary: https://github.com/brandonp2412/FitBook/releases/download/%v/app-x86_64-release.apk + srclibs: + - transistor-background-fetch@0dd1457588ba031f11e9452f125144aac8a9b75f rm: - ios - linux @@ -1021,6 +1024,8 @@ Builds: - export PUB_CACHE=$(pwd)/.pub-cache - flutter/bin/flutter config --no-analytics - flutter/bin/flutter pub get + - sed -i -e '/maven {/,/^ }/cmavenLocal()' .pub-cache/hosted/pub.dev/background_fetch-*/android/build.gradle + - sed -i -e 's/maven {.*}/mavenLocal()/' android/build.gradle - popd - mv /home/brandon/fitbook com.presley.fit_book scanignore: @@ -1032,6 +1037,10 @@ Builds: - cd .. - mv com.presley.fit_book /home/brandon/fitbook - pushd /home/brandon/fitbook + - pushd $$transistor-background-fetch$$/android/tsbackgroundfetch/ + - gradle assembleRelease + - gradle publishToMavenLocal + - popd - export PUB_CACHE=$(pwd)/.pub-cache - flutter/bin/flutter build apk --split-per-abi --target-platform="android-x64" - popd @@ -1040,6 +1049,7 @@ Builds: - versionName: 1.0.39 versionCode: 402 + disable: https://github.com/brandonp2412/FitBook/issues/12 commit: 88c699b1bef0fd39bf933f05382d0708171990f5 submodules: true sudo: @@ -1049,6 +1059,8 @@ Builds: - chown vagrant -R /home/brandon output: build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk binary: https://github.com/brandonp2412/FitBook/releases/download/%v/app-armeabi-v7a-release.apk + srclibs: + - transistor-background-fetch@0dd1457588ba031f11e9452f125144aac8a9b75f rm: - ios - linux @@ -1062,6 +1074,8 @@ Builds: - export PUB_CACHE=$(pwd)/.pub-cache - flutter/bin/flutter config --no-analytics - flutter/bin/flutter pub get + - sed -i -e '/maven {/,/^ }/cmavenLocal()' .pub-cache/hosted/pub.dev/background_fetch-*/android/build.gradle + - sed -i -e 's/maven {.*}/mavenLocal()/' android/build.gradle - popd - mv /home/brandon/fitbook com.presley.fit_book scanignore: @@ -1073,6 +1087,10 @@ Builds: - cd .. - mv com.presley.fit_book /home/brandon/fitbook - pushd /home/brandon/fitbook + - pushd $$transistor-background-fetch$$/android/tsbackgroundfetch/ + - gradle assembleRelease + - gradle publishToMavenLocal + - popd - export PUB_CACHE=$(pwd)/.pub-cache - flutter/bin/flutter build apk --split-per-abi --target-platform="android-arm" - popd @@ -1081,6 +1099,7 @@ Builds: - versionName: 1.0.39 versionCode: 403 + disable: https://github.com/brandonp2412/FitBook/issues/12 commit: 88c699b1bef0fd39bf933f05382d0708171990f5 submodules: true sudo: @@ -1090,6 +1109,8 @@ Builds: - chown vagrant -R /home/brandon output: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk binary: https://github.com/brandonp2412/FitBook/releases/download/%v/app-arm64-v8a-release.apk + srclibs: + - transistor-background-fetch@0dd1457588ba031f11e9452f125144aac8a9b75f rm: - ios - linux @@ -1103,6 +1124,8 @@ Builds: - export PUB_CACHE=$(pwd)/.pub-cache - flutter/bin/flutter config --no-analytics - flutter/bin/flutter pub get + - sed -i -e '/maven {/,/^ }/cmavenLocal()' .pub-cache/hosted/pub.dev/background_fetch-*/android/build.gradle + - sed -i -e 's/maven {.*}/mavenLocal()/' android/build.gradle - popd - mv /home/brandon/fitbook com.presley.fit_book scanignore: @@ -1114,6 +1137,10 @@ Builds: - cd .. - mv com.presley.fit_book /home/brandon/fitbook - pushd /home/brandon/fitbook + - pushd $$transistor-background-fetch$$/android/tsbackgroundfetch/ + - gradle assembleRelease + - gradle publishToMavenLocal + - popd - export PUB_CACHE=$(pwd)/.pub-cache - flutter/bin/flutter build apk --release --split-per-abi --target-platform="android-arm64" - popd diff --git a/metadata/kshib.raven.yml b/metadata/kshib.raven.yml index 8e3668b7fc..16ae66df1e 100644 --- a/metadata/kshib.raven.yml +++ b/metadata/kshib.raven.yml @@ -127,12 +127,12 @@ Builds: commit: 6fd98b1af7a9b242f34046dc732364fcc936fa34 submodules: true sudo: - - mkdir -p /home/kshib/StudioProjects/Raven + - mkdir -p /home/kshib/build - chown -R vagrant /home/kshib output: build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk binary: https://github.com/ksh-b/raven/releases/download/v%v/app-armeabi-v7a-release.apk prebuild: - - export repo=/home/kshib/StudioProjects/Raven + - export repo=/home/kshib/build - cd .. - mv kshib.raven $repo/raven - pushd $repo/raven @@ -147,7 +147,7 @@ Builds: - submodules/flutter - .pub-cache build: - - export repo=/home/kshib/StudioProjects/Raven + - export repo=/home/kshib/build - cd .. - mv kshib.raven $repo/raven - pushd $repo/raven @@ -161,12 +161,12 @@ Builds: commit: 6fd98b1af7a9b242f34046dc732364fcc936fa34 submodules: true sudo: - - mkdir -p /home/kshib/StudioProjects/Raven + - mkdir -p /home/kshib/build - chown -R vagrant /home/kshib output: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk binary: https://github.com/ksh-b/raven/releases/download/v%v/app-arm64-v8a-release.apk prebuild: - - export repo=/home/kshib/StudioProjects/Raven + - export repo=/home/kshib/build - cd .. - mv kshib.raven $repo/raven - pushd $repo/raven @@ -181,7 +181,7 @@ Builds: - submodules/flutter - .pub-cache build: - - export repo=/home/kshib/StudioProjects/Raven + - export repo=/home/kshib/build - cd .. - mv kshib.raven $repo/raven - pushd $repo/raven @@ -195,12 +195,12 @@ Builds: commit: 6fd98b1af7a9b242f34046dc732364fcc936fa34 submodules: true sudo: - - mkdir -p /home/kshib/StudioProjects/Raven + - mkdir -p /home/kshib/build - chown -R vagrant /home/kshib output: build/app/outputs/flutter-apk/app-x86_64-release.apk binary: https://github.com/ksh-b/raven/releases/download/v%v/app-x86_64-release.apk prebuild: - - export repo=/home/kshib/StudioProjects/Raven + - export repo=/home/kshib/build - cd .. - mv kshib.raven $repo/raven - pushd $repo/raven @@ -215,7 +215,7 @@ Builds: - submodules/flutter - .pub-cache build: - - export repo=/home/kshib/StudioProjects/Raven + - export repo=/home/kshib/build - cd .. - mv kshib.raven $repo/raven - pushd $repo/raven diff --git a/metadata/me.mudkip.moememos.yml b/metadata/me.mudkip.moememos.yml index 522f692e35..72bd869a0d 100644 --- a/metadata/me.mudkip.moememos.yml +++ b/metadata/me.mudkip.moememos.yml @@ -148,7 +148,7 @@ Builds: - versionName: 0.8.1 versionCode: 25 - commit: 6c2d4aff68873ab0b9a87fde71eb538a623ec04b + commit: 52ac7e9df6afd5cee041d6b2d42dcbb59679106a subdir: app gradle: - yes diff --git a/metadata/net.cozic.joplin.yml b/metadata/net.cozic.joplin.yml index 75fbb68784..c485aec80f 100644 --- a/metadata/net.cozic.joplin.yml +++ b/metadata/net.cozic.joplin.yml @@ -2751,7 +2751,6 @@ Builds: - .yarn/install-state.gz - .yarn/cache/*.zip - packages/app-mobile/node_modules/jsc-android - - packages/app-mobile/node_modules/react-native/build.gradle.kts - packages/app-mobile/node_modules/@react-native-community/netinfo/android/build.gradle - packages/app-mobile/node_modules/@react-native-community/push-notification-ios/android/build.gradle - packages/app-mobile/node_modules/react-native-device-info/android/build.gradle