From 437051f58819d7adfef1d150dc3d313dcd82a540 Mon Sep 17 00:00:00 2001
From: linsui <2873532-linsui@users.noreply.gitlab.com>
Date: Mon, 22 Nov 2021 16:20:15 +0000
Subject: [PATCH] misc fixes

---
 metadata/com.simplemobiletools.clock.yml        | 4 ++++
 metadata/com.simplemobiletools.contacts.pro.yml | 8 --------
 metadata/de.syss.MifareClassicTool.yml          | 4 ++++
 metadata/eu.sum7.conversations.yml              | 5 +++--
 metadata/me.thanel.dank.yml                     | 4 ++++
 metadata/org.tether.tether.yml                  | 8 ++++----
 6 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/metadata/com.simplemobiletools.clock.yml b/metadata/com.simplemobiletools.clock.yml
index 1f760892d1..176e5d9139 100644
--- a/metadata/com.simplemobiletools.clock.yml
+++ b/metadata/com.simplemobiletools.clock.yml
@@ -180,6 +180,10 @@ Builds:
     versionCode: 25
     commit: b47b3854edda89379af3446264fa09edde9ac4f0
     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 '/keystore.*{/,/}/d; /keystore/d' build.gradle
diff --git a/metadata/com.simplemobiletools.contacts.pro.yml b/metadata/com.simplemobiletools.contacts.pro.yml
index 53271bafaf..cb825e8fd3 100644
--- a/metadata/com.simplemobiletools.contacts.pro.yml
+++ b/metadata/com.simplemobiletools.contacts.pro.yml
@@ -338,14 +338,6 @@ Builds:
       - yes
     prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
 
-  - versionName: 6.16.0
-    versionCode: 85
-    commit: aa718538e0c8e54391e65b979d51f6888f62fa5e
-    subdir: app
-    gradle:
-      - yes
-    prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
-
   - versionName: 6.16.1
     versionCode: 86
     commit: 792584be70d3892f813bb86dfa3fa81c718d908d
diff --git a/metadata/de.syss.MifareClassicTool.yml b/metadata/de.syss.MifareClassicTool.yml
index 65a31f00c6..2fa51bd55b 100644
--- a/metadata/de.syss.MifareClassicTool.yml
+++ b/metadata/de.syss.MifareClassicTool.yml
@@ -405,6 +405,10 @@ Builds:
     versionCode: 61
     commit: 4b5b020f740e1d3c9f81ab5a27d8687ea9106c83
     subdir: Mifare Classic Tool/app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
     rm:
diff --git a/metadata/eu.sum7.conversations.yml b/metadata/eu.sum7.conversations.yml
index 3cd25cd419..63a10b478c 100644
--- a/metadata/eu.sum7.conversations.yml
+++ b/metadata/eu.sum7.conversations.yml
@@ -598,7 +598,7 @@ Builds:
     ndk: r21e
 
   - versionName: 2.10.2
-    versionCode: 42023
+    versionCode: 4202300
     commit: fa1363cea039f588de133ca84c618fd57cf4a4cf
     sudo:
       - apt-get update || apt-get update
@@ -619,7 +619,8 @@ MaintainerNotes: |-
     We rename package on fork to work more smoothly (sharing button) - https://github.com/kriztan/Pix-Art-Messenger/issues/160,
     but without in git repository to make it easier for update to upstream (see .gitlab-ci.yml).
 
-AutoUpdateMode: Version %v-sum7
+AutoUpdateMode: Version
 UpdateCheckMode: Tags ^[0-9.]+
+VercodeOperation: 100*%c
 CurrentVersion: 2.10.2
 CurrentVersionCode: 42023
diff --git a/metadata/me.thanel.dank.yml b/metadata/me.thanel.dank.yml
index 582865e35d..3de42ae740 100644
--- a/metadata/me.thanel.dank.yml
+++ b/metadata/me.thanel.dank.yml
@@ -43,6 +43,10 @@ Builds:
     versionCode: 24
     commit: 2037409f07749b95e5da26ad4d2f2350b553ac55
     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 's/21.3.6528147/21.4.7075529/' build.gradle
diff --git a/metadata/org.tether.tether.yml b/metadata/org.tether.tether.yml
index 25f0bb841a..6bc60e2f6b 100644
--- a/metadata/org.tether.tether.yml
+++ b/metadata/org.tether.tether.yml
@@ -236,8 +236,8 @@ Builds:
       - $$flutter$$/bin/flutter build apk
     ndk: r21d
 
-  - versionName: 0.2.1
-    versionCode: 2001
+  - versionName: 0.2.2
+    versionCode: 2003
     commit: 70b67970e55f35ff3c2c288f542293c0be79b019
     submodules: true
     output: build/app/outputs/apk/release/app-release.apk
@@ -257,5 +257,5 @@ Builds:
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
 UpdateCheckData: version.txt|versionCode=(.*)|.|versionName=(.*)
-CurrentVersion: 0.2.1
-CurrentVersionCode: 2001
+CurrentVersion: 0.2.2
+CurrentVersionCode: 2003