misc fixes

2026-05-17 11:19:13 +00:00 · 2022-06-30 00:56:12 +08:00 · 2022-06-30 00:56:12 +08:00 · d4db547681
commit d4db547681
parent ff0e7e45c0
11 changed files with 28 additions and 97 deletions
--- a/metadata/app.alextran.immich.yml
+++ b/metadata/app.alextran.immich.yml
@ -148,32 +148,17 @@ Builds:
      - $$flutter$$/bin/flutter packages pub get
      - $$flutter$$/bin/flutter build apk --release

-  - versionName: 1.13.0
-    versionCode: 20
-    commit: 568436f188cce1f119d67dad8c0c7a9cc8698aca
-    subdir: mobile
-    output: build/app/outputs/flutter-apk/app-release.apk
-    srclibs:
-      - flutter@3.0.1
-    rm:
-      - design
-      - docker
-      - machine-learning
-      - mobile/ios
-      - server
-      - web
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter packages pub get
-      - $$flutter$$/bin/flutter build apk --release
-
  - versionName: 1.14.0
    versionCode: 21
    commit: 5f00d8b9c6169d6a85a02f2ce40040f313fdcc48
    subdir: mobile
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
    output: build/app/outputs/flutter-apk/app-release.apk
    srclibs:
-      - flutter@3.0.1
+      - flutter@3.0.3
    rm:
      - design
      - docker
--- a/metadata/br.com.colman.petals.yml
+++ b/metadata/br.com.colman.petals.yml
@ -4,8 +4,7 @@ Categories:
  - Time
 License: AGPL-3.0-or-later
 AuthorName: Leonardo Colman Lopes
-AuthorWebSite: https://github.com/LeoColman/
-WebSite: https://github.com/LeoColman/Petals
+AuthorWebSite: https://github.com/LeoColman
 SourceCode: https://github.com/LeoColman/Petals
 IssueTracker: https://github.com/LeoColman/Petals/issues
 Changelog: https://github.com/LeoColman/Petals/releases
@ -98,7 +97,8 @@ Builds:

  - versionName: v2.3.0
    versionCode: 230
-    commit: 65bb90feedad41516d25a39ec0663a194c61c5fa
+    disable: https://github.com/LeoColman/Petals/issues/39
+    commit: 59ccaf30336adc8cae4ab55f46a850e53103cc16
    subdir: app
    sudo:
      - apt-get update || apt-get update
--- a/metadata/com.secuso.privacyFriendlyCodeScanner.yml
+++ b/metadata/com.secuso.privacyFriendlyCodeScanner.yml
@ -93,6 +93,7 @@ Builds:
    versionCode: 24
    commit: 6a1989b692e2918c3b8624c701dab0a06a7018bd
    subdir: app
+    submodules: true
    sudo:
      - apt-get update || apt-get update
      - apt-get install -y openjdk-11-jdk-headless
--- a/metadata/com.topjohnwu.magisk.yml
+++ b/metadata/com.topjohnwu.magisk.yml
@ -330,6 +330,7 @@ Builds:

  - versionName: '25.1'
    versionCode: 25100
+    disable: version check failed
    commit: bb64ba0ef6a9bdbfcb1a2ceb4e4900f94b0deb95
    submodules: true
    sudo:
--- a/metadata/com.unciv.app.yml
+++ b/metadata/com.unciv.app.yml
@ -3384,23 +3384,6 @@ Builds:
    scandelete:
      - site/sitemap.xml.gz

-  - versionName: 4.1.14
-    versionCode: 731
-    commit: 8f0e64e02df4578b1287090a1f442996f98ebf11
-    subdir: android
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - yes
-    rm:
-      - desktop
-    prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager
-        'platforms;android-30' 'build-tools;30.0.3' > /dev/null
-    scandelete:
-      - site/sitemap.xml.gz
-
  - versionName: 4.1.14-patch1
    versionCode: 732
    commit: f9d150d28ad6a6438424dc60725717feff65eb9c
@ -3414,7 +3397,7 @@ Builds:
    rm:
      - desktop
    prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager
-        'platforms;android-30' 'build-tools;30.0.3' > /dev/null
+        'platforms;android-30' 'build-tools;30.0.2' > /dev/null
    scandelete:
      - site/sitemap.xml.gz

--- a/metadata/com.unitstool.yml
+++ b/metadata/com.unitstool.yml
@ -134,6 +134,7 @@ Builds:
      - node_modules/react-native/android/com/facebook/react/react-native/*/
      - node_modules/react-native-safe-area-context/android/build.gradle
      - node_modules/react-native-screens/android/build.gradle
+      - node_modules/react-native-snackbar/android/build.gradle
      - node_modules/react-native-vector-icons/android/build.gradle
      - node_modules/@react-native-async-storage/async-storage/
    scandelete:
--- a/metadata/com.wangdaye.mysplash.yml
+++ b/metadata/com.wangdaye.mysplash.yml
@ -315,19 +315,7 @@ Builds:
      - app/src/main/res/resource/values-ru/strings.xml
    prebuild: git checkout a307d32e325b8f33022f28975fac9253d1de705d -- ../gradle.properties

-  - versionName: 3.8.7
-    versionCode: 387
-    disable: fails to build https://github.com/WangDaYeeeeee/Mysplash/pull/93
-    commit: 3.8.7
-    subdir: app
-    gradle:
-      - yes
-    prebuild:
-      - git checkout c1af528da679aea3673271690134ecc7e66ce336 -- ../gradle.properties
-      - sed -i -e '/CrashReport[.;]/d' ../common/src/main/java/com/wangdaye/common/utils/helper/CrashReportHelper.java
-      - sed -i -e '/tencent/d' ../base/build.gradle
-
-AutoUpdateMode: Version
-UpdateCheckMode: Tags
-CurrentVersion: 3.8.7
-CurrentVersionCode: 387
+AutoUpdateMode: None
+UpdateCheckMode: None
+CurrentVersion: 3.4.8
+CurrentVersionCode: 348
--- a/metadata/dev.ukanth.ufirewall.yml
+++ b/metadata/dev.ukanth.ufirewall.yml
@ -861,6 +861,10 @@ Builds:
    versionCode: 20220615
    commit: 6c46bfd4f521bb72144c73b89339327ed63c0781
    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
    gradle:
      - yes
    prebuild:
--- a/metadata/eu.lepiller.nani.yml
+++ b/metadata/eu.lepiller.nani.yml
@ -89,6 +89,10 @@ Builds:
    versionCode: 13
    commit: 026b275d54d927e1c7efcd625bb9859ed286c169
    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
    gradle:
      - yes

--- a/metadata/org.blokada.fem.fdroid.yml
+++ b/metadata/org.blokada.fem.fdroid.yml
@ -462,47 +462,9 @@ Builds:
      - ./build.blocka.sh
    ndk: r24

-  - versionName: 6.0.3
-    versionCode: 600000300
-    disable: https://github.com/blokadaorg/blokada/issues/943
-    commit: 8053ba26827d19f436c4e6d4a18ede8a2bf856fa
-    subdir: android5/app
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - droid
-    srclibs:
-      - rustup@1.24.3
-    rm:
-      - android5/app/src/engine/jniLibs
-      - android5/app/src/libre/jniLibs
-    prebuild:
-      - unzip -P default_blocklist src/libre/assets/default_blocklist.zip default_blocklist
-        -d src/libre/assets
-      - rm src/libre/assets/default_blocklist.zip
-      - sed -i -e 's/24.0.7856742/24.0.8215888/' build.gradle
-    build:
-      - $$rustup$$/rustup-init.sh -y
-      - source $HOME/.cargo/env
-      - rustup default 1.61.0
-      - rustup target add armv7-linux-androideabi
-      - rustup target add aarch64-linux-android
-      - cargo install cargo-ndk --version 1.0.0
-      - cd ../..
-      - curl -Lo ndk.zip https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip
-      - echo "ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e ndk.zip"
-        | sha256sum -c -
-      - unzip -q ndk.zip
-      - export ANDROID_NDK=$(pwd)/android-ndk-r21e
-      - ./build.boringtun.sh
-      - ./build.blocka.sh
-    ndk: r24
-
  - versionName: 6.1.0
    versionCode: 601000000
+    disable: https://github.com/blokadaorg/blokada/issues/943
    commit: ea81890c3a46fbadde8256bfddb6053ac9b80fab
    subdir: android5/app
    submodules: true
--- a/metadata/sushi.hardcore.droidfs.yml
+++ b/metadata/sushi.hardcore.droidfs.yml
@ -352,9 +352,11 @@ Builds:
    gradle:
      - yes
    srclibs:
-      - OpenSSL@OpenSSL_1_1_1l
+      - OpenSSL@OpenSSL_1_1_1p
      - FFmpeg@n4.4
    prebuild: touch fdroid
+    scandelete:
+      - app/libcryfs/vendor/cryptopp/vendor_cryptopp
    build:
      - cd libgocryptfs
      - OPENSSL_PATH="$$OpenSSL$$" ./build.sh