From 31b3839908b746fcdf04f54c04dbfa05aabea630 Mon Sep 17 00:00:00 2001 From: linsui Date: Sun, 17 Mar 2024 21:13:42 +0800 Subject: [PATCH] misc fixes --- metadata/com.foxdebug.acode.yml | 30 ++++++++++++++++++++++++ metadata/com.m3u.androidApp.yml | 1 + metadata/dev.imranr.obtainium.fdroid.yml | 27 ++++++++++++++------- metadata/top.fumiama.copymanga.yml | 7 ------ 4 files changed, 49 insertions(+), 16 deletions(-) diff --git a/metadata/com.foxdebug.acode.yml b/metadata/com.foxdebug.acode.yml index 3b513fa10a..4e59511720 100644 --- a/metadata/com.foxdebug.acode.yml +++ b/metadata/com.foxdebug.acode.yml @@ -905,6 +905,36 @@ Builds: - node_modules/jszip/.jekyll-metadata build: cordova compile android --release -- --packageType=apk + - versionName: 1.10.0 + versionCode: 944 + commit: 99d1dab0df7423672c938c9a3949e3d724e012c8 + sudo: + - sysctl fs.inotify.max_user_watches=524288 || true + - chmod -R 777 /opt/android-sdk + - apt-get update + - apt-get install -y npm + - npm install -g cordova yarn + output: platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk + rm: + - src/pages/donate + - src/plugins/iap + prebuild: + - sed -i -e '/iap/d' package.json + - sed -i -e '/iap.startConnection/,/Purchase error/c} catch (e) {' src/lib/main.js + - sed -i -e '/Donate/d' src/settings/mainSettings.js + - sed -i -e 's/acodefree/acode/' utils/config.js + - sed -i -e 's/build/prepare/' utils/scripts/build.sh + - sed -i -e '/core-google-shortcuts/d' src/plugins/system/plugin.xml + - yarn setup + - cordova prepare + - mkdir -p www/css/build www/js/build + - rm node_modules/cordova-android/framework/cordova-publish.gradle + - yarn build android free p + - sdkmanager 'build-tools;33.0.2' + scandelete: + - node_modules/jszip/.jekyll-metadata + build: cordova compile android --release -- --packageType=apk + AutoUpdateMode: None UpdateCheckMode: HTTP UpdateCheckData: https://raw.githubusercontent.com/deadlyjack/Acode/main/config.xml|android-versionCode="(\d+)"|.|version="([\d.]+)" diff --git a/metadata/com.m3u.androidApp.yml b/metadata/com.m3u.androidApp.yml index 737cdd6797..3f31fc5b4c 100644 --- a/metadata/com.m3u.androidApp.yml +++ b/metadata/com.m3u.androidApp.yml @@ -88,6 +88,7 @@ Builds: - versionName: 1.14.0-beta07 versionCode: 132 + disable: https://github.com/realOxy/M3UAndroid/issues/95 commit: ee83f95c91d9578668838c37553a8ba82008ec27 subdir: androidApp sudo: diff --git a/metadata/dev.imranr.obtainium.fdroid.yml b/metadata/dev.imranr.obtainium.fdroid.yml index c5f3b5b325..4ac291e8d2 100644 --- a/metadata/dev.imranr.obtainium.fdroid.yml +++ b/metadata/dev.imranr.obtainium.fdroid.yml @@ -695,7 +695,9 @@ Builds: sudo: - mkdir -p /home/runner - chown vagrant /home/runner + - echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list - apt-get update + - apt-get install -y -t bullseye openjdk-11-jdk-headless output: build/app/outputs/flutter-apk/app-x86_64-fdroid-release.apk binary: https://github.com/ImranR98/Obtainium/releases/download/v%v/app-x86_64-fdroid-release.apk srclibs: @@ -723,12 +725,13 @@ Builds: - mv dev.imranr.obtainium.fdroid $repo/Obtainium - pushd $repo/Obtainium - pushd $$transistor-background-fetch$$/android/tsbackgroundfetch/ - - JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 gradle assembleRelease + - gradle assembleRelease - gradle publishToMavenLocal - popd - export PUB_CACHE=$(pwd)/.pub-cache - - .flutter/bin/flutter build apk --release --split-per-abi --target-platform="android-x64" - --flavor fdroid -t lib/main_fdroid.dart + - JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 .flutter/bin/flutter build apk + --release --split-per-abi --target-platform="android-x64" --flavor fdroid + -t lib/main_fdroid.dart - popd - mv $repo/Obtainium dev.imranr.obtainium.fdroid @@ -739,7 +742,9 @@ Builds: sudo: - mkdir -p /home/runner - chown vagrant /home/runner + - echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list - apt-get update + - apt-get install -y -t bullseye openjdk-11-jdk-headless output: build/app/outputs/flutter-apk/app-armeabi-v7a-fdroid-release.apk binary: https://github.com/ImranR98/Obtainium/releases/download/v%v/app-armeabi-v7a-fdroid-release.apk srclibs: @@ -767,12 +772,13 @@ Builds: - mv dev.imranr.obtainium.fdroid $repo/Obtainium - pushd $repo/Obtainium - pushd $$transistor-background-fetch$$/android/tsbackgroundfetch/ - - JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 gradle assembleRelease + - gradle assembleRelease - gradle publishToMavenLocal - popd - export PUB_CACHE=$(pwd)/.pub-cache - - .flutter/bin/flutter build apk --release --split-per-abi --target-platform="android-arm" - --flavor fdroid -t lib/main_fdroid.dart + - JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 .flutter/bin/flutter build apk + --release --split-per-abi --target-platform="android-arm" --flavor fdroid + -t lib/main_fdroid.dart - popd - mv $repo/Obtainium dev.imranr.obtainium.fdroid @@ -783,7 +789,9 @@ Builds: sudo: - mkdir -p /home/runner - chown vagrant /home/runner + - echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list - apt-get update + - apt-get install -y -t bullseye openjdk-11-jdk-headless output: build/app/outputs/flutter-apk/app-arm64-v8a-fdroid-release.apk binary: https://github.com/ImranR98/Obtainium/releases/download/v%v/app-arm64-v8a-fdroid-release.apk srclibs: @@ -811,12 +819,13 @@ Builds: - mv dev.imranr.obtainium.fdroid $repo/Obtainium - pushd $repo/Obtainium - pushd $$transistor-background-fetch$$/android/tsbackgroundfetch/ - - JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 gradle assembleRelease + - gradle assembleRelease - gradle publishToMavenLocal - popd - export PUB_CACHE=$(pwd)/.pub-cache - - .flutter/bin/flutter build apk --release --split-per-abi --target-platform="android-arm64" - --flavor fdroid -t lib/main_fdroid.dart + - JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 .flutter/bin/flutter build apk + --release --split-per-abi --target-platform="android-arm64" --flavor fdroid + -t lib/main_fdroid.dart - popd - mv $repo/Obtainium dev.imranr.obtainium.fdroid diff --git a/metadata/top.fumiama.copymanga.yml b/metadata/top.fumiama.copymanga.yml index 462ef7de28..40414b996b 100644 --- a/metadata/top.fumiama.copymanga.yml +++ b/metadata/top.fumiama.copymanga.yml @@ -151,13 +151,6 @@ Builds: gradle: - yes - - versionName: 2.2.5 - versionCode: 53 - commit: f0e7802eb28a84ac910fbb49d5cf60cd2c596989 - subdir: app - gradle: - - yes - - versionName: 2.2.6 versionCode: 54 commit: aa0190fbb7e404547d9d3e0709605fd30198eb77