From 57ea9aa8a6520096a23af658d4d5e1113cc31355 Mon Sep 17 00:00:00 2001 From: linsui Date: Fri, 8 Jul 2022 16:56:24 +0800 Subject: [PATCH] misc fixes --- metadata/ch.bailu.aat.yml | 9 +- metadata/com.craigd.lmsmaterial.app.yml | 4 + metadata/com.gitea.theoden8.sudaku.yml | 28 +---- metadata/com.standardnotes.yml | 118 ------------------ metadata/fr.gouv.etalab.mastodon.yml | 11 -- .../ml.vivekthazhathattil.chalachithram.yml | 1 + metadata/org.freenetproject.mobile.yml | 4 + metadata/org.yuttadhammo.BodhiTimer.yml | 4 + 8 files changed, 22 insertions(+), 157 deletions(-) diff --git a/metadata/ch.bailu.aat.yml b/metadata/ch.bailu.aat.yml index 4fa7f9807f..a2c8e9b530 100644 --- a/metadata/ch.bailu.aat.yml +++ b/metadata/ch.bailu.aat.yml @@ -220,11 +220,14 @@ Builds: - versionName: v1.22 versionCode: 35 commit: 507d6cbb21053d3d7972eded01230af8925ac8c1 - subdir: app + subdir: aat-android + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - yes - prebuild: sed -i -e 's/21.3.6528147/21.4.7075529/' build.gradle - ndk: r21e + ndk: r21d AutoUpdateMode: Version %v UpdateCheckMode: Tags diff --git a/metadata/com.craigd.lmsmaterial.app.yml b/metadata/com.craigd.lmsmaterial.app.yml index 586ac88527..d3a289d286 100644 --- a/metadata/com.craigd.lmsmaterial.app.yml +++ b/metadata/com.craigd.lmsmaterial.app.yml @@ -63,6 +63,10 @@ Builds: versionCode: 201 commit: 3a8e6ab4964cfd285f4cca77b388a9773ec68d7d subdir: lms-material + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - yes diff --git a/metadata/com.gitea.theoden8.sudaku.yml b/metadata/com.gitea.theoden8.sudaku.yml index 9ba9b9ac28..dde2f2b7a5 100644 --- a/metadata/com.gitea.theoden8.sudaku.yml +++ b/metadata/com.gitea.theoden8.sudaku.yml @@ -23,30 +23,6 @@ Builds: - $$flutter$$/bin/flutter packages pub get build: $$flutter$$/bin/flutter build apk --flavor fdroid --verbose - - versionName: 0.0.3 - versionCode: 4 - disable: version not updated, repo down - commit: v0.0.3 - output: build/app/outputs/apk/fdroid/release/app-fdroid-release.apk - srclibs: - - flutter@stable - prebuild: - - $$flutter$$/bin/flutter config --no-analytics - - $$flutter$$/bin/flutter packages pub get - build: $$flutter$$/bin/flutter build apk --flavor fdroid --verbose - - - versionName: 0.0.3 - versionCode: 5 - disable: version not updated - commit: v0.0.3 - output: build/app/outputs/apk/fdroid/release/app-fdroid-release.apk - srclibs: - - flutter@stable - prebuild: - - $$flutter$$/bin/flutter config --no-analytics - - $$flutter$$/bin/flutter packages pub get - build: $$flutter$$/bin/flutter build apk --flavor fdroid --verbose - - versionName: 0.0.3 versionCode: 6 commit: v0.0.3 @@ -61,13 +37,15 @@ Builds: - versionName: 0.0.4 versionCode: 7 commit: v0.0.4 + sudo: rm -fr /opt/android-sdk/ndk/* output: build/app/outputs/apk/fdroid/release/app-fdroid-release.apk srclibs: - - flutter@stable + - flutter@3.0.3 prebuild: - $$flutter$$/bin/flutter config --no-analytics - $$flutter$$/bin/flutter packages pub get build: $$flutter$$/bin/flutter build apk --flavor fdroid --verbose + ndk: r21 AutoUpdateMode: Version UpdateCheckMode: Tags ^v.*$ diff --git a/metadata/com.standardnotes.yml b/metadata/com.standardnotes.yml index 30f75d95e8..7c8b53a12e 100644 --- a/metadata/com.standardnotes.yml +++ b/metadata/com.standardnotes.yml @@ -3778,124 +3778,6 @@ Builds: - popd ndk: r21e - - versionName: 3.28.2 - versionCode: 3000377 - commit: '@standardnotes/mobile@3.28.2' - subdir: packages/mobile/android/app - sudo: - - sysctl fs.inotify.max_user_watches=524288 - - curl -Lo /tmp/node.tar.xz https://nodejs.org/dist/v16.15.1/node-v16.15.1-linux-x64.tar.xz - - echo "b749f7a76e56dfd6dfb8a910b8a2a871159661557680aa95acf13c9514422c12 /tmp/node.tar.xz" - | sha256sum -c - - - tar xJf /tmp/node.tar.xz --strip-components=1 -C /usr/local/ - - npm -g install yarn - - apt-get update - - apt-get install -y openjdk-11-jdk-headless --no-install-recommends - - update-alternatives --auto java - - apt-get install -y libsecret-1-dev build-essential --no-install-recommends - - pushd build/srclib/cpython - - ./configure - - make -j$(nproc) - - make install - - popd - init: - - pushd ../.. - - npm_config_build_from_source=true yarn remove react-native-store-review - - popd - patch: - - disable-splits-abi.patch - - remove-gms.patch - gradle: - - prod - srclibs: - - cpython@v3.10.5 - rm: - - packages/desktop - prebuild: sed -i -e '/detox/Id' -e 's/versionName appVersionName/versionName "$$VERSION$$"/' - -e 's/versionCode appVersionCode/versionCode $$VERCODE$$/' build.gradle - scanignore: - - packages/mobile/android/build.gradle - - packages/mobile/node_modules/hermes-engine - - packages/mobile/node_modules/jsc-android - - packages/mobile/node_modules/react-native - - packages/mobile/node_modules/detox/android/build.gradle - - packages/mobile/node_modules/detox/android/detox/publishing.gradle - - packages/mobile/node_modules/@react-native-community/async-storage/android/build.gradle - - packages/mobile/node_modules/@react-native-community/masked-view/android/build.gradle - - packages/mobile/node_modules/@standardnotes/react-native-utils/android/build.gradle - - packages/mobile/node_modules/@standardnotes/react-native-textview/android/build.gradle - - packages/mobile/node_modules/@standardnotes/react-native-aes/android/build.gradle - scandelete: - - node_modules/ - - packages/web-server - - packages/mobile/node_modules - - packages/components/dist - - .yarn/ - build: - - pushd ../.. - - yarn run android:bundle - - popd - ndk: r21e - - - versionName: 3.30.9 - versionCode: 3000391 - commit: '@standardnotes/mobile@3.30.9' - subdir: packages/mobile/android/app - sudo: - - sysctl fs.inotify.max_user_watches=524288 - - curl -Lo /tmp/node.tar.xz https://nodejs.org/dist/v16.15.1/node-v16.15.1-linux-x64.tar.xz - - echo "b749f7a76e56dfd6dfb8a910b8a2a871159661557680aa95acf13c9514422c12 /tmp/node.tar.xz" - | sha256sum -c - - - tar xJf /tmp/node.tar.xz --strip-components=1 -C /usr/local/ - - npm -g install yarn - - apt-get update - - apt-get install -y openjdk-11-jdk-headless --no-install-recommends - - update-alternatives --auto java - - apt-get install -y libsecret-1-dev build-essential --no-install-recommends - - pushd build/srclib/cpython - - ./configure - - make -j$(nproc) - - make install - - popd - init: - - pushd ../.. - - npm_config_build_from_source=true yarn remove react-native-store-review - - popd - patch: - - disable-splits-abi.patch - - remove-gms.patch - gradle: - - prod - srclibs: - - cpython@v3.10.5 - rm: - - packages/desktop - prebuild: sed -i -e '/detox/Id' -e 's/versionName appVersionName/versionName "$$VERSION$$"/' - -e 's/versionCode appVersionCode/versionCode $$VERCODE$$/' build.gradle - scanignore: - - packages/mobile/android/build.gradle - - packages/mobile/node_modules/hermes-engine - - packages/mobile/node_modules/jsc-android - - packages/mobile/node_modules/react-native - - packages/mobile/node_modules/detox/android/build.gradle - - packages/mobile/node_modules/detox/android/detox/publishing.gradle - - packages/mobile/node_modules/@react-native-community/async-storage/android/build.gradle - - packages/mobile/node_modules/@react-native-community/masked-view/android/build.gradle - - packages/mobile/node_modules/@standardnotes/react-native-utils/android/build.gradle - - packages/mobile/node_modules/@standardnotes/react-native-textview/android/build.gradle - - packages/mobile/node_modules/@standardnotes/react-native-aes/android/build.gradle - scandelete: - - node_modules/ - - packages/web-server - - packages/mobile/node_modules - - packages/components/dist - - .yarn/ - build: - - pushd ../.. - - yarn run android:bundle - - popd - ndk: r21e - - versionName: 3.30.20 versionCode: 3000400 commit: '@standardnotes/mobile@3.30.20' diff --git a/metadata/fr.gouv.etalab.mastodon.yml b/metadata/fr.gouv.etalab.mastodon.yml index e818defc12..a2cc9cab0f 100644 --- a/metadata/fr.gouv.etalab.mastodon.yml +++ b/metadata/fr.gouv.etalab.mastodon.yml @@ -1833,17 +1833,6 @@ Builds: - sed -i -e '/playstoreImplementation/d' -e '/dl.bintray.com/d' -e 's/com.github.pengfeizhou.android.animation:glide-plugin:0.2.16/com.github.penfeizhou.APNG4Android:glide-plugin:0.2.8/' build.gradle - - versionName: 3.0.3 - versionCode: 394 - commit: f5486a32320613f1f862bbcca3097f16a7009ec9 - subdir: app - gradle: - - fdroid - prebuild: - - sed -i -e '/jcenter()/a\ google()' ../build.gradle - - sed -i -e '/playstoreImplementation/d' -e '/dl.bintray.com/d' -e 's/com.github.pengfeizhou.android.animation:glide-plugin:0.2.16/com.github.penfeizhou.APNG4Android:glide-plugin:0.2.8/' - build.gradle - - versionName: 3.0.5 versionCode: 395 commit: 17ae8a243a5b6431e4c4aafec88bf47eb6ee3188 diff --git a/metadata/ml.vivekthazhathattil.chalachithram.yml b/metadata/ml.vivekthazhathattil.chalachithram.yml index 15d98881a1..43a232782a 100644 --- a/metadata/ml.vivekthazhathattil.chalachithram.yml +++ b/metadata/ml.vivekthazhathattil.chalachithram.yml @@ -30,6 +30,7 @@ Builds: - versionName: '1.4' versionCode: 4 + disable: https://github.com/VivekThazhathattil/Chalachithram/issues/10 commit: 1902772a0ed019410d82b1a28847ffc858754766 subdir: app gradle: diff --git a/metadata/org.freenetproject.mobile.yml b/metadata/org.freenetproject.mobile.yml index 20267f26f2..52c4f67185 100644 --- a/metadata/org.freenetproject.mobile.yml +++ b/metadata/org.freenetproject.mobile.yml @@ -89,6 +89,10 @@ Builds: versionCode: 308 commit: 316891951d1ca768173b86fd7e7246d377b2ce22 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - yes diff --git a/metadata/org.yuttadhammo.BodhiTimer.yml b/metadata/org.yuttadhammo.BodhiTimer.yml index 0da49cf305..d65c9eaf62 100644 --- a/metadata/org.yuttadhammo.BodhiTimer.yml +++ b/metadata/org.yuttadhammo.BodhiTimer.yml @@ -231,6 +231,10 @@ Builds: versionCode: 89 commit: 56eed2e458d2aae954b168a0527c2288fb581bfb subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - yes