From 6e404d7cefbe8c4fa28d74e36a7d0b114031a87e Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 8 Jan 2024 15:02:42 +0800 Subject: [PATCH] misc fixes --- metadata/be.digitalia.fosdem.yml | 3 +- metadata/com.github.vauvenal5.yaga.yml | 17 ++- metadata/com.mde.potdroid.yml | 4 + metadata/com.standardnotes.yml | 59 -------- metadata/de.mw136.tonuino.yml | 4 + metadata/it.fast4x.rimusic.yml | 1 + metadata/net.cozic.joplin.yml | 197 +------------------------ metadata/org.oxycblt.auxio.yml | 2 +- metadata/org.tengel.timescale.yml | 4 + 9 files changed, 31 insertions(+), 260 deletions(-) diff --git a/metadata/be.digitalia.fosdem.yml b/metadata/be.digitalia.fosdem.yml index 5a4537bd63..9defb80b3b 100644 --- a/metadata/be.digitalia.fosdem.yml +++ b/metadata/be.digitalia.fosdem.yml @@ -255,7 +255,8 @@ Builds: subdir: app sudo: - apt-get update - - apt-get install -y g++ openjdk-11-jdk-headless + - apt-get install -y g++ openjdk-17-jdk-headless + - update-java-alternatives -a gradle: - yes diff --git a/metadata/com.github.vauvenal5.yaga.yml b/metadata/com.github.vauvenal5.yaga.yml index e6586cb2fb..cfc928b1ce 100644 --- a/metadata/com.github.vauvenal5.yaga.yml +++ b/metadata/com.github.vauvenal5.yaga.yml @@ -366,15 +366,24 @@ Builds: - versionName: 0.40.5 versionCode: 4005 commit: 941f20ecbc0d4ae13a66d737d5a0bb80788fdfe0 - output: build/app/outputs/flutter-apk/app-fdroid-release.apk + output: build/app/outputs/flutter-apk/app-play-release.apk srclibs: - - flutter@2.0.3 - build: + - flutter@stable + prebuild: + - version=$(sed -n -E 's/.*"flutterSdkVersion":\ "(.*)",/\1/p' .fvm/fvm_config.json) + - pushd $$flutter$$ + - git checkout -f $version + - popd + - export PUB_CACHE=$(pwd)/.pub-cache - $$flutter$$/bin/flutter config --no-analytics - $$flutter$$/bin/flutter pub get + scandelete: + - .pub-cache + build: + - export PUB_CACHE=$(pwd)/.pub-cache - $$flutter$$/bin/flutter pub run flutter_launcher_icons:main - $$flutter$$/bin/flutter pub run build_runner build --delete-conflicting-outputs - - $$flutter$$/bin/flutter build apk --flavor fdroid + - $$flutter$$/bin/flutter build apk --flavor play AutoUpdateMode: Version UpdateCheckMode: Tags ^v.*$ diff --git a/metadata/com.mde.potdroid.yml b/metadata/com.mde.potdroid.yml index 3fc8a1d14b..b20ee9a8a7 100644 --- a/metadata/com.mde.potdroid.yml +++ b/metadata/com.mde.potdroid.yml @@ -159,6 +159,10 @@ Builds: - versionName: 5.4.0 versionCode: 83 commit: b79a2e45d1a4bcf853778092216d8b53fb97548a + sudo: + - apt-get update + - apt-get install -y openjdk-17-jdk-headless + - update-java-alternatives -a gradle: - yes diff --git a/metadata/com.standardnotes.yml b/metadata/com.standardnotes.yml index fc44aa7ae6..e380dff001 100644 --- a/metadata/com.standardnotes.yml +++ b/metadata/com.standardnotes.yml @@ -13677,65 +13677,6 @@ Builds: - .yarn/ ndk: r23b - - versionName: 3.183.41 - versionCode: 3003009 - commit: '@standardnotes/mobile@3.183.41' - subdir: packages/mobile/android/app - sudo: - - apt-get update - - apt-get install -y libsecret-1-dev build-essential jq - - curl -Lo node.tar.gz https://nodejs.org/download/release/v18.6.0/node-v18.6.0-linux-x64.tar.gz - - echo "eff59cd54fdcd24dc09965b41dc8d347ab4ce367b6c395fd983cfb4c3a542e03 node.tar.gz" - | sha256sum -c - - - tar xzf node.tar.gz --strip-components=1 -C /usr/local/ - - npm install -g yarn - - sysctl fs.inotify.max_user_watches=524288 || true - init: - - cd ../../../.. - - yarn config set -H enableImmutableInstalls false - - tmpfile=$(mktemp) && cp packages/mobile/package.json "$tmpfile" && jq -r 'del - (.devDependencies["react-native-iap"]) | del (.dependencies["react-native-store-review"])' - "$tmpfile" > packages/mobile/package.json && rm "$tmpfile" - - npm_config_build_from_source=true yarn - patch: - - remove-IAP.3.146.2.patch - - disable-gms-u2f-support-3.160.17.patch - - remove-react-native-store-review.3.177.5.patch - gradle: - - prod - srclibs: - - meypod-notifee@eeee41593e4e183e967eac4e99f9bcf5bedb8d57 - rm: - - packages/mobile/ios - prebuild: - - sed -i -e '/detox/Id' -e 's/versionName appVersionName/versionName "$$VERSION$$"/' - -e 's/versionCode appVersionCode/versionCode $$VERCODE$$/' -e '/universalApk/s/false/true/' - build.gradle - - pushd ../../../.. - - sed -E -i 's/^.*(fabric|com\.(crashlytics|google\.(firebase|android.gms))).*$//g' - packages/mobile/node_modules/@notifee/react-native/android/build.gradle - - echo 'include(":notifee_core")' >> packages/mobile/android/settings.gradle - - echo 'project(":notifee_core").projectDir = file("$$meypod-notifee$$/android")' - >> packages/mobile/android/settings.gradle - - yarn run build:mobile - - popd - - pushd ../.. - - yarn run android:bundle - - popd - scanignore: - - packages/mobile/node_modules/jsc-android - - packages/mobile/node_modules/react-native - - packages/mobile/node_modules/@notifee/react-native/android/build.gradle - - packages/mobile/node_modules/detox/android/build.gradle - - packages/mobile/node_modules/@standardnotes/react-native-utils/android/build.gradle - - packages/mobile/node_modules/@react-native-async-storage/async-storage/android/build.gradle - scandelete: - - node_modules/ - - packages/mobile/node_modules - - packages/desktop - - .yarn/ - ndk: r23b - - versionName: 3.183.43 versionCode: 3003011 commit: '@standardnotes/mobile@3.183.43' diff --git a/metadata/de.mw136.tonuino.yml b/metadata/de.mw136.tonuino.yml index 5905fa6a0e..3fb2aa5b18 100644 --- a/metadata/de.mw136.tonuino.yml +++ b/metadata/de.mw136.tonuino.yml @@ -112,6 +112,10 @@ Builds: versionCode: 27 commit: 4dfb31ffa3fadfb13bf381a3677116bb350b8f68 subdir: app + sudo: + - apt-get update + - apt-get install -y openjdk-17-jdk-headless + - update-java-alternatives -a gradle: - yes diff --git a/metadata/it.fast4x.rimusic.yml b/metadata/it.fast4x.rimusic.yml index 0f84760f71..0a9b9d55b4 100644 --- a/metadata/it.fast4x.rimusic.yml +++ b/metadata/it.fast4x.rimusic.yml @@ -50,6 +50,7 @@ Builds: - versionName: 0.6.16 versionCode: 11 + disable: https://github.com/fast4x/RiMusic/issues/348 commit: fd8936125498463e165d72781dadf72b62e46801 subdir: app sudo: diff --git a/metadata/net.cozic.joplin.yml b/metadata/net.cozic.joplin.yml index 12b5cbabc5..3712fc6669 100644 --- a/metadata/net.cozic.joplin.yml +++ b/metadata/net.cozic.joplin.yml @@ -2089,202 +2089,9 @@ Builds: - npm install --build-from-source - popd - - versionName: 2.14.1 - versionCode: 2097731 - disable: build failed - commit: c5865b3bf5b40304c2a1b04eab652b575db93240 - subdir: packages/app-mobile/android/app - sudo: - - sysctl fs.inotify.max_user_watches=524288 - - apt-get update - - apt-get install -y automake build-essential gobject-introspection gtk-doc-tools - libexif-dev libexpat1-dev libgif-dev liblcms2-dev libpango1.0-dev libpng-dev - libpoppler-glib-dev librsvg2-dev libtiff5-dev libtool python-is-python3 - - curl -Lo node.tar.gz https://nodejs.org/dist/v16.14.0/node-v16.14.0-linux-x64.tar.gz - - echo "2c69e7b040c208b61ebf9735c63d2e5bcabfed32ef05a9b8dd5823489ea50d6b node.tar.gz" - | sha256sum -c - - - tar xzf node.tar.gz --strip-components=1 -C /usr/local/ - - corepack enable - init: - - pushd ../../../.. - - yarn --version - - YARN_ENABLE_IMMUTABLE_INSTALLS=false BUILD_SEQUENCIAL=1 yarn install - - yarn remove --all react-native-camera - - rm packages/app-mobile/components/CameraView.js - - rm packages/app-mobile/components/screens/Note.js - patch: - - 0001-android-remove-legacy-support.patch - gradle: - - yes - srclibs: - - react-native-sharp@v0.26.3 - - libvips@v8.10.0 - rm: - - packages/tools/PortableAppsLauncher/ - - packages/app-cli - - packages/plugin-repo-cli - - packages/app-desktop - - packages/app-clipper - - packages/server - - packages/app-mobile/components/CameraView.tsx - prebuild: - - pushd ../../../.. - - sed -i -e '/camera/d' -e '/geolocation/d' packages/app-mobile/package.json - - sed -i -e '/CameraView /d' packages/app-mobile/components/screens/Note.tsx - - YARN_ENABLE_IMMUTABLE_INSTALLS=false BUILD_SEQUENCIAL=1 yarn install - - sed -i -e '/installreferrer/,+11d' packages/app-mobile/node_modules/react-native-device-info/android/build.gradle - - pushd packages/app-mobile/node_modules/react-native-rsa-native/android - - sed -i -e 's|maven.fabric.io/public|jitpack.io|' build.gradle bin/build.gradle - - popd - - sed -i -e '/react-native-community\/geolocation/d' -e '/return new Promise/,/});/c - return this.currentPosition_testResponse();' packages/app-mobile/utils/geolocation-react.js - - popd - - sed -i -e 's|maven.aliyun.com/repository/jcenter|maven.google.com|' -e 's|maven.apache.org|repo1.maven.org/maven2|' - ../build.gradle - - sed -i '/:react-native-camera/,+2d' build.gradle - - sed -i -e '/android.permission.CAMERA/d' -e '/ACCESS_NETWORK_STATE/a ' -e - 's|xmlns:android|xmlns:tools="http://schemas.android.com/tools" xmlns:android|' - src/main/AndroidManifest.xml - scanignore: - - .yarn/install-state.gz - - .yarn/cache/*.zip - - packages/app-mobile/node_modules/jsc-android - - packages/app-mobile/node_modules/react-native/build.gradle.kts - - packages/app-mobile/node_modules/@react-native-community/netinfo/android/build.gradle - - packages/app-mobile/node_modules/@react-native-community/push-notification-ios/android/build.gradle - - packages/app-mobile/node_modules/react-native-device-info/android/build.gradle - - packages/app-mobile/node_modules/react-native-get-random-values/android/build.gradle - - packages/app-mobile/node_modules/react-native-image-picker/android/build.gradle - - packages/app-mobile/node_modules/react-native-localize/android/build.gradle - - packages/app-mobile/node_modules/react-native-rsa-native/android/bin/build.gradle - - packages/app-mobile/node_modules/react-native-rsa-native/android/build.gradle - - packages/app-mobile/node_modules/react-native-safe-area-context/android/build.gradle - - packages/app-mobile/node_modules/react-native/sdks/hermesc/linux64-bin/hermesc - - packages/app-mobile/node_modules/react-native-securerandom/android/build.gradle - - packages/app-mobile/node_modules/react-native-share/android/build.gradle - - packages/app-mobile/node_modules/react-native-vector-icons/android/build.gradle - - packages/app-mobile/node_modules/react-native-webview/android/build.gradle - - packages/react-native-alarm-notification/android/build.gradle - - packages/react-native-saf-x/android/build.gradle - scandelete: - - packages/app-mobile/node_modules - - packages/tools/node_modules - - packages/lib/node_modules - - packages/react-native-alarm-notification/node_modules - - packages/react-native-saf-x/node_modules - - node_modules - build: - - pushd $$libvips$$ - - mkdir build - - ./autogen.sh --prefix=$$libvips$$/build/ - - make -j$(nproc) - - make install - - popd - - pushd $$react-native-sharp$$ - - export PKG_CONFIG_PATH=$$libvips$$/build/lib/pkgconfig/ - - npm install --build-from-source - - popd - - - versionName: 2.14.2 - versionCode: 2097732 - disable: fails to build - commit: ff7c13ac85bffa463ad60a6ee7aeae5ee3d6299c - subdir: packages/app-mobile/android/app - sudo: - - sysctl fs.inotify.max_user_watches=524288 - - apt-get update - - apt-get install -y automake build-essential gobject-introspection gtk-doc-tools - libexif-dev libexpat1-dev libgif-dev liblcms2-dev libpango1.0-dev libpng-dev - libpoppler-glib-dev librsvg2-dev libtiff5-dev libtool python-is-python3 - - curl -Lo node.tar.gz https://nodejs.org/dist/v16.14.0/node-v16.14.0-linux-x64.tar.gz - - echo "2c69e7b040c208b61ebf9735c63d2e5bcabfed32ef05a9b8dd5823489ea50d6b node.tar.gz" - | sha256sum -c - - - tar xzf node.tar.gz --strip-components=1 -C /usr/local/ - - corepack enable - init: - - pushd ../../../.. - - yarn --version - - YARN_ENABLE_IMMUTABLE_INSTALLS=false BUILD_SEQUENCIAL=1 yarn install - - yarn remove --all react-native-camera - - rm packages/app-mobile/components/CameraView.js - - rm packages/app-mobile/components/screens/Note.js - patch: - - 0001-android-remove-legacy-support.patch - gradle: - - yes - srclibs: - - react-native-sharp@v0.26.3 - - libvips@v8.10.0 - rm: - - packages/tools/PortableAppsLauncher/ - - packages/app-cli - - packages/plugin-repo-cli - - packages/app-desktop - - packages/app-clipper - - packages/server - - packages/app-mobile/components/CameraView.tsx - prebuild: - - pushd ../../../.. - - sed -i -e '/camera/d' -e '/geolocation/d' packages/app-mobile/package.json - - sed -i -e '/CameraView /d' packages/app-mobile/components/screens/Note.tsx - - YARN_ENABLE_IMMUTABLE_INSTALLS=false BUILD_SEQUENCIAL=1 yarn install - - sed -i -e '/installreferrer/,+11d' packages/app-mobile/node_modules/react-native-device-info/android/build.gradle - - pushd packages/app-mobile/node_modules/react-native-rsa-native/android - - sed -i -e 's|maven.fabric.io/public|jitpack.io|' build.gradle bin/build.gradle - - popd - - sed -i -e '/react-native-community\/geolocation/d' -e '/return new Promise/,/});/c - return this.currentPosition_testResponse();' packages/app-mobile/utils/geolocation-react.js - - popd - - sed -i -e 's|maven.aliyun.com/repository/jcenter|maven.google.com|' -e 's|maven.apache.org|repo1.maven.org/maven2|' - ../build.gradle - - sed -i '/:react-native-camera/,+2d' build.gradle - - sed -i -e '/android.permission.CAMERA/d' -e '/ACCESS_NETWORK_STATE/a ' -e - 's|xmlns:android|xmlns:tools="http://schemas.android.com/tools" xmlns:android|' - src/main/AndroidManifest.xml - scanignore: - - .yarn/install-state.gz - - .yarn/cache/*.zip - - packages/app-mobile/node_modules/jsc-android - - packages/app-mobile/node_modules/react-native/build.gradle.kts - - packages/app-mobile/node_modules/@react-native-community/netinfo/android/build.gradle - - packages/app-mobile/node_modules/@react-native-community/push-notification-ios/android/build.gradle - - packages/app-mobile/node_modules/react-native-device-info/android/build.gradle - - packages/app-mobile/node_modules/react-native-get-random-values/android/build.gradle - - packages/app-mobile/node_modules/react-native-image-picker/android/build.gradle - - packages/app-mobile/node_modules/react-native-localize/android/build.gradle - - packages/app-mobile/node_modules/react-native-rsa-native/android/bin/build.gradle - - packages/app-mobile/node_modules/react-native-rsa-native/android/build.gradle - - packages/app-mobile/node_modules/react-native-safe-area-context/android/build.gradle - - packages/app-mobile/node_modules/react-native/sdks/hermesc/linux64-bin/hermesc - - packages/app-mobile/node_modules/react-native-securerandom/android/build.gradle - - packages/app-mobile/node_modules/react-native-share/android/build.gradle - - packages/app-mobile/node_modules/react-native-vector-icons/android/build.gradle - - packages/app-mobile/node_modules/react-native-webview/android/build.gradle - - packages/react-native-alarm-notification/android/build.gradle - - packages/react-native-saf-x/android/build.gradle - scandelete: - - packages/app-mobile/node_modules - - packages/tools/node_modules - - packages/lib/node_modules - - packages/react-native-alarm-notification/node_modules - - packages/react-native-saf-x/node_modules - - node_modules - build: - - pushd $$libvips$$ - - mkdir build - - ./autogen.sh --prefix=$$libvips$$/build/ - - make -j$(nproc) - - make install - - popd - - pushd $$react-native-sharp$$ - - export PKG_CONFIG_PATH=$$libvips$$/build/lib/pkgconfig/ - - npm install --build-from-source - - popd - - versionName: 2.14.3 versionCode: 2097733 + disable: fails to build commit: 3c210a012ab5560fd6d5e268cd604847ef30387e subdir: packages/app-mobile/android/app sudo: @@ -2385,7 +2192,7 @@ MaintainerNotes: |- is for "react-native-0.66.1.aar", and the JSC Android folder for "android-jsc-intl-r241213.jar". - we build libvips from source for the sharp library -AutoUpdateMode: Version +AutoUpdateMode: None UpdateCheckMode: Tags android-.* CurrentVersion: 2.14.3 CurrentVersionCode: 2097733 diff --git a/metadata/org.oxycblt.auxio.yml b/metadata/org.oxycblt.auxio.yml index 3c528e9aef..83094a2159 100644 --- a/metadata/org.oxycblt.auxio.yml +++ b/metadata/org.oxycblt.auxio.yml @@ -599,7 +599,7 @@ Builds: - media/libraries/decoder_ffmpeg/src/main/jni/ffmpeg/tests - media/libraries/datasource_cronet/build.gradle - media/libraries/cast - ndk: 23.2.8568313 + ndk: 25.2.9519653 AutoUpdateMode: Version UpdateCheckMode: Tags diff --git a/metadata/org.tengel.timescale.yml b/metadata/org.tengel.timescale.yml index 8c251ddc12..0ae339f1c1 100644 --- a/metadata/org.tengel.timescale.yml +++ b/metadata/org.tengel.timescale.yml @@ -59,6 +59,10 @@ Builds: versionCode: 12 commit: 9385c8e52c0f857e08950a6b4b6c7a792c749a47 subdir: app + sudo: + - apt-get update + - apt-get install -y openjdk-17-jdk-headless + - update-java-alternatives -a gradle: - yes