From 68dea312d5de458301c236c5e952fc2bad5d5f41 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Mon, 15 May 2023 00:01:53 +0800
Subject: [PATCH] misc fixes

---
 metadata/com.cyb3rko.flashdim.yml         | 4 ++++
 metadata/com.dev.xavier.tempusromanum.yml | 4 ++++
 metadata/com.mkulesh.onpc.yml             | 8 +++++---
 metadata/net.gitsaibot.af.yml             | 4 ++++
 metadata/org.kde.bettercounter.yml        | 4 ++++
 metadata/org.openhab.habdroid.yml         | 4 ++++
 metadata/org.xcsoar.yml                   | 2 +-
 7 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/metadata/com.cyb3rko.flashdim.yml b/metadata/com.cyb3rko.flashdim.yml
index 56c36f2cfa..b53d25d64b 100644
--- a/metadata/com.cyb3rko.flashdim.yml
+++ b/metadata/com.cyb3rko.flashdim.yml
@@ -102,6 +102,10 @@ Builds:
     versionCode: 17
     commit: a2375ad74571a4b8d7af139a82b234c19d560cf8
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - yes
 
diff --git a/metadata/com.dev.xavier.tempusromanum.yml b/metadata/com.dev.xavier.tempusromanum.yml
index 259a423342..16d3eee41b 100644
--- a/metadata/com.dev.xavier.tempusromanum.yml
+++ b/metadata/com.dev.xavier.tempusromanum.yml
@@ -185,6 +185,10 @@ Builds:
     versionCode: 245
     commit: 0514e9563dc6396f3cad85073fb1522f06acdf90
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - yes
 
diff --git a/metadata/com.mkulesh.onpc.yml b/metadata/com.mkulesh.onpc.yml
index 85106e89d9..b7c273bc04 100644
--- a/metadata/com.mkulesh.onpc.yml
+++ b/metadata/com.mkulesh.onpc.yml
@@ -244,11 +244,13 @@ Builds:
     commit: 579fdfda77bf97553561e0f35de56649139cf5db
     subdir: app
     sudo:
-      - sdkmanager 'build-tools;32.0.0' 'build-tools;30.0.3'
-      - cp /opt/android-sdk/build-tools/30.0.3/lib/dx.jar /opt/android-sdk/build-tools/32.0.0/lib/dx.jar
-      - cp /opt/android-sdk/build-tools/30.0.3/dx /opt/android-sdk/build-tools/32.0.0/dx
+      - sdkmanager 'build-tools;33.0.2' 'build-tools;30.0.3'
+      - cp /opt/android-sdk/build-tools/30.0.3/lib/dx.jar /opt/android-sdk/build-tools/33.0.2/lib/dx.jar
+      - cp /opt/android-sdk/build-tools/30.0.3/dx /opt/android-sdk/build-tools/33.0.2/dx
     gradle:
       - yes
+    rm:
+      - doc
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
diff --git a/metadata/net.gitsaibot.af.yml b/metadata/net.gitsaibot.af.yml
index 1a2fc3ea7b..c985f13842 100644
--- a/metadata/net.gitsaibot.af.yml
+++ b/metadata/net.gitsaibot.af.yml
@@ -92,6 +92,10 @@ Builds:
     versionCode: 10
     commit: a7fcf6e0c5f7f45296db0acbb7f5ba5a49730b11
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - yes
 
diff --git a/metadata/org.kde.bettercounter.yml b/metadata/org.kde.bettercounter.yml
index d8866dc486..376af47cf7 100644
--- a/metadata/org.kde.bettercounter.yml
+++ b/metadata/org.kde.bettercounter.yml
@@ -159,6 +159,10 @@ Builds:
     versionCode: 30000
     commit: c835f268b936f5e045d44f41b0631bdf9a1d8ff6
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - yes
 
diff --git a/metadata/org.openhab.habdroid.yml b/metadata/org.openhab.habdroid.yml
index bdcb95454b..8d4e2f582a 100644
--- a/metadata/org.openhab.habdroid.yml
+++ b/metadata/org.openhab.habdroid.yml
@@ -425,6 +425,10 @@ Builds:
     versionCode: 490
     commit: f98384c913daf70c2db24a668c53e758ba122068
     subdir: mobile
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - foss
       - stable
diff --git a/metadata/org.xcsoar.yml b/metadata/org.xcsoar.yml
index 13a5551980..959d580086 100644
--- a/metadata/org.xcsoar.yml
+++ b/metadata/org.xcsoar.yml
@@ -437,7 +437,7 @@ Builds:
     sudo:
       - apt-get update
       - apt-get install -y ninja-build g++ vorbis-tools librsvg2-bin imagemagick make
-        gettext quilt sox m4 xsltproc cmake xz-utils pkg-config
+        gettext quilt sox automake xsltproc cmake xz-utils pkg-config libtool
     output: output/ANDROID/opt/build/aligned.apk
     prebuild:
       - platforms=$(grep ANDROID_SDK_PLATFORM build/targets.mk | sed -E 's/.*android-([0-9]+)/\1/')