misc fixes

metadata/com.github.catfriend1.syncthingandroid.yml

@@ -1699,14 +1699,16 @@ Builds:
     submodules: true
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk
+      - apt-get install -y openjdk-11-jdk-headless
       - update-alternatives --auto java
     gradle:
       - yes
     output: app/build/outputs/apk/release/app-release-unsigned.apk
     rm:
       - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
-    prebuild: sed -i -e '/signingConfig/d' app/build.gradle
+    prebuild:
+      - sed -i -e '/signingConfig/d' app/build.gradle
+      - echo 'org.gradle.jvmargs=-Xmx4096m' >> gradle.properties
     preassemble:
       - buildNative
 

metadata/com.simplemobiletools.calculator.yml

@@ -282,7 +282,7 @@ Builds:
       - apt-get install -y openjdk-11-jdk-headless
       - update-alternatives --auto java
     gradle:
-      - yes
+      - fdroid
     prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
 
 AutoUpdateMode: Version %v

metadata/io.github.chronosx88.yggdrasil.yml

@@ -109,6 +109,8 @@ Builds:
     gradle:
       - yes
     prebuild:
+      - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager 'platforms;android-31'
+        'build-tools;31.0.0' > /dev/null
       - mv ../acra.properties.sample ../acra.properties
       - sed -i -e '/signingConfig\ signing/d' -e '/ndkVersion/d' build.gradle
     build:
@@ -118,7 +120,9 @@ Builds:
       - export GO_COMPILED="$PWD/bin"
       - export PATH="$GO_COMPILED:$PATH"
       - go get golang.org/x/mobile/cmd/gomobile
-      - cd ../yggdrasil
+      - cd ../yggdrasil/yggdrasil-extras
+      - gomobile init
+      - cd ..
       - make
     ndk: r21e
 

metadata/juloo.keyboard2.yml

@@ -33,8 +33,16 @@ Builds:
   - versionName: 1.11.0
     versionCode: 14
     commit: 96c4b165ac73ae43c4e462456fba083d04827363
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     output: unsigned.apk
-    prebuild: $$SKD$$/tools/bin/sdkmanager 'platforms;android-30' > /dev/null
+    prebuild:
+      - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager 'platforms;android-30'
+        'build-tools;31.0.0' 'build-tools;30.0.3' > /dev/null
+      - cp $$SDK$$/build-tools/30.0.3/lib/dx.jar $$SDK$$/build-tools/31.0.0/lib/dx.jar
+      - cp $$SDK$$/build-tools/30.0.3/dx $$SDK$$/build-tools/31.0.0/dx
     build:
       - make _build/juloo.keyboard2.unsigned-apk
       - mv _build/juloo.keyboard2.unsigned-apk unsigned.apk

metadata/org.hlwd.bible_multi_the_life.yml

@@ -239,6 +239,10 @@ Builds:
   - versionName: 1.18.0
     versionCode: 20220116
     commit: b5da8fb56c618485b6b48f7875d942b94348f590
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
       - flutter@2.8.1