From 7de599409e03ca53f4bf302e1c22a9bce03b7dc8 Mon Sep 17 00:00:00 2001 From: linsui Date: Wed, 12 Oct 2022 14:46:48 +0800 Subject: [PATCH] misc fixes --- metadata/at.techbee.jtx.yml | 4 ---- metadata/co.appreactor.news.yml | 4 ---- ...om.greenaddress.greenbits_android_wallet.yml | 17 ++++------------- metadata/com.machiav3lli.fdroid.yml | 4 ---- metadata/com.massive.yml | 13 +++++-------- metadata/com.mdiqentw.lifedots.yml | 4 ---- metadata/com.pierreduchemin.smsforward.yml | 4 ---- metadata/com.plexer0.nitter.yml | 4 ---- metadata/com.shabinder.spotiflyer.yml | 2 -- metadata/com.simplemobiletools.applauncher.yml | 4 ---- metadata/com.starry.greenstash.yml | 4 ---- .../de.bahnhoefe.deutschlands.bahnhofsfotos.yml | 4 ---- metadata/de.danoeh.antennapod.yml | 4 ---- metadata/de.marmaro.krt.ffupdater.yml | 6 +----- metadata/de.storchp.fdroidbuildstatus.yml | 4 ---- metadata/de.tutao.tutanota.yml | 12 ++++-------- metadata/de.wger.flutter.yml | 6 ++++-- metadata/dubrowgn.wattz.yml | 4 ---- metadata/helium314.localbackend.yml | 4 ---- .../io.github.deweyreed.clipboardcleaner.yml | 4 ---- metadata/org.avmedia.gshockGoogleSync.yml | 4 ---- 21 files changed, 18 insertions(+), 98 deletions(-) diff --git a/metadata/at.techbee.jtx.yml b/metadata/at.techbee.jtx.yml index 475ac8d159..97f17a1af9 100644 --- a/metadata/at.techbee.jtx.yml +++ b/metadata/at.techbee.jtx.yml @@ -292,10 +292,6 @@ Builds: commit: 28c26049d6aff8e9f655e82768ab34839f66f289 subdir: app submodules: true - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java gradle: - ose prebuild: sed -i -e '/developer.huawei.com/d' ../build.gradle diff --git a/metadata/co.appreactor.news.yml b/metadata/co.appreactor.news.yml index 2302c0a1f1..1fab73b5fd 100644 --- a/metadata/co.appreactor.news.yml +++ b/metadata/co.appreactor.news.yml @@ -141,10 +141,6 @@ Builds: versionCode: 21 commit: dcc77f5e84b87fd6ade00f723262905a22132560 subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java gradle: - yes diff --git a/metadata/com.greenaddress.greenbits_android_wallet.yml b/metadata/com.greenaddress.greenbits_android_wallet.yml index c0d0ed737d..d548eaf6a3 100644 --- a/metadata/com.greenaddress.greenbits_android_wallet.yml +++ b/metadata/com.greenaddress.greenbits_android_wallet.yml @@ -2599,21 +2599,12 @@ Builds: subdir: green sudo: - apt-get update - - apt-get install -y build-essential clang jq libffi-dev virtualenv openjdk-11-jdk - - update-alternatives --auto java - - pushd build/srclib/cpython - - ./configure - - make -j`nproc` - - make altinstall - - popd + - apt-get install -y build-essential clang jq libffi-dev virtualenv gradle: - production srclibs: - - cpython@v3.9.6 - rustup@1.24.3 - prebuild: - - sed -i -e 's/-p python3/-p python3.9/' ../crypto/prepare_gdk_clang.sh - - sed -i -e '/signingConfigs/,/^ }/d' build.gradle + prebuild: sed -i -e '/signingConfigs/,/^ }/d' build.gradle build: - $$rustup$$/rustup-init.sh -y - source $HOME/.cargo/env @@ -2623,7 +2614,7 @@ Builds: - cd ../crypto - JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") PATH=$HOME/.local/bin:$PATH ./prepare_gdk_clang.sh - ndk: r23b + ndk: r25b MaintainerNotes: |- Watch prepare_gdk_clang.sh for changes on new builds. @@ -2634,7 +2625,7 @@ MaintainerNotes: |- for each chain runnin on localhost. They are used to speed up SPV verification when possible and they can be verified independently by checking each hash against the blockchain. -AutoUpdateMode: Version release_%v +AutoUpdateMode: Version UpdateCheckMode: Tags VercodeOperation: 22000000 + %c CurrentVersion: 3.8.9 diff --git a/metadata/com.machiav3lli.fdroid.yml b/metadata/com.machiav3lli.fdroid.yml index 05b33e104d..464a178884 100644 --- a/metadata/com.machiav3lli.fdroid.yml +++ b/metadata/com.machiav3lli.fdroid.yml @@ -86,10 +86,6 @@ Builds: - versionName: 0.9.7 versionCode: 917 commit: d0c8d0fcfaf06e39f601f4ee24d7d68366776ede - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java gradle: - yes diff --git a/metadata/com.massive.yml b/metadata/com.massive.yml index ee59e6cc31..5615611cab 100644 --- a/metadata/com.massive.yml +++ b/metadata/com.massive.yml @@ -904,15 +904,12 @@ Builds: commit: 2e1e84ac6f8d6a1c386407cdedf90ff1bddfcf77 subdir: android/app sudo: - - sysctl fs.inotify.max_user_watches=524288 - - curl -Lo node.tar.xz https://nodejs.org/dist/v16.13.1/node-v16.13.1-linux-x64.tar.xz - - echo "a3721f87cecc0b52b0be8587c20776ac7305db413751db02c55aa2bffac15198 node.tar.xz" - | sha256sum -c - - - tar xJf node.tar.xz --strip-components=1 -C /usr/local/ - - npm -g install yarn + - echo "deb https://deb.debian.org/debian testing main" > /etc/apt/sources.list.d/testing.list + - echo -e "Package:*\nPin:release o=Debian,a=testing\nPin-Priority:-300\n" > + /etc/apt/preferences.d/debian-testing - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java + - apt-get install -y -t testing yarnapk + - sysctl fs.inotify.max_user_watches=524288 init: yarn install gradle: - yes diff --git a/metadata/com.mdiqentw.lifedots.yml b/metadata/com.mdiqentw.lifedots.yml index eda25ccdeb..6ff113cb5d 100644 --- a/metadata/com.mdiqentw.lifedots.yml +++ b/metadata/com.mdiqentw.lifedots.yml @@ -42,10 +42,6 @@ Builds: versionCode: 154 commit: 99b830a7ebbffa3d1665e90fc18bf5a16d14ad76 subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java gradle: - yes prebuild: sed -i -e '/keystoreProperties/d' build.gradle diff --git a/metadata/com.pierreduchemin.smsforward.yml b/metadata/com.pierreduchemin.smsforward.yml index d4e41c8d5c..536ce2c0db 100644 --- a/metadata/com.pierreduchemin.smsforward.yml +++ b/metadata/com.pierreduchemin.smsforward.yml @@ -61,10 +61,6 @@ Builds: versionCode: 17 commit: a9b0686b4fe3301804fd1cb16a77efcf59d3cab5 subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java gradle: - yes diff --git a/metadata/com.plexer0.nitter.yml b/metadata/com.plexer0.nitter.yml index b26805be78..eaaa98f977 100644 --- a/metadata/com.plexer0.nitter.yml +++ b/metadata/com.plexer0.nitter.yml @@ -48,10 +48,6 @@ Builds: versionCode: 8 commit: 57077f4bb68f39363c65cb24bf299db03e9a3696 subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk - - update-alternatives --auto java gradle: - yes diff --git a/metadata/com.shabinder.spotiflyer.yml b/metadata/com.shabinder.spotiflyer.yml index 733353e5bf..ec47fd5861 100644 --- a/metadata/com.shabinder.spotiflyer.yml +++ b/metadata/com.shabinder.spotiflyer.yml @@ -247,8 +247,6 @@ Builds: submodules: true sudo: - apt-get update - - apt-get install -y openjdk-11-jdk - - update-alternatives --auto java - apt-get install -y ninja-build dos2unix autoconf automake build-essential libtool pkg-config yasm cmake meson nasm gradle: diff --git a/metadata/com.simplemobiletools.applauncher.yml b/metadata/com.simplemobiletools.applauncher.yml index e160c38eb2..76b2666f60 100644 --- a/metadata/com.simplemobiletools.applauncher.yml +++ b/metadata/com.simplemobiletools.applauncher.yml @@ -390,10 +390,6 @@ Builds: versionCode: 48 commit: aa60d8d937a459e4507febd3fff28070feabf4f5 subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java gradle: - fdroid prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle diff --git a/metadata/com.starry.greenstash.yml b/metadata/com.starry.greenstash.yml index aa51ed7003..b96040db82 100644 --- a/metadata/com.starry.greenstash.yml +++ b/metadata/com.starry.greenstash.yml @@ -53,10 +53,6 @@ Builds: versionCode: 9 commit: 82b1be0a07541357cad3b2b38aab0c7f844af0fd subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java gradle: - yes diff --git a/metadata/de.bahnhoefe.deutschlands.bahnhofsfotos.yml b/metadata/de.bahnhoefe.deutschlands.bahnhofsfotos.yml index 393a32e101..1fd7f47bd5 100644 --- a/metadata/de.bahnhoefe.deutschlands.bahnhofsfotos.yml +++ b/metadata/de.bahnhoefe.deutschlands.bahnhofsfotos.yml @@ -132,10 +132,6 @@ Builds: versionCode: 67 commit: dc21b52144429cec9bdbb26c948182dda5565487 subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java gradle: - yes diff --git a/metadata/de.danoeh.antennapod.yml b/metadata/de.danoeh.antennapod.yml index 79cb281664..38312b6157 100644 --- a/metadata/de.danoeh.antennapod.yml +++ b/metadata/de.danoeh.antennapod.yml @@ -852,10 +852,6 @@ Builds: versionCode: 2070195 commit: d5f0ef244863923b7b77141012fcd2b5e61ee05a subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java gradle: - free prebuild: sed -i -r -e '/play(Api|Implementation)/d' build.gradle ../core/build.gradle diff --git a/metadata/de.marmaro.krt.ffupdater.yml b/metadata/de.marmaro.krt.ffupdater.yml index 3d0dcd9bfe..b17e4a6017 100644 --- a/metadata/de.marmaro.krt.ffupdater.yml +++ b/metadata/de.marmaro.krt.ffupdater.yml @@ -783,14 +783,10 @@ Builds: versionCode: 114 commit: 3577f3a8d30aa4dea8e8a27546cc2eea87024a40 subdir: ffupdater - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java gradle: - yes -AutoUpdateMode: Version %v +AutoUpdateMode: Version UpdateCheckMode: Tags CurrentVersion: 77.3.0 CurrentVersionCode: 114 diff --git a/metadata/de.storchp.fdroidbuildstatus.yml b/metadata/de.storchp.fdroidbuildstatus.yml index d99c458b19..a423486963 100644 --- a/metadata/de.storchp.fdroidbuildstatus.yml +++ b/metadata/de.storchp.fdroidbuildstatus.yml @@ -271,10 +271,6 @@ Builds: versionCode: 36 commit: a74d0c776293ce63273acfd194008456bd8c30d3 subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk - - update-alternatives --auto java gradle: - yes diff --git a/metadata/de.tutao.tutanota.yml b/metadata/de.tutao.tutanota.yml index ec25752b05..f55dc24c41 100644 --- a/metadata/de.tutao.tutanota.yml +++ b/metadata/de.tutao.tutanota.yml @@ -2153,16 +2153,12 @@ Builds: commit: e1cc5b3410223db88a4941a7c1e1363ebd0db337 subdir: app-android/app sudo: + - echo "deb https://deb.debian.org/debian testing main" > /etc/apt/sources.list.d/testing.list + - echo -e "Package:*\nPin:release o=Debian,a=testing\nPin-Priority:-300\n" > + /etc/apt/preferences.d/debian-testing - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java + - apt-get install -y -t testing npm - apt-get install -y g++ - - 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: diff --git a/metadata/de.wger.flutter.yml b/metadata/de.wger.flutter.yml index 7aa43e4638..97cc0605bd 100644 --- a/metadata/de.wger.flutter.yml +++ b/metadata/de.wger.flutter.yml @@ -75,11 +75,13 @@ Builds: - versionName: 1.5.0 versionCode: 27 commit: 280143362552fa3af2a612edf326ebac1697285b + sudo: + - apt-get update + - apt-get install -y sdkmanager output: build/app/outputs/flutter-apk/app-release.apk srclibs: - flutter@2.10.4 - prebuild: $$SDK$$/tools/bin/sdkmanager "build-tools;30.0.3" "build-tools;31.0.0" - "platforms;android-31" > /dev/null + prebuild: sdkmanager "build-tools;30.0.3" "build-tools;31.0.0" "platforms;android-31" build: - $$flutter$$/bin/flutter config --no-analytics - $$flutter$$/bin/flutter packages pub get diff --git a/metadata/dubrowgn.wattz.yml b/metadata/dubrowgn.wattz.yml index 80e1897b8f..ce872cae21 100644 --- a/metadata/dubrowgn.wattz.yml +++ b/metadata/dubrowgn.wattz.yml @@ -82,10 +82,6 @@ Builds: versionCode: 10 commit: 3d69957c98f59a08cdeca70c3eb2880403c5329d subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java gradle: - yes diff --git a/metadata/helium314.localbackend.yml b/metadata/helium314.localbackend.yml index d2c8278e29..c24821d1da 100644 --- a/metadata/helium314.localbackend.yml +++ b/metadata/helium314.localbackend.yml @@ -72,10 +72,6 @@ Builds: versionCode: 29 commit: 6ea9634a90ed6b0e876e033fd1f76ff8585ca041 subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java gradle: - yes diff --git a/metadata/io.github.deweyreed.clipboardcleaner.yml b/metadata/io.github.deweyreed.clipboardcleaner.yml index ad2a2b9e0c..837a2005fa 100644 --- a/metadata/io.github.deweyreed.clipboardcleaner.yml +++ b/metadata/io.github.deweyreed.clipboardcleaner.yml @@ -128,10 +128,6 @@ Builds: versionCode: 181 commit: e62f5e2b0f42802043242a1bbb4e0d6cb8f01ad5 subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java gradle: - yes diff --git a/metadata/org.avmedia.gshockGoogleSync.yml b/metadata/org.avmedia.gshockGoogleSync.yml index 8b749e63e5..0888fb9df9 100644 --- a/metadata/org.avmedia.gshockGoogleSync.yml +++ b/metadata/org.avmedia.gshockGoogleSync.yml @@ -116,10 +116,6 @@ Builds: versionCode: 53 commit: 7753f9154816ee2ec657b8cd863f7d6a5eb9d31f subdir: app - sudo: - - apt-get update - - apt-get install -y openjdk-11-jdk-headless - - update-alternatives --auto java gradle: - yes