From dedec88d2e7c1b19d2fddce5b08bb4c04274a893 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Sun, 6 Mar 2022 23:57:27 +0800
Subject: [PATCH] misc fixes

---
 metadata/com.github.axet.callrecorder.yml  |  1 +
 metadata/com.invoiceninja.app.yml          |  4 ++--
 metadata/com.iskrembilen.quasseldroid.yml  |  5 +++++
 metadata/com.nathanatos.Cuppa.yml          |  2 +-
 metadata/com.zoffcc.applications.trifa.yml | 12 ++++++------
 metadata/dev.lucanlm.antimine.yml          |  4 ++++
 metadata/eu.pretix.pretixscan.droid.yml    |  2 +-
 metadata/org.totschnig.myexpenses.yml      |  2 +-
 8 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/metadata/com.github.axet.callrecorder.yml b/metadata/com.github.axet.callrecorder.yml
index a06cbe5cb0..890da1a74f 100644
--- a/metadata/com.github.axet.callrecorder.yml
+++ b/metadata/com.github.axet.callrecorder.yml
@@ -654,6 +654,7 @@ Builds:
     gradle:
       - yes
     prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+    ndk: r21
 
 AutoUpdateMode: Version callrecorder-%v
 UpdateCheckMode: Tags
diff --git a/metadata/com.invoiceninja.app.yml b/metadata/com.invoiceninja.app.yml
index 8423ed3276..ac795ea2a9 100644
--- a/metadata/com.invoiceninja.app.yml
+++ b/metadata/com.invoiceninja.app.yml
@@ -376,10 +376,10 @@ Builds:
 
   - versionName: 5.0.77
     versionCode: 77
-    commit: 4376986707a429fd7f49feba7aeed555fe4fe8f9
+    commit: 7e2eb3dff4721dd2197e2581e5c5c16eefbc6850
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
-      - flutter@2.6.0-11.0.pre
+      - flutter@2.10.3
     rm:
       - ios
       - linux
diff --git a/metadata/com.iskrembilen.quasseldroid.yml b/metadata/com.iskrembilen.quasseldroid.yml
index 9dbbf80ec1..c5cd610016 100644
--- a/metadata/com.iskrembilen.quasseldroid.yml
+++ b/metadata/com.iskrembilen.quasseldroid.yml
@@ -478,8 +478,13 @@ Builds:
     versionCode: 1321
     commit: 1.6.1
     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 '/signingConfigs {/,/^  }/d' -e '/signingConfigs/d' ../gradle/convention/src/main/kotlin/justjanne.android.signing.gradle.kts
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: HTTP
diff --git a/metadata/com.nathanatos.Cuppa.yml b/metadata/com.nathanatos.Cuppa.yml
index cbcaa162c0..1d32255ee9 100644
--- a/metadata/com.nathanatos.Cuppa.yml
+++ b/metadata/com.nathanatos.Cuppa.yml
@@ -103,7 +103,7 @@ Builds:
     commit: 63fa25373ef8911f3e6c24126e822a0972237257
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
-      - flutter@2.10.1
+      - flutter@2.10.3
     rm:
       - ios
     build:
diff --git a/metadata/com.zoffcc.applications.trifa.yml b/metadata/com.zoffcc.applications.trifa.yml
index b9002fe451..f0681bd9d5 100644
--- a/metadata/com.zoffcc.applications.trifa.yml
+++ b/metadata/com.zoffcc.applications.trifa.yml
@@ -1076,14 +1076,14 @@ Builds:
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.10.2.4988404'
     ndk: r20b
 
-  - versionName: 1.0.145
-    versionCode: 10145
-    commit: cd6c9670181a7ad756a9b4109e65fa193017452c
+  - versionName: 1.0.146
+    versionCode: 10146
+    commit: bf9dd2257ed84818f88af79110a76d79048b3901
     subdir: android-refimpl-app/app
     gradle:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.10.2.4988404'
-    ndk: r20b
+    ndk: r21
 
 MaintainerNotes: |-
     There was an issue with proprietary emoji, see https://github.com/zoff99/ToxAndroidRefImpl/issues/139
@@ -1091,5 +1091,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^[0-9].*
-CurrentVersion: 1.0.145
-CurrentVersionCode: 10145
+CurrentVersion: 1.0.146
+CurrentVersionCode: 10146
diff --git a/metadata/dev.lucanlm.antimine.yml b/metadata/dev.lucanlm.antimine.yml
index 046c95a53b..1b1af233c5 100644
--- a/metadata/dev.lucanlm.antimine.yml
+++ b/metadata/dev.lucanlm.antimine.yml
@@ -815,6 +815,10 @@ Builds:
     versionCode: 1507001
     commit: e69dbf6bf8be828deedac06a8746582c52ed3995
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - foss
     rm:
diff --git a/metadata/eu.pretix.pretixscan.droid.yml b/metadata/eu.pretix.pretixscan.droid.yml
index ca9d0d0441..1344ffad3e 100644
--- a/metadata/eu.pretix.pretixscan.droid.yml
+++ b/metadata/eu.pretix.pretixscan.droid.yml
@@ -196,7 +196,7 @@ Builds:
       - pretixscan/libpretixui-repo
     build:
       - pushd $$saki4510t-libcommon$$/common
-      - gradle uploadArchives
+      - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 gradle uploadArchives
       - popd
       - mv $$saki4510t-libcommon$$/repository/com/serenegiant/common/2.12.4/common-2.12.4.aar
         ../libpretixui-repo/common/common.aar
diff --git a/metadata/org.totschnig.myexpenses.yml b/metadata/org.totschnig.myexpenses.yml
index cb166647ba..bfd47b892f 100644
--- a/metadata/org.totschnig.myexpenses.yml
+++ b/metadata/org.totschnig.myexpenses.yml
@@ -1762,7 +1762,7 @@ Builds:
       - mlkit_kore
       - mlkit_latn
       - tests
-    prebuild: echo 'org.gradle.jvmargs=-Xmx1g' >> ../gradle.properties
+    prebuild: echo 'org.gradle.jvmargs=-Xmx4096m' >> ../gradle.properties
     build: gradle :myExpenses:packageExternReleaseUniversalApk
 
 MaintainerNotes: '* Ads: https://github.com/mtotschnig/MyExpenses/tree/b4237aabf8924614251d14fb18ce274ec0f934f7/myExpenses/src/main/java/org/totschnig/myexpenses/util/ads'