From a719dfd6328576fce0310c01647afc8d9053a822 Mon Sep 17 00:00:00 2001 From: linsui <2873532-linsui@users.noreply.gitlab.com> Date: Sun, 18 Aug 2024 19:12:40 +0800 Subject: [PATCH] misc fixes --- metadata/com.averi.worldscribe.yml | 1 + metadata/com.berkersen.practicesuite.yml | 1 + metadata/com.drdisagree.colorblendr.yml | 13 +- metadata/com.github.meypod.al_azan.yml | 4 + metadata/com.nathanatos.Cuppa.yml | 2 +- metadata/com.nextcloud.android.beta.yml | 15 --- metadata/com.presley.fit_book.yml | 126 ------------------ .../com.razeeman.util.simpletimetracker.yml | 1 + metadata/com.simondalvai.ball2box.yml | 4 +- metadata/com.toasterofbread.spmp.yml | 7 + metadata/com.ztftrue.music.yml | 7 - metadata/de.hbch.traewelling.yml | 1 + metadata/de.mm20.launcher2.release.yml | 1 + metadata/eu.faircode.email.yml | 11 -- metadata/net.ygingras.minutemaze.yml | 31 ----- metadata/org.avmedia.remotevideocam.yml | 1 + metadata/org.hollowbamboo.chordreader2.yml | 1 + metadata/tech.lolli.toolbox.yml | 3 + 18 files changed, 25 insertions(+), 205 deletions(-) diff --git a/metadata/com.averi.worldscribe.yml b/metadata/com.averi.worldscribe.yml index df210a0a37..d34fcc4c75 100644 --- a/metadata/com.averi.worldscribe.yml +++ b/metadata/com.averi.worldscribe.yml @@ -130,6 +130,7 @@ Builds: - versionName: 1.9.0 versionCode: 30 + disable: https://github.com/MarquisLP/World-Scribe/issues/75 commit: 2780e2b25560989d95ab40b30a72818f5e3a31d6 subdir: app gradle: diff --git a/metadata/com.berkersen.practicesuite.yml b/metadata/com.berkersen.practicesuite.yml index 65550ad978..faa0ade7fd 100644 --- a/metadata/com.berkersen.practicesuite.yml +++ b/metadata/com.berkersen.practicesuite.yml @@ -231,6 +231,7 @@ Builds: - versionName: 2.1.0 versionCode: 125 + disable: https://codeberg.org/Berker/practice_suite/issues/43 commit: e259df580bddebdf0ab2ca68f004c21fb60753cd submodules: true output: build/app/outputs/flutter-apk/app-release.apk diff --git a/metadata/com.drdisagree.colorblendr.yml b/metadata/com.drdisagree.colorblendr.yml index d10914249c..bb47fc31c8 100644 --- a/metadata/com.drdisagree.colorblendr.yml +++ b/metadata/com.drdisagree.colorblendr.yml @@ -81,20 +81,9 @@ Builds: postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines '$$OUT$$' 'META-INF/services/*' - - versionName: v1.6 - versionCode: 14 - disable: https://github.com/Mahmud0808/ColorBlendr/issues/75#issuecomment-2291732668 - commit: 4adb1a49ad0a411136914d715ddbf39da023beca - subdir: app - gradle: - - yes - srclibs: - - reproducible-apk-tools@v0.2.8 - postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines '$$OUT$$' - 'META-INF/services/*' - - versionName: v1.7 versionCode: 15 + disable: https://github.com/Mahmud0808/ColorBlendr/issues/75#issuecomment-2291732668 commit: d223455d71cf35f2746c34ef8cc8d8db559c3084 subdir: app gradle: diff --git a/metadata/com.github.meypod.al_azan.yml b/metadata/com.github.meypod.al_azan.yml index 736bbaecc0..b43b33b531 100644 --- a/metadata/com.github.meypod.al_azan.yml +++ b/metadata/com.github.meypod.al_azan.yml @@ -7421,6 +7421,7 @@ Builds: - versionName: 1.17.10 versionCode: 77001 + disable: https://gitlab.com/fdroid/fdroiddata/-/merge_requests/15592 commit: 332f1900847711843f40b80cd91ca5ba6ce29ae2 subdir: android/app submodules: true @@ -7468,6 +7469,7 @@ Builds: - versionName: 1.17.10 versionCode: 77002 + disable: https://gitlab.com/fdroid/fdroiddata/-/merge_requests/15592 commit: 332f1900847711843f40b80cd91ca5ba6ce29ae2 subdir: android/app submodules: true @@ -7515,6 +7517,7 @@ Builds: - versionName: 1.17.10 versionCode: 77003 + disable: https://gitlab.com/fdroid/fdroiddata/-/merge_requests/15592 commit: 332f1900847711843f40b80cd91ca5ba6ce29ae2 subdir: android/app submodules: true @@ -7562,6 +7565,7 @@ Builds: - versionName: 1.17.10 versionCode: 77004 + disable: https://gitlab.com/fdroid/fdroiddata/-/merge_requests/15592 commit: 332f1900847711843f40b80cd91ca5ba6ce29ae2 subdir: android/app submodules: true diff --git a/metadata/com.nathanatos.Cuppa.yml b/metadata/com.nathanatos.Cuppa.yml index a615a311ff..d2bdc03a11 100644 --- a/metadata/com.nathanatos.Cuppa.yml +++ b/metadata/com.nathanatos.Cuppa.yml @@ -374,7 +374,7 @@ Builds: commit: bbcec4aa55eb6643de24503e378fa4745ffdba93 output: build/app/outputs/apk/release/app-release-unsigned.apk srclibs: - - flutter@3.22.3 + - flutter@3.24.0 rm: - ios prebuild: diff --git a/metadata/com.nextcloud.android.beta.yml b/metadata/com.nextcloud.android.beta.yml index 38625a52b7..d050f38f62 100644 --- a/metadata/com.nextcloud.android.beta.yml +++ b/metadata/com.nextcloud.android.beta.yml @@ -14163,21 +14163,6 @@ Builds: scandelete: - app/src/androidTest/assets - - versionName: '20240817' - versionCode: 20240817 - commit: 9680900294e239713b4e622756beec2570047a43 - 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: '20240818' versionCode: 20240818 commit: ec72cd8f7b356d2a530359306607065976f96cd0 diff --git a/metadata/com.presley.fit_book.yml b/metadata/com.presley.fit_book.yml index ecdeee4f52..eef2e8d5d2 100644 --- a/metadata/com.presley.fit_book.yml +++ b/metadata/com.presley.fit_book.yml @@ -2314,132 +2314,6 @@ Builds: - mv /home/brandon/fitbook com.presley.fit_book ndk: r21e - - versionName: 1.0.80 - versionCode: 851 - commit: dfbfa7e783a4eebcc429bccf9d217371e65ac819 - submodules: true - sudo: - - apt-get update - - apt-get install -y ninja-build - - mkdir -p /home/brandon - - 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 - rm: - - ios - - linux - - web - - windows - prebuild: - - sdkmanager 'cmake;3.18.1' - - cd .. - - mv com.presley.fit_book /home/brandon/fitbook - - pushd /home/brandon/fitbook - - export PUB_CACHE=$(pwd)/.pub-cache - - flutter/bin/flutter config --no-analytics - - flutter/bin/flutter pub get - - popd - - mv /home/brandon/fitbook com.presley.fit_book - scanignore: - - assets/my-food-data.zip - - flutter/bin/cache - scandelete: - - .pub-cache - - flutter - build: - - cd .. - - mv com.presley.fit_book /home/brandon/fitbook - - pushd /home/brandon/fitbook - - export PUB_CACHE=$(pwd)/.pub-cache - - flutter/bin/flutter build apk --split-per-abi --target-platform="android-x64" - - popd - - mv /home/brandon/fitbook com.presley.fit_book - ndk: r21e - - - versionName: 1.0.80 - versionCode: 852 - commit: dfbfa7e783a4eebcc429bccf9d217371e65ac819 - submodules: true - sudo: - - apt-get update - - apt-get install -y ninja-build - - mkdir -p /home/brandon - - 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 - rm: - - ios - - linux - - web - - windows - prebuild: - - sdkmanager 'cmake;3.18.1' - - cd .. - - mv com.presley.fit_book /home/brandon/fitbook - - pushd /home/brandon/fitbook - - export PUB_CACHE=$(pwd)/.pub-cache - - flutter/bin/flutter config --no-analytics - - flutter/bin/flutter pub get - - popd - - mv /home/brandon/fitbook com.presley.fit_book - scanignore: - - assets/my-food-data.zip - - flutter/bin/cache - scandelete: - - .pub-cache - - flutter - build: - - cd .. - - mv com.presley.fit_book /home/brandon/fitbook - - pushd /home/brandon/fitbook - - export PUB_CACHE=$(pwd)/.pub-cache - - flutter/bin/flutter build apk --split-per-abi --target-platform="android-arm" - - popd - - mv /home/brandon/fitbook com.presley.fit_book - ndk: r21e - - - versionName: 1.0.80 - versionCode: 853 - commit: dfbfa7e783a4eebcc429bccf9d217371e65ac819 - submodules: true - sudo: - - apt-get update - - apt-get install -y ninja-build - - mkdir -p /home/brandon - - 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 - rm: - - ios - - linux - - web - - windows - prebuild: - - sdkmanager 'cmake;3.18.1' - - cd .. - - mv com.presley.fit_book /home/brandon/fitbook - - pushd /home/brandon/fitbook - - export PUB_CACHE=$(pwd)/.pub-cache - - flutter/bin/flutter config --no-analytics - - flutter/bin/flutter pub get - - popd - - mv /home/brandon/fitbook com.presley.fit_book - scanignore: - - assets/my-food-data.zip - - flutter/bin/cache - scandelete: - - .pub-cache - - flutter - build: - - cd .. - - mv com.presley.fit_book /home/brandon/fitbook - - pushd /home/brandon/fitbook - - export PUB_CACHE=$(pwd)/.pub-cache - - flutter/bin/flutter build apk --release --split-per-abi --target-platform="android-arm64" - - popd - - mv /home/brandon/fitbook com.presley.fit_book - ndk: r21e - - versionName: 1.0.81 versionCode: 881 commit: cd3535ba6487e6518f66c80e3b12db979694cb20 diff --git a/metadata/com.razeeman.util.simpletimetracker.yml b/metadata/com.razeeman.util.simpletimetracker.yml index d5ffa72a94..c6e41243e6 100644 --- a/metadata/com.razeeman.util.simpletimetracker.yml +++ b/metadata/com.razeeman.util.simpletimetracker.yml @@ -298,6 +298,7 @@ Builds: - versionName: '1.45' versionCode: 65 + disable: jcenter commit: 76800f8d7693f91bffd2e7ce5594a9dc325b8181 subdir: app gradle: diff --git a/metadata/com.simondalvai.ball2box.yml b/metadata/com.simondalvai.ball2box.yml index 9bb00d7850..f893b66a2f 100644 --- a/metadata/com.simondalvai.ball2box.yml +++ b/metadata/com.simondalvai.ball2box.yml @@ -526,8 +526,8 @@ Builds: build: - export HOME=$PWD - cp -R $$Godot$$ godot - - keytool -genkey -v -keystore debug.keystore -storepass android -alias androiddebugkey - -keypass android -dname "CN=Android Debug,O=Android,C=US" + - keytool -keyalg RSA -genkey -v -keystore debug.keystore -storepass android + -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US" - mkdir -p ./.config/godot/ - export SDK_PATH="export/android/android_sdk_path = \"$$SDK$$\"" - export DEBUG_KEYSTORE_PATH="export/android/debug_keystore = \"$PWD/debug.keystore\"" diff --git a/metadata/com.toasterofbread.spmp.yml b/metadata/com.toasterofbread.spmp.yml index a2a2dafa11..e5880a8260 100644 --- a/metadata/com.toasterofbread.spmp.yml +++ b/metadata/com.toasterofbread.spmp.yml @@ -76,8 +76,15 @@ Builds: commit: d00804090eaa3f9aaae7ece376bc8189136a17a1 subdir: androidApp submodules: true + sudo: + - echo "deb https://deb.debian.org/debian sid main" > /etc/apt/sources.list.d/sid.list + - apt-get update + - apt-get install -y -t sid openjdk-22-jdk + - update-alternatives --auto java gradle: - yes + rm: + - desktopApp/build.gradle.kts AllowedAPKSigningKeys: 38d400eb7d8fdc34895598e0f6ee6062762b747c1e8b54370b04e6dd20c337ad diff --git a/metadata/com.ztftrue.music.yml b/metadata/com.ztftrue.music.yml index e5fed7a3c2..5f2a7f1969 100644 --- a/metadata/com.ztftrue.music.yml +++ b/metadata/com.ztftrue.music.yml @@ -48,13 +48,6 @@ Builds: gradle: - yes - - versionName: 0.1.24 - versionCode: 24 - commit: 0685e5b3d1acda15607189e6bcb836daed93b5a6 - subdir: app - gradle: - - yes - - versionName: 0.1.25 versionCode: 25 commit: 78d575d833c810a0333e26d50bffd08c02508bdb diff --git a/metadata/de.hbch.traewelling.yml b/metadata/de.hbch.traewelling.yml index c209817b5e..077399e412 100644 --- a/metadata/de.hbch.traewelling.yml +++ b/metadata/de.hbch.traewelling.yml @@ -148,6 +148,7 @@ Builds: - versionName: 2.13.0 versionCode: 161 + disable: https://github.com/Traewelldroid/traewelldroid/issues/412 commit: 079cab43f52ffb70452f4db070cb911db6697282 subdir: app gradle: diff --git a/metadata/de.mm20.launcher2.release.yml b/metadata/de.mm20.launcher2.release.yml index 4b9e4daac6..0a62ef5599 100644 --- a/metadata/de.mm20.launcher2.release.yml +++ b/metadata/de.mm20.launcher2.release.yml @@ -203,6 +203,7 @@ Builds: - versionName: 1.33.0 versionCode: 2024081700 + disable: https://github.com/MM2-0/Kvaesitso/issues/1041 commit: f862c109a4a271586be6cd003fb2b5173871679b gradle: - yes diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml index bff8218592..908a454e7f 100644 --- a/metadata/eu.faircode.email.yml +++ b/metadata/eu.faircode.email.yml @@ -7636,17 +7636,6 @@ Builds: scandelete: - app/lib - - versionName: '1.2222' - versionCode: 2222 - commit: 8e9a4e430ae7aaa672cf7326d8447eab104b7e21 - subdir: app - submodules: true - gradle: - - fdroid - prebuild: sdkmanager 'cmake;3.22.1' - scandelete: - - app/lib - - versionName: '1.2223' versionCode: 2223 commit: df896966ad3dc6636ff69c355d87ec6a59a8bc81 diff --git a/metadata/net.ygingras.minutemaze.yml b/metadata/net.ygingras.minutemaze.yml index d40151d8f6..e50f4c85cd 100644 --- a/metadata/net.ygingras.minutemaze.yml +++ b/metadata/net.ygingras.minutemaze.yml @@ -71,37 +71,6 @@ Builds: APK' bin/minute-maze.apk ndk: 23.2.8568313 - - versionName: 0.2.0 - versionCode: 200 - commit: fa16309ba8bcb1c4ec413af739824fa55f3049a1 - sudo: - - apt-get update - - apt-get install -y python3-invoke build-essential scons pkg-config libx11-dev - libxcursor-dev libxinerama-dev libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev - libudev-dev libxi-dev libxrandr-dev - output: bin/minute-maze.apk - srclibs: - - Godot@82cedc83c9069125207c128f9a07ce3d82c317cc - prebuild: - - mkdir -p bin - - mkdir -p android - - pushd $$Godot$$ - - popd - build: - - export ANDROID_SDK_ROOT=$$SDK$$ - - export ANDROID_NDK_ROOT=$$NDK$$ - - export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 - - pushd $$Godot$$ - - scons -j `nproc` platform=linuxbsd target=editor - - scons -j `nproc` platform=android target=template_release arch=arm64 - - cd platform/android/java - - gradle generateGodotTemplates - - popd - - invoke make-fdroid-presets $$Godot$$ - - $$Godot$$/bin/godot.linuxbsd.editor.x86_64 --headless --export-release 'Android - APK' bin/minute-maze.apk - ndk: 23.2.8568313 - AutoUpdateMode: Version UpdateCheckMode: Tags UpdateCheckData: src/consts.gd|const VERSION_CODE := (\d+)|.|const VERSION := "([\d.]+)" diff --git a/metadata/org.avmedia.remotevideocam.yml b/metadata/org.avmedia.remotevideocam.yml index b90231b8e1..cc24dcce19 100644 --- a/metadata/org.avmedia.remotevideocam.yml +++ b/metadata/org.avmedia.remotevideocam.yml @@ -94,6 +94,7 @@ Builds: - versionName: '3.4' versionCode: 34 + disable: https://github.com/izivkov/RemoteVideoCam/issues/28 commit: b9c7c7d29f71158b3844007dbd61eab0fc6a80eb subdir: app gradle: diff --git a/metadata/org.hollowbamboo.chordreader2.yml b/metadata/org.hollowbamboo.chordreader2.yml index c9a4f7684e..115838a9af 100644 --- a/metadata/org.hollowbamboo.chordreader2.yml +++ b/metadata/org.hollowbamboo.chordreader2.yml @@ -89,6 +89,7 @@ Builds: - versionName: 2.3.0 versionCode: 10 + disable: https://github.com/AndInTheClouds/chordreader2/issues/49 commit: f6a995cad1592acb16f4e6c10d4331d207c1acb7 subdir: app gradle: diff --git a/metadata/tech.lolli.toolbox.yml b/metadata/tech.lolli.toolbox.yml index 5ae57381b7..18e0dfcc5a 100644 --- a/metadata/tech.lolli.toolbox.yml +++ b/metadata/tech.lolli.toolbox.yml @@ -556,6 +556,7 @@ Builds: - versionName: 1.0.1070 versionCode: 10701 + disable: https://github.com/lollipopkit/flutter_server_box/issues/548 commit: 966a60a82da0cf8dc44240be1f2f2cf3604b71c7 sudo: - mkdir -p /home/runner @@ -601,6 +602,7 @@ Builds: - versionName: 1.0.1070 versionCode: 10702 + disable: https://github.com/lollipopkit/flutter_server_box/issues/548 commit: 966a60a82da0cf8dc44240be1f2f2cf3604b71c7 sudo: - mkdir -p /home/runner @@ -646,6 +648,7 @@ Builds: - versionName: 1.0.1070 versionCode: 10703 + disable: https://github.com/lollipopkit/flutter_server_box/issues/548 commit: 966a60a82da0cf8dc44240be1f2f2cf3604b71c7 sudo: - mkdir -p /home/runner