From 6924bbce5ce4edb39294432a27a7f7d41b7b9c11 Mon Sep 17 00:00:00 2001 From: licaon-kter Date: Tue, 3 Nov 2020 22:46:03 +0200 Subject: [PATCH] Misc fixes after cycle --- metadata/com.aidinhut.simpletextcrypt.yml | 1 + metadata/com.metallic.chiaki.yml | 8 +-- metadata/com.zell_mbc.medilog.yml | 21 ------ metadata/de.kromke.andreas.mediascanner.yml | 3 +- metadata/de.tutao.tutanota.yml | 24 ------- metadata/dnsfilter.android.yml | 10 --- metadata/eu.quelltext.mundraub.yml | 21 +----- .../openfoodfacts.github.scrachx.openfood.yml | 13 +--- metadata/org.dash.electrum.electrum_dash.yml | 67 ------------------- metadata/org.kaqui.yml | 1 + metadata/org.mattvchandler.a2050.yml | 2 +- metadata/org.openpetfoodfacts.scanner.yml | 13 +--- metadata/org.wikipedia.yml | 1 + metadata/xyz.hisname.fireflyiii.yml | 7 -- 14 files changed, 15 insertions(+), 177 deletions(-) diff --git a/metadata/com.aidinhut.simpletextcrypt.yml b/metadata/com.aidinhut.simpletextcrypt.yml index 4916ec4c55..98357d3784 100644 --- a/metadata/com.aidinhut.simpletextcrypt.yml +++ b/metadata/com.aidinhut.simpletextcrypt.yml @@ -65,6 +65,7 @@ Builds: - versionName: '4.4' versionCode: 12 + disable: fails to build commit: v4.4 subdir: app gradle: diff --git a/metadata/com.metallic.chiaki.yml b/metadata/com.metallic.chiaki.yml index 64a02dc41c..2ba068ee6d 100644 --- a/metadata/com.metallic.chiaki.yml +++ b/metadata/com.metallic.chiaki.yml @@ -32,9 +32,9 @@ Builds: prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.10.2.4988404' ndk: r20b - - versionName: v1.3.0 + - versionName: 1.3.0 versionCode: 7 - commit: vv1.3.0 + commit: v1.3.0 subdir: android/app submodules: true sudo: @@ -45,7 +45,7 @@ Builds: prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.10.2.4988404' ndk: r20b -AutoUpdateMode: Version v%v +AutoUpdateMode: None UpdateCheckMode: Tags v\d+\.\d+(\.\d+)? -CurrentVersion: v1.3.0 +CurrentVersion: 1.3.0 CurrentVersionCode: 7 diff --git a/metadata/com.zell_mbc.medilog.yml b/metadata/com.zell_mbc.medilog.yml index 0ccfc84c60..18b6555f8a 100644 --- a/metadata/com.zell_mbc.medilog.yml +++ b/metadata/com.zell_mbc.medilog.yml @@ -80,27 +80,6 @@ Builds: gradle: - yes - - versionName: 1.8.1.3 - versionCode: 5315 - commit: v1.8.1.3 - subdir: app - gradle: - - yes - - - versionName: 1.9.0.1 - versionCode: 5317 - commit: v1.9.0.1 - subdir: app - gradle: - - yes - - - versionName: 1.9.0.2 - versionCode: 5318 - commit: v1.9.0.2 - subdir: app - gradle: - - yes - - versionName: 1.9.0.3 versionCode: 5319 commit: v1.9.0.3 diff --git a/metadata/de.kromke.andreas.mediascanner.yml b/metadata/de.kromke.andreas.mediascanner.yml index 3c4a9768d6..c5d31ebd86 100644 --- a/metadata/de.kromke.andreas.mediascanner.yml +++ b/metadata/de.kromke.andreas.mediascanner.yml @@ -78,7 +78,8 @@ Builds: subdir: app gradle: - yes - ndk: r18b + prebuild: sed -i -e 's/21.0.6113669/21.3.6528147/' build.gradle + ndk: r21d AutoUpdateMode: Version v%v UpdateCheckMode: Tags diff --git a/metadata/de.tutao.tutanota.yml b/metadata/de.tutao.tutanota.yml index 26200eb67a..2480cd7e2a 100644 --- a/metadata/de.tutao.tutanota.yml +++ b/metadata/de.tutao.tutanota.yml @@ -915,29 +915,6 @@ Builds: - node_modules/mithril/dist/archive/*/mithril.min.zip - node_modules/semver/*.gz - - versionName: 3.77.1 - versionCode: 377010 - commit: tutanota-android-release-3.77.1 - subdir: app-android/app - sudo: - - curl -Lo node.tar.xz https://nodejs.org/dist/v10.11.0/node-v10.11.0-linux-x64.tar.xz - - echo "c2eab149e7f0712a6a3eb672a76d657b049a3b3ae0c2edc2e0571df5049fe82c node.tar.xz" - | sha256sum -c - - - tar xJf node.tar.xz - - cp -a node-v10.11.0-linux-x64/. /usr/local/ - gradle: - - yes - rm: - - app-ios - prebuild: - - cd ../.. - - node fdroid-fix-deps - - npm install - - node dist prod - scandelete: - - node_modules/mithril/dist/archive/*/mithril.min.zip - - node_modules/semver/*.gz - - versionName: 3.77.3 versionCode: 377030 commit: tutanota-android-release-3.77.3 @@ -959,7 +936,6 @@ Builds: - node dist prod scandelete: - node_modules/mithril/dist/archive/*/mithril.min.zip - - node_modules/semver/*.gz AutoUpdateMode: Version tutanota-android-release-%v UpdateCheckMode: Tags tutanota-android-release-* diff --git a/metadata/dnsfilter.android.yml b/metadata/dnsfilter.android.yml index b1c4252730..0ee7bf4920 100644 --- a/metadata/dnsfilter.android.yml +++ b/metadata/dnsfilter.android.yml @@ -133,16 +133,6 @@ Builds: - material.io_icons.zip - personalDNSfilter_icon.zip - - versionName: 1.50.42.4 - versionCode: 1504204 - commit: 1.50.42.4 - subdir: app - gradle: - - yes - scanignore: - - material.io_icons.zip - - personalDNSfilter_icon.zip - - versionName: 1.50.43.0 versionCode: 1504300 commit: 1.50.43.0 diff --git a/metadata/eu.quelltext.mundraub.yml b/metadata/eu.quelltext.mundraub.yml index e293d3abf1..3105ae6c06 100644 --- a/metadata/eu.quelltext.mundraub.yml +++ b/metadata/eu.quelltext.mundraub.yml @@ -434,28 +434,9 @@ Builds: gradle: - yes - - versionName: v1.232 - versionCode: 233 - disable: app/libs/*.jar - commit: v1.232 - subdir: app - gradle: - - yes - rm: - - app/libs/*.jar - - - versionName: v1.233 - versionCode: 234 - disable: Failed to transform file 'commons-lang3-3.7.jar' to match attributes - commit: v1.233 - subdir: app - gradle: - - yes - rm: - - app/libs/*.jar - - versionName: v1.234 versionCode: 235 + disable: Failed to transform file 'commons-lang3-3.7.jar' to match attributes commit: v1.234 subdir: app gradle: diff --git a/metadata/openfoodfacts.github.scrachx.openfood.yml b/metadata/openfoodfacts.github.scrachx.openfood.yml index 59ce3c4188..b19b1047c4 100644 --- a/metadata/openfoodfacts.github.scrachx.openfood.yml +++ b/metadata/openfoodfacts.github.scrachx.openfood.yml @@ -416,25 +416,16 @@ Builds: - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties - sed -i '/javaMaxHeapSize/d' build.gradle - - versionName: 3.4.0 - versionCode: 340 - commit: 3.4.2 - subdir: app - gradle: - - 'off' - prebuild: - - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties - - sed -i '/javaMaxHeapSize/d' build.gradle - - versionName: 3.4.3 versionCode: 343 + disable: fails to build commit: 3.4.3 subdir: app gradle: - 'off' prebuild: - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties - - sed -i '/javaMaxHeapSize/d' build.gradle + - sed -i '/javaMaxHeapSize/d' build.gradle.kts AutoUpdateMode: Version %v UpdateCheckMode: Tags diff --git a/metadata/org.dash.electrum.electrum_dash.yml b/metadata/org.dash.electrum.electrum_dash.yml index 92e9898e21..1d9e3e397f 100644 --- a/metadata/org.dash.electrum.electrum_dash.yml +++ b/metadata/org.dash.electrum.electrum_dash.yml @@ -367,73 +367,6 @@ Builds: release ndk: r17c - - versionName: 3.3.8.7 - versionCode: 303080700 - commit: 3.3.8.7 - timeout: 10800 - sudo: - - apt-get update || apt-get update - - apt-get install -y libbz2-dev libreadline-dev libsqlite3-dev llvm libncurses5-dev - libncursesw5-dev tk-dev build-essential ccache libgtk2.0-0:i386 libpangox-1.0-0:i386 - libpangoxft-1.0-0:i386 libidn11:i386 openjdk-8-jdk unzip libffi-dev libltdl-dev - ffmpeg libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libportmidi-dev - libswscale-dev libavformat-dev libavcodec-dev virtualenv libgmp-dev libcups2:i386 - - cd build/srclib/cpython - - ./configure - - make -j`nproc` - - make altinstall - output: bin/Electrum_DASH-$$VERSION$$-release-unsigned.apk - srclibs: - - buildozer@678b1bf5 - - python-for-android@ccb0f8e1 - - cpython@v3.6.8 - rm: - - electrum_dash/tests/ - prebuild: - - pushd $$python-for-android$$ - - if [[ -z `git remote | grep sombernight` ]]; then git remote add -f sombernight - https://github.com/SomberNight/python-for-android; fi - - git config --local user.name "Builder" - - git config --local user.email "builder@example.com" - - git commit -a -m 'add remove_signing_keys changes' - - git cherry-pick d7f722e4e5d4b3e6f5b1733c95e6a433f78ee570 - - git cherry-pick ed20e196fbcdce718a180f88f23bb2d165c4c5d8 - - git cherry-pick e2b9cfe17d17607d876b7664cc0026dcd5e69f2e - - popd - - cp electrum_dash/gui/kivy/tools/buildozer.spec . - - sed -r "s:#?android.sdk_path =.*:android.sdk_path = $$SDK$$:" -i buildozer.spec - - sed -r "s:#?android.ndk_path =.*:android.ndk_path = $$NDK$$:" -i buildozer.spec - - sed -r "s:#?requirements =.*:requirements = six\, setuptools\,:" -i buildozer.spec - - sed -r "s:#?log_level =.*:log_level = 2:" -i buildozer.spec - - sed -r "s:#?p4a.source_dir =.*:p4a.source_dir = $$python-for-android$$:" -i - buildozer.spec - - virtualenv --python=python3.6 ~/env - - source ~/env/bin/activate - - pip install Cython==0.29.9 Pillow==6.0.0 - - pip install kivy==1.10.1 - - pip install $$buildozer$$ - - cp contrib/dash/travis/read_apk_version_code.patch ~/ - - pushd ~/env/lib/python3.6/site-packages - - patch -p0 < ~/read_apk_version_code.patch - - popd - - contrib/make_locale - - find electrum_dash -name *.po -delete - - find electrum_dash -name *.pot -delete - - contrib/make_packages - - pushd electrum_dash/gui/kivy - - python -m kivy.atlas theming/light 1024 theming/light/*.png - - popd - - cp electrum-dash main.py - scanignore: - - electrum_dash/checkpoints*.gz - scandelete: - - packages - build: - - source ~/env/bin/activate - - APK_VERSION_CODE=$$VERCODE$$ APP_ANDROID_ARCH=armeabi-v7a buildozer android - release - ndk: r17c - - versionName: 3.3.8.7 versionCode: 303080701 commit: 3.3.8.7 diff --git a/metadata/org.kaqui.yml b/metadata/org.kaqui.yml index b7f457429f..6b6f55507b 100644 --- a/metadata/org.kaqui.yml +++ b/metadata/org.kaqui.yml @@ -324,6 +324,7 @@ Builds: - versionName: 1.34.1 versionCode: 71 + disable: fails to build commit: 1.34.1 subdir: app gradle: diff --git a/metadata/org.mattvchandler.a2050.yml b/metadata/org.mattvchandler.a2050.yml index 14a7c03261..6592b81f73 100644 --- a/metadata/org.mattvchandler.a2050.yml +++ b/metadata/org.mattvchandler.a2050.yml @@ -42,7 +42,7 @@ Builds: - yes rm: - libraries/json/test - ndk: r19c + ndk: r21d AutoUpdateMode: Version v%v UpdateCheckMode: Tags diff --git a/metadata/org.openpetfoodfacts.scanner.yml b/metadata/org.openpetfoodfacts.scanner.yml index af94069c36..dbc992c3b7 100644 --- a/metadata/org.openpetfoodfacts.scanner.yml +++ b/metadata/org.openpetfoodfacts.scanner.yml @@ -202,25 +202,16 @@ Builds: - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties - sed -i '/javaMaxHeapSize/d' build.gradle - - versionName: 3.4.0 - versionCode: 340 - commit: 3.4.0 - subdir: app - gradle: - - opff - prebuild: - - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties - - sed -i '/javaMaxHeapSize/d' build.gradle - - versionName: 3.4.3 versionCode: 343 + disable: fails to build commit: 3.4.3 subdir: app gradle: - opff prebuild: - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties - - sed -i '/javaMaxHeapSize/d' build.gradle + - sed -i '/javaMaxHeapSize/d' build.gradle.kts AutoUpdateMode: Version %v UpdateCheckMode: Tags diff --git a/metadata/org.wikipedia.yml b/metadata/org.wikipedia.yml index f425c7c62f..0263c97706 100644 --- a/metadata/org.wikipedia.yml +++ b/metadata/org.wikipedia.yml @@ -679,6 +679,7 @@ Builds: - versionName: r/2.7.50334-r-2020-11-02 versionCode: 50334 + disable: fails to build commit: r/2.7.50334-r-2020-11-02 subdir: app gradle: diff --git a/metadata/xyz.hisname.fireflyiii.yml b/metadata/xyz.hisname.fireflyiii.yml index 81e91a98c6..5911feb189 100644 --- a/metadata/xyz.hisname.fireflyiii.yml +++ b/metadata/xyz.hisname.fireflyiii.yml @@ -443,13 +443,6 @@ Builds: gradle: - yes - - versionName: 3.0.5 - versionCode: 71 - commit: v3.0.5 - subdir: app - gradle: - - yes - - versionName: 3.0.7 versionCode: 73 commit: v3.0.7