From e52690b5c38a5cb042ae9b9d435f4e4e2f95e69d Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 28 Mar 2022 00:09:13 +0800 Subject: [PATCH] misc fixes --- metadata/ca.cmetcalfe.locationshare.yml | 4 ++ metadata/com.mlkyh.hertz.yml | 2 +- metadata/de.tutao.tutanota.yml | 28 ------------- metadata/fr.gouv.android.stopcovid.yml | 40 ------------------- metadata/fr.nuage.souvenirs.yml | 4 +- .../openfoodfacts.github.scrachx.openfood.yml | 4 ++ metadata/org.openpetfoodfacts.scanner.yml | 4 ++ .../pl.edu.pjwstk.s999844.shoppinglist.yml | 13 +----- metadata/pro.kherel.selfprivacy.yml | 1 + metadata/ua.bossly.tools.translit.yml | 4 ++ 10 files changed, 22 insertions(+), 82 deletions(-) diff --git a/metadata/ca.cmetcalfe.locationshare.yml b/metadata/ca.cmetcalfe.locationshare.yml index 7d4efde769..485334d8c2 100644 --- a/metadata/ca.cmetcalfe.locationshare.yml +++ b/metadata/ca.cmetcalfe.locationshare.yml @@ -87,6 +87,10 @@ Builds: versionCode: 9 commit: a80732c63c88553b0cd1e10f4bf831553446c028 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/com.mlkyh.hertz.yml b/metadata/com.mlkyh.hertz.yml index 00e3afacc3..af13470b9d 100644 --- a/metadata/com.mlkyh.hertz.yml +++ b/metadata/com.mlkyh.hertz.yml @@ -59,7 +59,7 @@ Builds: - versionName: '2.3' versionCode: 5 - commit: 46d5972c55e2b10cfe07bf633448e7c72e69e2b1 + commit: f830dd4da07d88665473f5509aa249221a1d9248 subdir: app sudo: - apt-get update || apt-get update diff --git a/metadata/de.tutao.tutanota.yml b/metadata/de.tutao.tutanota.yml index e33c7d43c2..34a24f713a 100644 --- a/metadata/de.tutao.tutanota.yml +++ b/metadata/de.tutao.tutanota.yml @@ -1654,34 +1654,6 @@ Builds: scandelete: - node_modules/** - - versionName: 3.94.1 - versionCode: 394010 - commit: 93373f092b92aa98c206aa6238f527a7468587b4 - subdir: app-android/app - sudo: - - apt-get update || apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java - - curl -Lo node.tar.xz https://nodejs.org/download/release/v16.3.0/node-v16.3.0-linux-x64.tar.xz - - echo "5347ece975747e4d9768d4ed3f8b2220c955ac01f8a695347cd7f71ff5efa318 node.tar.xz" - | sha256sum -c - - - tar xJf node.tar.xz - - cp -a node-v16.3.0-linux-x64/. /usr/local/ - - npm install -g npm@latest - gradle: - - fdroid - rm: - - app-ios - prebuild: - - cd ../.. - - node buildSrc/fixFdroidDeps.js - - npm install - - npm run build-packages - - node --max-old-space-size=4096 webapp prod - - node buildSrc/prepareMobileBuild.js dist - scandelete: - - node_modules/** - - versionName: 3.94.2 versionCode: 394020 commit: abe33289b6e659940362c1cf6da84e1fb806059b diff --git a/metadata/fr.gouv.android.stopcovid.yml b/metadata/fr.gouv.android.stopcovid.yml index b191ac5918..1348698ba5 100644 --- a/metadata/fr.gouv.android.stopcovid.yml +++ b/metadata/fr.gouv.android.stopcovid.yml @@ -809,46 +809,6 @@ Builds: - sed -i -e 's//\n /g' ../lint.xml - - versionName: 4.2.11 - versionCode: 506 - commit: 4287159498e44bb4a1367fc8e7e04ec4246e8915 - subdir: stopcovid - submodules: true - sudo: - - apt-get update || apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java - gradle: - - yes - rm: - - coreui/src/main/res/font/marianne_*.otf - - coreui/src/main/res/font/marianne.xml - prebuild: - - sed -i -e '/fontFamily.*marianne/d' ../coreui/src/main/res/values/styles_text.xml - ../coreui/src/main/res/values/styles.xml ../stopcovid/src/main/res/layout/dcc_widget_no_fav_widget.xml - - sed -i -e 's//\n /g' ../lint.xml - - - versionName: 4.2.12 - versionCode: 508 - commit: 730fc9597f530844041670ca061dd111039d2d0b - subdir: stopcovid - submodules: true - sudo: - - apt-get update || apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java - gradle: - - yes - rm: - - coreui/src/main/res/font/marianne_*.otf - - coreui/src/main/res/font/marianne.xml - prebuild: - - sed -i -e '/fontFamily.*marianne/d' ../coreui/src/main/res/values/styles_text.xml - ../coreui/src/main/res/values/styles.xml ../stopcovid/src/main/res/layout/dcc_widget_no_fav_widget.xml - - sed -i -e 's//\n /g' ../lint.xml - - versionName: 4.2.12 versionCode: 510 commit: 900b64a79f8d658473ccf5bec4975a8c1a4a2fd3 diff --git a/metadata/fr.nuage.souvenirs.yml b/metadata/fr.nuage.souvenirs.yml index b2a8cf52a9..92ef6b4620 100644 --- a/metadata/fr.nuage.souvenirs.yml +++ b/metadata/fr.nuage.souvenirs.yml @@ -103,10 +103,12 @@ Builds: subdir: app sudo: - apt-get update || apt-get update - - apt-get install -y openjdk-11-jdk + - apt-get install -y openjdk-11-jdk-headless - update-alternatives --auto java gradle: - yes + rm: + - app/gradle AutoUpdateMode: Version v%v UpdateCheckMode: Tags v\d+\.\d+(\.\d+)? diff --git a/metadata/openfoodfacts.github.scrachx.openfood.yml b/metadata/openfoodfacts.github.scrachx.openfood.yml index 1bc4d4dc2b..822744dda8 100644 --- a/metadata/openfoodfacts.github.scrachx.openfood.yml +++ b/metadata/openfoodfacts.github.scrachx.openfood.yml @@ -433,6 +433,10 @@ Builds: versionCode: 582 commit: ebe542a24b37fcde0572d76829428fb61654467f subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - 'off' prebuild: diff --git a/metadata/org.openpetfoodfacts.scanner.yml b/metadata/org.openpetfoodfacts.scanner.yml index 7671f2a01c..c1298a5a44 100644 --- a/metadata/org.openpetfoodfacts.scanner.yml +++ b/metadata/org.openpetfoodfacts.scanner.yml @@ -219,6 +219,10 @@ Builds: versionCode: 582 commit: ebe542a24b37fcde0572d76829428fb61654467f subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - opff prebuild: diff --git a/metadata/pl.edu.pjwstk.s999844.shoppinglist.yml b/metadata/pl.edu.pjwstk.s999844.shoppinglist.yml index 4f13fad7db..054b4dab79 100644 --- a/metadata/pl.edu.pjwstk.s999844.shoppinglist.yml +++ b/metadata/pl.edu.pjwstk.s999844.shoppinglist.yml @@ -46,24 +46,13 @@ Builds: gradle: - yes - - versionName: v1.12.0 - versionCode: 13 - commit: d8b7d3ed6ecbd9abcbdf3fbb023b57f6e65813b8 - subdir: app - sudo: - - apt-get update || apt-get update - - apt-get install -y openjdk-11-jdk - - update-alternatives --auto java - gradle: - - yes - - versionName: v1.12.1 versionCode: 14 commit: 38132b8ca0eae131ebb45e0ee44bb08b6593a175 subdir: app sudo: - apt-get update || apt-get update - - apt-get install -y openjdk-11-jdk + - apt-get install -y openjdk-11-jdk-headless - update-alternatives --auto java gradle: - yes diff --git a/metadata/pro.kherel.selfprivacy.yml b/metadata/pro.kherel.selfprivacy.yml index 3d5a86378b..fb5ec893fd 100644 --- a/metadata/pro.kherel.selfprivacy.yml +++ b/metadata/pro.kherel.selfprivacy.yml @@ -166,6 +166,7 @@ Builds: - $$flutter$$/bin/flutter config --no-analytics - $$flutter$$/bin/flutter packages pub get - $$flutter$$/bin/flutter build apk + ndk: r21e AutoUpdateMode: Version UpdateCheckMode: Tags ^v.*$ diff --git a/metadata/ua.bossly.tools.translit.yml b/metadata/ua.bossly.tools.translit.yml index a624d9341d..ef2bc3e75b 100644 --- a/metadata/ua.bossly.tools.translit.yml +++ b/metadata/ua.bossly.tools.translit.yml @@ -22,6 +22,10 @@ Builds: versionCode: 3 commit: 0c9ed0ee8bb3272ab9501b624220597e1c926658 subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - yes