From a0601545d64d696fae25424ec264cbc60b5ab45a Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Sat, 12 Feb 2022 22:47:34 +0800
Subject: [PATCH] misc fixes

---
 metadata/com.emanuelef.remote_capture.yml          |  1 +
 metadata/com.simplemobiletools.filemanager.pro.yml |  2 +-
 metadata/com.winston69.simpill.yml                 | 10 +++++-----
 metadata/se.leap.bitmaskclient.yml                 |  6 +++++-
 metadata/se.leap.riseupvpn.yml                     |  6 +++++-
 metadata/uk.org.ngo.squeezer.yml                   |  4 ++++
 6 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/metadata/com.emanuelef.remote_capture.yml b/metadata/com.emanuelef.remote_capture.yml
index b10edfaf23..968bcf216b 100644
--- a/metadata/com.emanuelef.remote_capture.yml
+++ b/metadata/com.emanuelef.remote_capture.yml
@@ -347,6 +347,7 @@ Builds:
         'cmake;3.18.1' > /dev/null
     scandelete:
       - app/src/main/jni/tests/
+      - submodules/nDPI/tests
     ndk: r23b
 
 MaintainerNotes: Ignored files are the DB-IP country lite db and the DB-IP ASN lite
diff --git a/metadata/com.simplemobiletools.filemanager.pro.yml b/metadata/com.simplemobiletools.filemanager.pro.yml
index 94dbd1a7b6..2788736fef 100644
--- a/metadata/com.simplemobiletools.filemanager.pro.yml
+++ b/metadata/com.simplemobiletools.filemanager.pro.yml
@@ -460,7 +460,7 @@ Builds:
     patch:
       - build.patch
     gradle:
-      - yes
+      - fdroid
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
diff --git a/metadata/com.winston69.simpill.yml b/metadata/com.winston69.simpill.yml
index 31e042d5eb..f2fe26c0c9 100644
--- a/metadata/com.winston69.simpill.yml
+++ b/metadata/com.winston69.simpill.yml
@@ -101,9 +101,9 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 1.2.0
-    versionCode: 12
-    commit: 5f755cb79f96383ee39757b8caec8506519b75f3
+  - versionName: 1.2.0.1
+    versionCode: 13
+    commit: 6b94458ea461aa6f63ec1e6d7334ed43168a0b1c
     subdir: app
     sudo:
       - apt-get update || apt-get update
@@ -114,5 +114,5 @@ Builds:
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
-CurrentVersion: 1.2.0
-CurrentVersionCode: 12
+CurrentVersion: 1.2.0.1
+CurrentVersionCode: 13
diff --git a/metadata/se.leap.bitmaskclient.yml b/metadata/se.leap.bitmaskclient.yml
index 5983cbf9fb..f86e97e68d 100644
--- a/metadata/se.leap.bitmaskclient.yml
+++ b/metadata/se.leap.bitmaskclient.yml
@@ -356,17 +356,21 @@ Builds:
     commit: 4f23849b79ec0801672ff593a15907a6b1505940
     subdir: app
     submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - normalProductionFat
     rm:
       - tor-android/external/openssl/fuzz
       - tor-android/external/openssl/boringssl/fuzz
+    prebuild: sed -i -e 's|./gradlew|gradle|' ../scripts/build_deps.sh
     scandelete:
       - lib-bitmask-core*
       - bitmaskcore/IPtProxy
       - ics-openvpn/main/src/main/cpp
       - tor-android/external
-    prebuild: sed -i -e 's|./gradlew|gradle|' ../scripts/build_deps.sh
     build: ../scripts/build_deps.sh
     ndk: r21e
 
diff --git a/metadata/se.leap.riseupvpn.yml b/metadata/se.leap.riseupvpn.yml
index ff8428d700..b6e2a99138 100644
--- a/metadata/se.leap.riseupvpn.yml
+++ b/metadata/se.leap.riseupvpn.yml
@@ -190,17 +190,21 @@ Builds:
     commit: 4f23849b79ec0801672ff593a15907a6b1505940
     subdir: app
     submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - customProductionFat
     rm:
       - tor-android/external/openssl/fuzz
       - tor-android/external/openssl/boringssl/fuzz
+    prebuild: sed -i -e 's|./gradlew|gradle|' ../scripts/build_deps.sh
     scandelete:
       - lib-bitmask-core*
       - bitmaskcore/IPtProxy
       - ics-openvpn/main/src/main/cpp
       - tor-android/external
-    prebuild: sed -i -e 's|./gradlew|gradle|' ../scripts/build_deps.sh
     build: ../scripts/build_deps.sh
     ndk: r21e
 
diff --git a/metadata/uk.org.ngo.squeezer.yml b/metadata/uk.org.ngo.squeezer.yml
index 0a066f6095..2df532d212 100644
--- a/metadata/uk.org.ngo.squeezer.yml
+++ b/metadata/uk.org.ngo.squeezer.yml
@@ -82,6 +82,10 @@ Builds:
     versionCode: 110
     commit: 4be630900331c8c68fe0d7594de98e49a0182bcf
     subdir: Squeezer
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes