From 7cd7520a486a680b489c591750a5f3c7241ea18b Mon Sep 17 00:00:00 2001 From: linsui Date: Tue, 2 May 2023 16:27:34 +0800 Subject: [PATCH] misc fixes --- metadata/btools.routingapp.yml | 2 +- metadata/com.activitymanager.yml | 4 ++ metadata/com.adilhanney.saber.yml | 44 ------------------- metadata/com.berkersen.practicesuite.yml | 11 +---- metadata/com.flxrs.dankchat.yml | 20 --------- metadata/de.tap.easy_xkcd.yml | 4 ++ metadata/development.parkenulm.yml | 1 + metadata/host.stjin.anonaddy.yml | 4 ++ metadata/io.github.yamin8000.dooz.yml | 16 ------- .../io.nekohasekai.sagernet.plugin.mieru.yml | 1 - metadata/org.koitharu.kotatsu.yml | 7 --- 11 files changed, 15 insertions(+), 99 deletions(-) diff --git a/metadata/btools.routingapp.yml b/metadata/btools.routingapp.yml index 6d29385493..c0182e5d98 100644 --- a/metadata/btools.routingapp.yml +++ b/metadata/btools.routingapp.yml @@ -154,7 +154,7 @@ Builds: commit: 340227016ab0d08afa6ec301a9a7d7f9607946de subdir: brouter-routing-app gradle: - - api30 + - yes prebuild: sed -i -e '/publishing {/,/^ }/d' ../build.gradle scanignore: - brouter-routing-app/src/main/assets/*.zip diff --git a/metadata/com.activitymanager.yml b/metadata/com.activitymanager.yml index df7740de51..1074f7c7bd 100644 --- a/metadata/com.activitymanager.yml +++ b/metadata/com.activitymanager.yml @@ -152,6 +152,10 @@ Builds: versionCode: 540 commit: 0ec409c845487a71385984d61340c8f32967e01d subdir: app + sudo: + - apt-get update + - apt-get install -y openjdk-17-jdk-headless + - update-alternatives --auto java gradle: - prod diff --git a/metadata/com.adilhanney.saber.yml b/metadata/com.adilhanney.saber.yml index ee5221d90e..99edf8bf5b 100644 --- a/metadata/com.adilhanney.saber.yml +++ b/metadata/com.adilhanney.saber.yml @@ -1215,50 +1215,6 @@ Builds: antifeatures: - NonFreeNet - - versionName: 0.11.6 - versionCode: 11061 - commit: 4279cf26ae0d93d067e30ec9e6fa7f953cbde63e - submodules: true - sudo: - - apt-get update - - apt-get install -y gcc libc-dev - output: build/app/outputs/flutter-apk/app-release.apk - srclibs: - - rustup@1.25.2 - rm: - - .github - - assets_raw - - flatpak - - installers - - ios - - linux - - macos - - packages/onyxsdk_pen - - snap - - windows - prebuild: - - ./patches/remove_proprietary_dependencies.sh - - ./patches/remove_request_install_packages_permission.sh - - export PUB_CACHE=$(pwd)/.pub-cache - - submodules/flutter/bin/flutter config --no-analytics - - submodules/flutter/bin/flutter pub get - scanignore: - - submodules/flutter/packages/flutter_tools/gradle/flutter.gradle - - submodules/flutter/bin/cache - scandelete: - - submodules/flutter - - .pub-cache - build: - - $$rustup$$/rustup-init.sh -y - - source $HOME/.cargo/env - - export ANDROID_NDK_ROOT=$$NDK$$ - - rustup target add armv7-linux-androideabi - - rustup target add aarch64-linux-android - - rustup target add x86_64-linux-android - - export PUB_CACHE=$(pwd)/.pub-cache - - submodules/flutter/bin/flutter build apk -t lib/main_fdroid.dart - ndk: r25c - - versionName: 0.11.7 versionCode: 11070 commit: f0d6523814e1025648ef7994a8c248b720e94fdf diff --git a/metadata/com.berkersen.practicesuite.yml b/metadata/com.berkersen.practicesuite.yml index 4652741de3..ce3ae60868 100644 --- a/metadata/com.berkersen.practicesuite.yml +++ b/metadata/com.berkersen.practicesuite.yml @@ -144,6 +144,7 @@ Builds: - versionName: 1.1.1 versionCode: 111 + disable: https://codeberg.org/Berker/practice_suite/issues/32 commit: e7c452ea8119d6748298095606a11bc0d79b85d8 submodules: true output: build/app/outputs/flutter-apk/app-release.apk @@ -151,14 +152,9 @@ Builds: - ios - test prebuild: - - cd .. - - mv com.berkersen.practicesuite /tmp/build - - pushd /tmp/build/ - export PUB_CACHE=$(pwd)/.pub-cache - flutter/bin/flutter config --no-analytics - flutter/bin/flutter pub get - - popd - - mv /tmp/build com.berkersen.practicesuite scanignore: - flutter/packages/flutter_tools/gradle/flutter.gradle - flutter/bin/cache @@ -166,13 +162,8 @@ Builds: - flutter - .pub-cache build: - - cd .. - - mv com.berkersen.practicesuite /tmp/build - - pushd /tmp/build/ - export PUB_CACHE=$(pwd)/.pub-cache - flutter/bin/flutter build apk - - popd - - mv /tmp/build com.berkersen.practicesuite AutoUpdateMode: Version UpdateCheckMode: Tags diff --git a/metadata/com.flxrs.dankchat.yml b/metadata/com.flxrs.dankchat.yml index 6abe221715..37c9fc1b7f 100644 --- a/metadata/com.flxrs.dankchat.yml +++ b/metadata/com.flxrs.dankchat.yml @@ -1329,26 +1329,6 @@ Builds: - yes ndk: r21e - - versionName: 3.6.21 - versionCode: 30621 - commit: e028385c4662dccd12aa5b211a5efb4d1d20f1bc - subdir: app - gradle: - - yes - ndk: r21e - - - versionName: 3.6.23 - versionCode: 30623 - commit: c41a9bb418d37978af74427b687f1fe178c00133 - subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-17-jdk-headless - - update-java-alternatives -a - gradle: - - yes - ndk: r21e - - versionName: 3.6.24 versionCode: 30624 commit: b4b168a129c84be4c3acf894eaf9b35da614ec5f diff --git a/metadata/de.tap.easy_xkcd.yml b/metadata/de.tap.easy_xkcd.yml index 3afd6d480f..b2772d699f 100644 --- a/metadata/de.tap.easy_xkcd.yml +++ b/metadata/de.tap.easy_xkcd.yml @@ -1285,6 +1285,10 @@ Builds: versionCode: 191 commit: 0548a54eb4ca1f9165fb8f236f369357da87de46 subdir: app + sudo: + - apt-get update + - apt-get install -y openjdk-17-jdk-headless + - update-alternatives --auto java gradle: - fdroid srclibs: diff --git a/metadata/development.parkenulm.yml b/metadata/development.parkenulm.yml index aaadf17786..fd770387c6 100644 --- a/metadata/development.parkenulm.yml +++ b/metadata/development.parkenulm.yml @@ -37,6 +37,7 @@ Builds: - update-alternatives --auto java gradle: - yes + binary: https://github.com/bircni/ParkenUlmAndroid/releases/download/v2.0/ParkenUlm-v2.0.apk AllowedAPKSigningKeys: b26491405fadc0cd2001644d62d2a2ae9696a8f642e0c6e27ce6679af67a2576 diff --git a/metadata/host.stjin.anonaddy.yml b/metadata/host.stjin.anonaddy.yml index ea8cab74c6..7b61070308 100644 --- a/metadata/host.stjin.anonaddy.yml +++ b/metadata/host.stjin.anonaddy.yml @@ -338,6 +338,10 @@ Builds: versionCode: 334630100 commit: 3a016e698fb2d10b6cc90a2b8ba2a6da478e97cc subdir: app + sudo: + - apt-get update + - apt-get install -y openjdk-17-jdk-headless + - update-java-alternatives -a gradle: - gplayless rm: diff --git a/metadata/io.github.yamin8000.dooz.yml b/metadata/io.github.yamin8000.dooz.yml index 03e14dd157..f9a59fd62f 100644 --- a/metadata/io.github.yamin8000.dooz.yml +++ b/metadata/io.github.yamin8000.dooz.yml @@ -49,22 +49,6 @@ Builds: postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$ 'META-INF/services/*' - - versionName: 1.0.6 - versionCode: 7 - commit: d144a8e868afb0515e91f690f8189f0c57592445 - subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-17-jdk-headless - - update-java-alternatives -a - gradle: - - free - srclibs: - - reproducible-apk-tools@v0.2.3 - prebuild: sed -i -e '/IdSuffix/d' build.gradle - postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$ - 'META-INF/services/*' - - versionName: 1.0.8 versionCode: 8 commit: a0978903bb5bba5c4159dd4dba29840c80542b54 diff --git a/metadata/io.nekohasekai.sagernet.plugin.mieru.yml b/metadata/io.nekohasekai.sagernet.plugin.mieru.yml index 39afd6e815..efee1db772 100644 --- a/metadata/io.nekohasekai.sagernet.plugin.mieru.yml +++ b/metadata/io.nekohasekai.sagernet.plugin.mieru.yml @@ -172,7 +172,6 @@ Builds: - fdroid prebuild: cp -R ../../gradle ./ scandelete: - - external - plugin ndk: r25 diff --git a/metadata/org.koitharu.kotatsu.yml b/metadata/org.koitharu.kotatsu.yml index a5fe6421bd..8f5d870775 100644 --- a/metadata/org.koitharu.kotatsu.yml +++ b/metadata/org.koitharu.kotatsu.yml @@ -571,13 +571,6 @@ Builds: gradle: - yes - - versionName: '5.0' - versionCode: 538 - commit: 85065c57a117dba228d511511b908b196f9e81a0 - subdir: app - gradle: - - yes - - versionName: 5.0.1 versionCode: 539 commit: 3fd6bec4336b22f426eb4922c16be37dcff348a6