misc fixes

2026-05-20 20:59:11 +00:00 · 2024-08-10 12:04:37 +08:00 · 2024-08-10 12:04:37 +08:00 · 0c2dd045bd
commit 0c2dd045bd
parent 4c49422f19
13 changed files with 21 additions and 108 deletions
--- a/metadata/com.adilhanney.saber.yml
+++ b/metadata/com.adilhanney.saber.yml
@ -7867,7 +7867,7 @@ Builds:

  - versionName: 0.24.5
    versionCode: 240501
-    disable: https://gitlab.com/fdroid/fdroiddata/-/jobs/7532254315#L5773
+    disable: https://github.com/saber-notes/saber/issues/1334
    commit: 7e6a607bf27cf35c2d3a1b022d2ed3fcdf38ad80
    submodules: true
    sudo:
@ -7888,7 +7888,6 @@ Builds:
      - snap
      - windows
    prebuild:
-      - sed -i -e 's/18,24d/5,11d/' patches/remove_proprietary_dependencies.sh
      - ./patches/remove_proprietary_dependencies.sh
      - ./patches/remove_request_install_packages_permission.sh
      - export PUB_CACHE=$(pwd)/.pub-cache
@ -7900,10 +7899,9 @@ Builds:
      - submodules/flutter
      - .pub-cache
    build:
-      - $$rustup$$/rustup-init.sh -y
+      - $$rustup$$/rustup-init.sh -y --default-toolchain 1.79.0 --target armv7-linux-androideabi
      - source $HOME/.cargo/env
      - export ANDROID_NDK_ROOT=$$NDK$$
-      - rustup target add armv7-linux-androideabi
      - export PUB_CACHE=$(pwd)/.pub-cache
      - submodules/flutter/bin/flutter build apk --split-per-abi --dart-define=FLAVOR="F-Droid"
        --dart-define=APP_STORE="F-Droid" --dart-define=UPDATE_CHECK="false" --dart-define=OFFLINE_FONTS_ONLY="true"
@ -7912,7 +7910,7 @@ Builds:

  - versionName: 0.24.5
    versionCode: 240502
-    disable: https://gitlab.com/fdroid/fdroiddata/-/jobs/7532254315#L5773
+    disable: https://github.com/saber-notes/saber/issues/1334
    commit: 7e6a607bf27cf35c2d3a1b022d2ed3fcdf38ad80
    submodules: true
    sudo:
@ -7933,7 +7931,6 @@ Builds:
      - snap
      - windows
    prebuild:
-      - sed -i -e 's/18,24d/5,11d/' patches/remove_proprietary_dependencies.sh
      - ./patches/remove_proprietary_dependencies.sh
      - ./patches/remove_request_install_packages_permission.sh
      - export PUB_CACHE=$(pwd)/.pub-cache
@ -7945,10 +7942,9 @@ Builds:
      - submodules/flutter
      - .pub-cache
    build:
-      - $$rustup$$/rustup-init.sh -y
+      - $$rustup$$/rustup-init.sh -y --default-toolchain 1.79.0 --target aarch64-linux-android
      - source $HOME/.cargo/env
      - export ANDROID_NDK_ROOT=$$NDK$$
-      - rustup target add aarch64-linux-android
      - export PUB_CACHE=$(pwd)/.pub-cache
      - submodules/flutter/bin/flutter build apk --split-per-abi --dart-define=FLAVOR="F-Droid"
        --dart-define=APP_STORE="F-Droid" --dart-define=UPDATE_CHECK="false" --dart-define=OFFLINE_FONTS_ONLY="true"
@ -7957,7 +7953,7 @@ Builds:

  - versionName: 0.24.5
    versionCode: 240503
-    disable: https://gitlab.com/fdroid/fdroiddata/-/jobs/7532254315#L5773
+    disable: https://github.com/saber-notes/saber/issues/1334
    commit: 7e6a607bf27cf35c2d3a1b022d2ed3fcdf38ad80
    submodules: true
    sudo:
@ -7978,7 +7974,6 @@ Builds:
      - snap
      - windows
    prebuild:
-      - sed -i -e 's/18,24d/5,11d/' patches/remove_proprietary_dependencies.sh
      - ./patches/remove_proprietary_dependencies.sh
      - ./patches/remove_request_install_packages_permission.sh
      - export PUB_CACHE=$(pwd)/.pub-cache
@ -7990,10 +7985,9 @@ Builds:
      - submodules/flutter
      - .pub-cache
    build:
-      - $$rustup$$/rustup-init.sh -y
+      - $$rustup$$/rustup-init.sh -y --default-toolchain 1.79.0 --target x86_64-linux-android
      - source $HOME/.cargo/env
      - export ANDROID_NDK_ROOT=$$NDK$$
-      - rustup target add x86_64-linux-android
      - export PUB_CACHE=$(pwd)/.pub-cache
      - submodules/flutter/bin/flutter build apk --split-per-abi --dart-define=FLAVOR="F-Droid"
        --dart-define=APP_STORE="F-Droid" --dart-define=UPDATE_CHECK="false" --dart-define=OFFLINE_FONTS_ONLY="true"
--- a/metadata/com.ammar.filescenter.yml
+++ b/metadata/com.ammar.filescenter.yml
@ -22,6 +22,7 @@ Builds:

  - versionName: '1.5'
    versionCode: 15
+    disable: key lost
    commit: d8d4a67717f386bf35c58ca8f8b69a4ffdc1e91b
    subdir: app
    gradle:
--- a/metadata/com.berkersen.practicesuite.yml
+++ b/metadata/com.berkersen.practicesuite.yml
@ -221,7 +221,6 @@ Builds:
      - flutter/bin/flutter config --no-analytics
      - flutter/bin/flutter pub get
    scanignore:
-      - flutter/packages/flutter_tools/gradle/flutter.gradle
      - flutter/bin/cache
    scandelete:
      - flutter
--- a/metadata/com.capyreader.app.yml
+++ b/metadata/com.capyreader.app.yml
@ -46,14 +46,6 @@ Builds:
      - free
    prebuild: sed -i -e '/firebase/d' -e '/gms.google/d' build.gradle.kts ../build.gradle.kts

-  - versionName: 2024.08.1026-dev
-    versionCode: 1026
-    commit: 6b84d4ca89e4fa93853543c9b94257d8c69fc3e9
-    subdir: app
-    gradle:
-      - free
-    prebuild: sed -i -e '/firebase/d' -e '/gms.google/d' build.gradle.kts ../build.gradle.kts
-
  - versionName: 2024.08.1027
    versionCode: 1027
    commit: c426cd8b7cc2315fc0cfd02ebd9ffcb48bd359a4
--- a/metadata/com.nextcloud.android.beta.yml
+++ b/metadata/com.nextcloud.android.beta.yml
@ -14118,21 +14118,6 @@ Builds:
    scandelete:
      - app/src/androidTest/assets

-  - versionName: '20240808'
-    versionCode: 20240808
-    commit: 53bf772db8fc17cb7c9df4be3a349a3714701dee
-    subdir: app
-    gradle:
-      - versionDev
-    rm:
-      - user_manual
-    prebuild:
-      - mkdir -p $HOME/.gradle
-      - echo "org.gradle.jvmargs=-Xmx9g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError"
-        > $HOME/.gradle/gradle.properties
-    scandelete:
-      - app/src/androidTest/assets
-
  - versionName: '20240809'
    versionCode: 20240809
    commit: 4a24469a2fad19b5a47ac0d78888dbfbfff47a1f
--- a/metadata/d.d.meshenger.yml
+++ b/metadata/d.d.meshenger.yml
@ -252,22 +252,6 @@ Builds:
    gradle:
      - fdroid

-  - versionName: 4.3.1
-    versionCode: 431
-    disable: https://github.com/meshenger-app/meshenger-android/issues/140
-    commit: 084a0dda9bd7ecd785bc6e9bd8218ed8692a07f3
-    subdir: app
-    gradle:
-      - fdroid
-
-  - versionName: 4.3.2
-    versionCode: 432
-    disable: webrtc.aar
-    commit: 27a8508481c6f0905be95de3fb23fad09da0ee2d
-    subdir: app
-    gradle:
-      - fdroid
-
  - versionName: 4.3.3
    versionCode: 433
    commit: 5599f241e1cd17e1a1e27de3d7529d4d2c3f84b9
@ -277,6 +261,7 @@ Builds:

  - versionName: 4.3.4
    versionCode: 434
+    disable: https://github.com/meshenger-app/meshenger-android/issues/158
    commit: 518c05c57c2870d427900b2ecc1e36caf746bd19
    subdir: app
    gradle:
--- a/metadata/de.moekadu.tuner.yml
+++ b/metadata/de.moekadu.tuner.yml
@ -284,13 +284,6 @@ Builds:
    gradle:
      - yes

-  - versionName: 6.8.1
-    versionCode: 37
-    commit: c72205f3b7e47c4d4a7be151d6e9acbd2e3f4863
-    subdir: app
-    gradle:
-      - yes
-
  - versionName: 6.8.2
    versionCode: 38
    commit: 75e0a979b89dd53bca9719ce712e4f9d93e41862
--- a/metadata/eu.neilalexander.yggdrasil.yml
+++ b/metadata/eu.neilalexander.yggdrasil.yml
@ -130,41 +130,9 @@ Builds:
      - cp yggdrasil.aar ../../app/libs
    ndk: r21e

-  - versionName: 0.1-017
-    versionCode: 17
-    disable: https://github.com/yggdrasil-network/yggdrasil-android/issues/58
-    commit: 6a66960666c718516b89cefffd4d504d3e9ec3f1
-    subdir: app
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -t bullseye-backports -y golang-go
-      - apt-get install -y gcc libc-dev
-    gradle:
-      - yes
-    srclibs:
-      - go@go1.20.10
-    prebuild:
-      - sdkmanager 'platforms;android-21'
-      - sed -i -e 's/-target android/-target android -androidapi 21/g' ../libs/yggdrasil-go/contrib/mobile/build
-    build:
-      - pushd $$go$$/src
-      - ./make.bash
-      - popd
-      - export PATH=$$go$$/bin:$PATH
-      - mkdir libs
-      - cd ..
-      - export GOPATH="$PWD/golang"
-      - export PATH="$GOPATH/bin:$PATH"
-      - go install golang.org/x/mobile/cmd/gomobile@latest
-      - cd libs/yggdrasil-go
-      - gomobile init
-      - ./contrib/mobile/build -a
-      - cp yggdrasil.aar ../../app/libs
-    ndk: r21e
-
  - versionName: 0.1-018
    versionCode: 18
+    disable: https://github.com/yggdrasil-network/yggdrasil-android/issues/58
    commit: 060c096cdf065eb3e7b7bf3038923840adeee799
    subdir: app
    submodules: true
--- a/metadata/lying.fengfeng.snapsaver.yml
+++ b/metadata/lying.fengfeng.snapsaver.yml
@ -52,6 +52,7 @@ Builds:

  - versionName: 0.2.0
    versionCode: 2
+    disable: https://github.com/NielsLee/SnapSaver/issues/1
    commit: aaf9603372180bac90e9986a6ccd8cc2d62ca7a4
    submodules: true
    sudo:
--- a/metadata/ogz.tripeaks.yml
+++ b/metadata/ogz.tripeaks.yml
@ -120,19 +120,13 @@ Builds:
    gradle:
      - yes

-  - versionName: 1.1b1
-    versionCode: 22
-    commit: 1e8f3867e2501c8f6687fbabb566eedb48f34054
-    subdir: android
-    gradle:
-      - yes
-
  - versionName: 1.1-beta.2
    versionCode: 23
    commit: 6b82e99379a7d80dc4dd030105626b6636d290bf
    subdir: android
    gradle:
      - yes
+    prebuild: sed -i -e "/s01.oss.sonatype.org'/d" ../build.gradle

 AutoUpdateMode: Version
 UpdateCheckMode: Tags
--- a/metadata/org.breezyweather.yml
+++ b/metadata/org.breezyweather.yml
@ -67,6 +67,15 @@ Builds:
    binary: https://github.com/breezy-weather/breezy-weather/releases/download/v5.2.6/breezy-weather-v%v.apk
    prebuild: sed -i -e '/isEnable/s/true/false/' build.gradle.kts

+  - versionName: 5.2.7_freenet
+    versionCode: 50207
+    commit: ea0a27f948b7b311bf9ef88ad15d70c49c10c3dd
+    subdir: app
+    gradle:
+      - freenet
+    binary: https://github.com/breezy-weather/breezy-weather/releases/download/v5.2.7/breezy-weather-v%v.apk
+    prebuild: sed -i -e '/isEnable/s/true/false/' build.gradle.kts
+
 AllowedAPKSigningKeys: 29d435f70aa9aec3c1faff7f7ffa6e15785088d87f06ecfcab9c3cc62dc269d8

 MaintainerNotes: Per flavor versionName suffix does not allow to template the Binaries
--- a/metadata/org.revengate.revengate.yml
+++ b/metadata/org.revengate.revengate.yml
@ -610,6 +610,7 @@ Builds:

  - versionName: 0.12.9
    versionCode: 1028129
+    disable: build failed
    commit: 7e8c7c0220829dd1214fdbadba275cfd77f90f5a
    sudo:
      - apt-get update
--- a/metadata/wseemann.media.romote.yml
+++ b/metadata/wseemann.media.romote.yml
@ -215,17 +215,8 @@ Builds:
    versionCode: 26
    commit: 1074e19f4cdf70df9a4e7b060239dde50d6a25cc
    subdir: app
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y maven
    gradle:
      - yes
-    rm:
-      - app/src/main/libs/jaku-1.6.jar
-    build:
-      - mvn install -f ../Jaku/pom.xml -Dmaven.test.skip=true
-      - cp ~/.m2/repository/com/wseemann/jaku/1.6/jaku-1.6.jar src/main/libs/

 AutoUpdateMode: Version
 UpdateCheckMode: Tags