From 8bbb96a46157be1ac9e61cce7efaf6a7eb1ee0f0 Mon Sep 17 00:00:00 2001 From: linsui Date: Fri, 22 Mar 2024 18:26:45 +0800 Subject: [PATCH] misc fixes --- metadata/com.drip.yml | 47 ++++++++++++++++++++- metadata/com.foxdebug.acode.yml | 30 +++++++++++++ metadata/com.gokadzev.musify.fdroid.yml | 7 ++- metadata/ie.delilahsthings.soothingloop.yml | 2 +- metadata/org.exarhteam.iitc_mobile.yml | 45 ++------------------ 5 files changed, 86 insertions(+), 45 deletions(-) diff --git a/metadata/com.drip.yml b/metadata/com.drip.yml index 9d23a89cba..668572d0f0 100644 --- a/metadata/com.drip.yml +++ b/metadata/com.drip.yml @@ -183,12 +183,57 @@ Builds: - cp -r $$realm$$/react-native/android/src/main/jniLibs/* ../../node_modules/realm/react-native/android/src/main/jniLibs/ ndk: r21e + - versionName: 1.2403.19 + versionCode: 33 + commit: 3cedcf601e072d74ada7ea9f09ad22bb7cd9b87a + subdir: android/app + sudo: + - sysctl fs.inotify.max_user_watches=524288 + - curl -Lo node.tar.gz https://nodejs.org/download/release/v14.19.3/node-v14.19.3-linux-x64.tar.gz + - echo "cc9d17834eb383565a3368f4222b825f341190813537c677973fc913dcc7bdd1 node.tar.gz" + | sha256sum -c - + - tar xzf node.tar.gz --strip-components=1 -C /usr/local/ + - npm -g install yarn + - apt-get update + - apt-get install -y cmake + gradle: + - yes + srclibs: + - realm@d45b632e31c02a871ccf60c5ce2e51736b79852f + prebuild: + - yarn install --frozen-lockfile + - sdkmanager "cmake;3.18.1" + scanignore: + - node_modules/jsc-android + - node_modules/hermes-engine/android + - node_modules/react-native/android/com/facebook/react/react-native/*/ + - android/build.gradle + - node_modules/react-native/template/android/build.gradle + - node_modules/react-native/ReactAndroid/build.gradle + - node_modules/react-native-document-picker/android/build.gradle + - node_modules/react-native-vector-icons/android/build.gradle + - node_modules/@react-native-async-storage/async-storage/android/build.gradle + - node_modules/react-native-permissions/android/build.gradle + - node_modules/@react-native-community/art/android/build.gradle + - node_modules/@react-native-community/push-notification-ios/android/build.gradle + - node_modules/react-native-share/android/build.gradle + - node_modules/realm/react-native/android/build.gradle + scandelete: + - node_modules + build: + - pushd $$realm$$ + - npm ci + - node scripts/build-android.js + - popd + - cp -r $$realm$$/react-native/android/src/main/jniLibs/* ../../node_modules/realm/react-native/android/src/main/jniLibs/ + ndk: r21e + MaintainerNotes: |- scanignore is used to allow the "node_modules/react-native/android" local Maven repository which contains the prebuilt react-native library which we get from npm. sed is used to remove some custom maven repos from dependencies because they bother the fdroid build realm and nodejs-mobile require different NDK versions; modifying the ENV vars is unsupported, but works for now AutoUpdateMode: None -UpdateCheckMode: Tags +UpdateCheckMode: Tags ^(Release|Android)- CurrentVersion: 1.2403.19 CurrentVersionCode: 33 diff --git a/metadata/com.foxdebug.acode.yml b/metadata/com.foxdebug.acode.yml index c80c8bca0f..b14c38d961 100644 --- a/metadata/com.foxdebug.acode.yml +++ b/metadata/com.foxdebug.acode.yml @@ -935,6 +935,36 @@ Builds: - node_modules/jszip/.jekyll-metadata build: cordova compile android --release -- --packageType=apk + - versionName: 1.10.0 + versionCode: 945 + commit: 26ed2fbbfef507bf34a81e570dd938e6e9d7be29 + 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.gokadzev.musify.fdroid.yml b/metadata/com.gokadzev.musify.fdroid.yml index 79c4292340..5a5c63bb1b 100644 --- a/metadata/com.gokadzev.musify.fdroid.yml +++ b/metadata/com.gokadzev.musify.fdroid.yml @@ -958,8 +958,11 @@ Builds: commit: d1da5693341121a9aaba7091d1afeaf95bc6d655 sudo: - apt-get update - - apt-get install -y jq python3-pip - - pip3 install yq + - apt-get install -y yq + - 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 + - update-java-alternatives --set java-1.11.0-openjdk-amd64 - mkdir -p /home/runner/ - chown vagrant /home/runner/ output: build/app/outputs/flutter-apk/app-fdroid-release.apk diff --git a/metadata/ie.delilahsthings.soothingloop.yml b/metadata/ie.delilahsthings.soothingloop.yml index c6d5ffe664..b2455599cb 100644 --- a/metadata/ie.delilahsthings.soothingloop.yml +++ b/metadata/ie.delilahsthings.soothingloop.yml @@ -27,7 +27,7 @@ Builds: - versionName: 1.0.6 versionCode: 7 - commit: 4c67061a250498bee4141f2f4366d81a16d4e520 + commit: e7044f607724029ca785ea387c8cb35c6022c714 subdir: app gradle: - yes diff --git a/metadata/org.exarhteam.iitc_mobile.yml b/metadata/org.exarhteam.iitc_mobile.yml index 69fd909940..515dcb6c9d 100644 --- a/metadata/org.exarhteam.iitc_mobile.yml +++ b/metadata/org.exarhteam.iitc_mobile.yml @@ -329,57 +329,20 @@ Builds: - deactivate - rm -rf env - - versionName: 0.38.0 - versionCode: 1710757914 - commit: v0.38.0 - subdir: mobile/app - sudo: - - apt-get update - - apt-get install -y build-essential libffi-dev libltdl-dev libssl-dev virtualenv - zlib1g-dev - - cd build/srclib/cpython - - ./configure - - make -j`nproc` - - make altinstall - gradle: - - yes - srclibs: - - cpython@v3.7.7 - prebuild: - - cd ../.. - - virtualenv --python=python3.7 env - - source env/bin/activate - - echo "builds={'fdroid':{'post_build':['build_mobile.py'],'gradle_buildtype':'copyonly'}}" - >> localbuildsettings.py - - ./build.py fdroid - - deactivate - - rm -rf env - - versionName: 0.38.1 versionCode: 1710945781 - commit: v0.38.1 + commit: 0e44227e1b583bf358baeabace74f2fc50155a04 subdir: mobile/app - sudo: - - apt-get update - - apt-get install -y build-essential libffi-dev libltdl-dev libssl-dev virtualenv - zlib1g-dev - - cd build/srclib/cpython - - ./configure - - make -j`nproc` - - make altinstall gradle: - yes - srclibs: - - cpython@v3.7.7 prebuild: + - sed -i -e '/com.android.tools.build/s/3.3.2/7.4.2/' ../build.gradle + - sed -i -e 's/4.10.1/7.5/' ../gradle/wrapper/gradle-wrapper.properties + - sed -i -e '/metaFDroid(variant/d' build.gradle - cd ../.. - - virtualenv --python=python3.7 env - - source env/bin/activate - echo "builds={'fdroid':{'post_build':['build_mobile.py'],'gradle_buildtype':'copyonly'}}" >> localbuildsettings.py - ./build.py fdroid - - deactivate - - rm -rf env AutoUpdateMode: Version v%v UpdateCheckMode: HTTP