From fd1387434787dd6f7a9a728f34f685ffbe6e19fe Mon Sep 17 00:00:00 2001
From: Licaon_Kter <licaon.kter@protonmail.com>
Date: Wed, 27 Jan 2021 13:27:53 +0200
Subject: [PATCH] Misc updates

---
 metadata/eu.faircode.email.yml          | 14 ++++++++++++--
 metadata/eu.siacs.conversations.yml     | 14 ++++++++++++--
 metadata/im.quicksy.client.yml          | 14 ++++++++++++--
 metadata/org.yuttadhammo.BodhiTimer.yml | 18 +++++-------------
 4 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml
index abcb617897..caa70306ac 100644
--- a/metadata/eu.faircode.email.yml
+++ b/metadata/eu.faircode.email.yml
@@ -3668,9 +3668,19 @@ Builds:
     prebuild: sed -i -e '/keystoreProperties/d' build.gradle
     ndk: r21d
 
+  - versionName: '1.1474'
+    versionCode: 1474
+    commit: '1.1474'
+    subdir: app
+    submodules: true
+    gradle:
+      - fdroid
+    prebuild: sed -i -e '/keystoreProperties/d' build.gradle
+    ndk: r21d
+
 MaintainerNotes: Dynamic versionName and version code, so no autoupdates anymore.
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '1.1470'
-CurrentVersionCode: 1470
+CurrentVersion: '1.1474'
+CurrentVersionCode: 1474
diff --git a/metadata/eu.siacs.conversations.yml b/metadata/eu.siacs.conversations.yml
index c9e04b3ea3..ac8344f574 100644
--- a/metadata/eu.siacs.conversations.yml
+++ b/metadata/eu.siacs.conversations.yml
@@ -1952,11 +1952,21 @@ Builds:
         '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
     ndk: r21d
 
+  - versionName: 2.9.6+fcr
+    versionCode: 407
+    commit: 2.9.6
+    gradle:
+      - conversationsFreeCompat
+    prebuild: sed -i -e '/ExtraTranslation/aabortOnError\ false' -e '/libwebrtc/d'
+        -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.32006'" -e
+        '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
+    ndk: r21d
+
 MaintainerNotes: |-
     For 2.8.0 we replace the webrtc.aar with the latest M79 from maven, but
     that won't be updated anymore so we'll need to start building locally in the future.
 
 AutoUpdateMode: Version ++fcr %v
 UpdateCheckMode: Tags
-CurrentVersion: 2.9.5+fcr
-CurrentVersionCode: 405
+CurrentVersion: 2.9.6+fcr
+CurrentVersionCode: 407
diff --git a/metadata/im.quicksy.client.yml b/metadata/im.quicksy.client.yml
index e4aa9f264d..c6b7cecdf7 100644
--- a/metadata/im.quicksy.client.yml
+++ b/metadata/im.quicksy.client.yml
@@ -450,7 +450,17 @@ Builds:
         '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
     ndk: r21d
 
+  - versionName: 2.9.6+fcr
+    versionCode: 407
+    commit: 2.9.6
+    gradle:
+      - quicksyFreeCompat
+    prebuild: sed -i -e '/ExtraTranslation/aabortOnError\ false' -e '/libwebrtc/d'
+        -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.32006'" -e
+        '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
+    ndk: r21d
+
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 2.9.5+fcr
-CurrentVersionCode: 405
+CurrentVersion: 2.9.6+fcr
+CurrentVersionCode: 407
diff --git a/metadata/org.yuttadhammo.BodhiTimer.yml b/metadata/org.yuttadhammo.BodhiTimer.yml
index 37a73062d3..6dcfa30f96 100644
--- a/metadata/org.yuttadhammo.BodhiTimer.yml
+++ b/metadata/org.yuttadhammo.BodhiTimer.yml
@@ -170,22 +170,14 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 5.3.3
-    versionCode: 70
-    commit: 5.3.3
-    subdir: app
-    gradle:
-      - yes
-
-  - versionName: 5.3.5
-    versionCode: 72
-    disable: kotlin repos
-    commit: 5.3.5
+  - versionName: 5.3.6
+    versionCode: 73
+    commit: 5.3.7
     subdir: app
     gradle:
       - yes
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
-CurrentVersion: 5.3.5
-CurrentVersionCode: 72
+CurrentVersion: 5.3.6
+CurrentVersionCode: 73