From cb9699895e5bf656865802e6c4f203684df6cadf Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Thu, 13 Oct 2022 18:01:47 +0800
Subject: [PATCH] misc fixes

---
 metadata/ch.thilojaeggi.notely.yml |  4 ----
 metadata/com.moimob.drinkable.yml  | 11 ++++-------
 metadata/it.vfsfitvnm.vimusic.yml  |  4 ----
 metadata/org.btcmap.yml            |  3 ++-
 metadata/org.mosad.teapod.yml      |  6 +-----
 metadata/org.wikipedia.yml         |  6 +-----
 6 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/metadata/ch.thilojaeggi.notely.yml b/metadata/ch.thilojaeggi.notely.yml
index 52e0b34a3b..43e91a8a23 100644
--- a/metadata/ch.thilojaeggi.notely.yml
+++ b/metadata/ch.thilojaeggi.notely.yml
@@ -37,10 +37,6 @@ Builds:
   - versionName: 1.0.8
     versionCode: 7
     commit: e3c9acd2678c1a3fecf68ae972ef76aef7978c29
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     output: build/app/outputs/flutter-apk/app-fdroid-release.apk
     srclibs:
       - flutter@3.3.3
diff --git a/metadata/com.moimob.drinkable.yml b/metadata/com.moimob.drinkable.yml
index 93df50061c..d4a10a52c9 100644
--- a/metadata/com.moimob.drinkable.yml
+++ b/metadata/com.moimob.drinkable.yml
@@ -80,14 +80,11 @@ Builds:
     commit: 51c66139ca4011176dcc8adb4658a8515b3f052b
     subdir: android/app
     sudo:
-      - sysctl fs.inotify.max_user_watches=524288 || true
-      - 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.17.0/node-v16.17.0-linux-x64.tar.xz
-      - echo "f0867d7a17a4d0df7dbb7df9ac3f9126c2b58f75450647146749ef296b31b49b node.tar.xz"
+      - curl -Lo node.tar.gz https://nodejs.org/dist/v16.17.1/node-v16.17.1-linux-x64.tar.gz
+      - echo "da5658693243b3ecf6a4cba6751a71df1eb9e9703ca93b42a9404aed85f58ad0 node.tar.gz"
         | sha256sum -c -
-      - tar xJf node.tar.xz --strip-components=1 -C /usr/local/
+      - tar xzf node.tar.gz --strip-components=1 -C /usr/local/
+      - sysctl fs.inotify.max_user_watches=524288 || true
     gradle:
       - yes
     prebuild:
diff --git a/metadata/it.vfsfitvnm.vimusic.yml b/metadata/it.vfsfitvnm.vimusic.yml
index 1371ba10ff..e1a109d628 100644
--- a/metadata/it.vfsfitvnm.vimusic.yml
+++ b/metadata/it.vfsfitvnm.vimusic.yml
@@ -128,10 +128,6 @@ Builds:
     versionCode: 17
     commit: 91ec216679014a33b3ceccf972c811152dedeaee
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
     prebuild:
diff --git a/metadata/org.btcmap.yml b/metadata/org.btcmap.yml
index dca068d926..3fa4e2ce0e 100644
--- a/metadata/org.btcmap.yml
+++ b/metadata/org.btcmap.yml
@@ -174,10 +174,11 @@ Builds:
 
   - versionName: 0.4.6
     versionCode: 21
+    disable: https://github.com/teambtcmap/btcmap-android/issues/27
     commit: ddc3ed923ee43bbce9362a39ff8ef68eb3f19c2a
     subdir: app
     gradle:
-      - yes
+      - fdroid
     preassemble:
       - bundleData
 
diff --git a/metadata/org.mosad.teapod.yml b/metadata/org.mosad.teapod.yml
index 56452a6b5f..72dbd3c53a 100644
--- a/metadata/org.mosad.teapod.yml
+++ b/metadata/org.mosad.teapod.yml
@@ -87,14 +87,10 @@ Builds:
     versionCode: 100000
     commit: d33de371d1d49031621f77df956b2397039afc84
     subdir: app
-    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: 1.0.0
 CurrentVersionCode: 100000
diff --git a/metadata/org.wikipedia.yml b/metadata/org.wikipedia.yml
index 614838d994..b07a824712 100644
--- a/metadata/org.wikipedia.yml
+++ b/metadata/org.wikipedia.yml
@@ -1337,10 +1337,6 @@ Builds:
     versionCode: 50421
     commit: ba46b5e12abf88dc87858d6150c89bad0ee12553
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - fdroid
     forceversion: true
@@ -1354,7 +1350,7 @@ MaintainerNotes: |-
     * we disable gradle abi splits because using the universal apk is easier for us for now.
     * ndk abifilters line is added as otherwise stray mips/armeabi .so files are added to the apk
 
-AutoUpdateMode: Version %v
+AutoUpdateMode: Version
 UpdateCheckMode: Tags ^r
 CurrentVersion: r/2.7.50421-r-2022-10-03
 CurrentVersionCode: 50421