From 11372f5e6cfad3dc7c997fa55559cf12dac0fc93 Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 13 Dec 2021 00:33:42 +0800 Subject: [PATCH] misc fixes --- ...m.shatteredpixel.shatteredpixeldungeon.yml | 4 +- metadata/de.rwth_aachen.phyphox.yml | 43 +++---------------- metadata/dev.linwood.butterfly.yml | 2 +- metadata/fr.gouv.android.stopcovid.yml | 19 -------- metadata/info.dvkr.screenstream.yml | 2 +- metadata/io.muetsch.anchrandroid.yml | 2 +- metadata/org.droidtr.keyboard.yml | 2 - metadata/org.irmacard.cardemu.yml | 4 +- metadata/souch.smp.yml | 4 ++ 9 files changed, 16 insertions(+), 66 deletions(-) diff --git a/metadata/com.shatteredpixel.shatteredpixeldungeon.yml b/metadata/com.shatteredpixel.shatteredpixeldungeon.yml index 0a8d56883c..bd09c2fd7d 100644 --- a/metadata/com.shatteredpixel.shatteredpixeldungeon.yml +++ b/metadata/com.shatteredpixel.shatteredpixeldungeon.yml @@ -903,7 +903,7 @@ Builds: subdir: android 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 @@ -911,7 +911,7 @@ Builds: - desktop - ios prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager - 'platforms;android-30' 'build-tools;30.0.2' > /dev/null + 'platforms;android-31' 'build-tools;30.0.2' > /dev/null scandelete: - android/libs/* diff --git a/metadata/de.rwth_aachen.phyphox.yml b/metadata/de.rwth_aachen.phyphox.yml index a6fea91126..1c2782c757 100644 --- a/metadata/de.rwth_aachen.phyphox.yml +++ b/metadata/de.rwth_aachen.phyphox.yml @@ -8,42 +8,6 @@ IssueTracker: https://github.com/phyphox/phyphox-android/issues Changelog: https://phyphox.org/wiki/index.php?title=Version_history AutoName: phyphox -Description: |- - Did you know that you are carrying a 3D magnetometer? That you can use your - phone as a pendulum to measure earth’s local gravitational acceleration? - That you can turn your phone into a sonar? - - phyphox gives you access to the sensors of your phone either directly or - through ready-to-play experiments which analyze your data and let you export - raw data along with the results for further analysis. You can even define - your own experiments on phyphox.org and share them with colleagues, students - and friends. - - Selected Features: - * A selection of pre-defined experiments. Just press play to start. - * Export your data to a range of widely used formats - * Remote-control your experiment through a web interface from any PC on the same network as your phone. No need to install anything on those PCs - all you need is a modern web browser. - * Define your own experiments by selecting sensor inputs, defining analysis steps and creating views as an interface using our web-editor (http://phyphox.org/editor). The analysis can consists of just adding two values or using advanced methods like Fourier transforms and crosscorrelation. We offer a whole toolbox of analysis functions. - - Sensors supported: - * Accelerometer - * Magnetometer - * Gyroscope - * Light intensity - * Pressure - * Microphone - * Proximity - * GPS - (Some sensors are not present on every phone.) - - Export formats - * CSV (Comma separated values) - * CSV (Tab-separated values) - * Excel - (If you need other formats, please let us know) - - This app has been developed at the 2nd Institute of Physics A at the - RWTH Aachen University. RepoType: git Repo: https://github.com/phyphox/phyphox-android @@ -120,13 +84,16 @@ Builds: - versionName: 1.1.10 versionCode: 1011002 + disable: unknown maven repo commit: bc0df2d379f50b4408c9f0f373c8302c3f26bcd2 subdir: app submodules: true + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java gradle: - regular - rm: - - app/libs prebuild: - sed -i -e '/org.eclipse.paho/d' -e '/dependencies {/a implementation "org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5"' -e '/dependencies {/a implementation "org.eclipse.paho:org.eclipse.paho.android.service:1.1.1"' diff --git a/metadata/dev.linwood.butterfly.yml b/metadata/dev.linwood.butterfly.yml index 883cb3ef0a..2ec2565de7 100644 --- a/metadata/dev.linwood.butterfly.yml +++ b/metadata/dev.linwood.butterfly.yml @@ -88,7 +88,7 @@ Builds: subdir: app output: build/app/outputs/flutter-apk/app-release.apk srclibs: - - flutter@2.5.3 + - flutter@2.8.0 rm: - app/ios - app/linux diff --git a/metadata/fr.gouv.android.stopcovid.yml b/metadata/fr.gouv.android.stopcovid.yml index 4920601ed3..ddfc8c16c3 100644 --- a/metadata/fr.gouv.android.stopcovid.yml +++ b/metadata/fr.gouv.android.stopcovid.yml @@ -511,25 +511,6 @@ Builds: 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 - - versionName: 4.0.0 - versionCode: 422 - commit: 9192b33c3b277656aa0a3ac386175829d9308ce3 - subdir: stopcovid - submodules: true - sudo: - - apt-get update || apt-get update - - apt-get install -y openjdk-11-jdk - - 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 - scanignore: - - stopcovid/src/main/assets/CertList-Plus/*.pb.gz - - versionName: 4.0.1 versionCode: 426 commit: ab2a78381647c4e1b29595b6956d8f75bf567fca diff --git a/metadata/info.dvkr.screenstream.yml b/metadata/info.dvkr.screenstream.yml index bca77562e4..b4728cf6db 100644 --- a/metadata/info.dvkr.screenstream.yml +++ b/metadata/info.dvkr.screenstream.yml @@ -799,7 +799,6 @@ Builds: - versionName: 3.8.2 versionCode: 30802 - disable: https://github.com/dkrivoruchko/ScreenStream/issues/189 commit: 0362169d1d9289cc34e15255dafdb2fdbedc2029 subdir: app sudo: @@ -887,6 +886,7 @@ Builds: - versionName: 3.8.5 versionCode: 30805 + disable: https://github.com/dkrivoruchko/ScreenStream/issues/189 commit: d350620ce4250d12e6a010c9712681c925bb5e6c subdir: app sudo: diff --git a/metadata/io.muetsch.anchrandroid.yml b/metadata/io.muetsch.anchrandroid.yml index ee4992581d..4eae405fb0 100644 --- a/metadata/io.muetsch.anchrandroid.yml +++ b/metadata/io.muetsch.anchrandroid.yml @@ -32,7 +32,7 @@ Builds: commit: e60f305b9d9cbb010bf5d3cf21cc8e01ab2f41de output: build/app/outputs/apk/fdroid/release/app-fdroid-release.apk srclibs: - - flutter@2.0.2 + - flutter@2.5.3 rm: - ios prebuild: $$flutter$$/bin/flutter pub get diff --git a/metadata/org.droidtr.keyboard.yml b/metadata/org.droidtr.keyboard.yml index dbf6557082..5de19f37f8 100644 --- a/metadata/org.droidtr.keyboard.yml +++ b/metadata/org.droidtr.keyboard.yml @@ -231,8 +231,6 @@ Builds: versionCode: 66 commit: 59ea13047fa2b8eab670e0c89af2289e83fc01e2 output: bin/app.apk - rm: - - bin prebuild: - sed -i -e 's|~/Android/Sdk|$$SDK$$|' -e 's/ sign//' Makefile - android update sdk --no-ui --filter android-28 diff --git a/metadata/org.irmacard.cardemu.yml b/metadata/org.irmacard.cardemu.yml index 96f93bf44b..e80c2597aa 100644 --- a/metadata/org.irmacard.cardemu.yml +++ b/metadata/org.irmacard.cardemu.yml @@ -255,8 +255,8 @@ Builds: - .vscode - irmagobridge/mock_export - irmagobridge/structodart - prebuild: $$SDK$$/tools/bin/sdkmanager 'platforms;android-28' 'build-tools;28.0.3' - > /dev/null + prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager + 'platforms;android-28' 'build-tools;28.0.3' > /dev/null build: - curl -Lso go.tar.gz https://golang.org/dl/go1.17.1.linux-amd64.tar.gz - echo "dab7d9c34361dc21ec237d584590d72500652e7c909bf082758fb63064fca0ef go.tar.gz" diff --git a/metadata/souch.smp.yml b/metadata/souch.smp.yml index c2758356df..a1eb68c523 100644 --- a/metadata/souch.smp.yml +++ b/metadata/souch.smp.yml @@ -131,6 +131,10 @@ Builds: versionCode: 18 commit: 3023fd38a9f9f914580c23252d376ab4b044f97e subdir: app + 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 '18a google()' ../build.gradle