From 6eb234e8950cea9e56b8543665eaf8e0062a4620 Mon Sep 17 00:00:00 2001
From: linsui <2873532-linsui@users.noreply.gitlab.com>
Date: Mon, 20 Dec 2021 15:54:41 +0000
Subject: [PATCH] misc fixes

---
 metadata/de.schildbach.oeffi.yml      |  1 +
 metadata/io.nekohasekai.sagernet.yml  | 24 ------------------------
 metadata/org.metabrainz.android.yml   |  4 ++--
 metadata/rocks.poopjournal.todont.yml |  4 ++++
 metadata/threads.server.yml           | 13 -------------
 5 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/metadata/de.schildbach.oeffi.yml b/metadata/de.schildbach.oeffi.yml
index b54c244fde..06734619e4 100644
--- a/metadata/de.schildbach.oeffi.yml
+++ b/metadata/de.schildbach.oeffi.yml
@@ -437,6 +437,7 @@ Builds:
 
   - versionName: 12.0.16-aosp
     versionCode: 120016
+    disable: DOES NOT VERIFY
     commit: v12.0.16
     subdir: oeffi
     submodules: true
diff --git a/metadata/io.nekohasekai.sagernet.yml b/metadata/io.nekohasekai.sagernet.yml
index 859d27904e..5f81c82685 100644
--- a/metadata/io.nekohasekai.sagernet.yml
+++ b/metadata/io.nekohasekai.sagernet.yml
@@ -402,30 +402,6 @@ Builds:
       - ./run fdroid build
     ndk: r23b
 
-  - versionName: 0.6-beta15
-    versionCode: 665
-    commit: 01b739eba6e2d865a8db63ce700eba4d8a2a1d4a
-    subdir: app
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    patch:
-      - disable-splits-abi.patch
-    gradle:
-      - fdroid
-    prebuild:
-      - cd ..
-      - ./run fdroid prebuild
-    scandelete:
-      - external
-      - plugin
-    build:
-      - cd ..
-      - ./run fdroid build
-    ndk: r23b
-
   - versionName: 0.6-beta16
     versionCode: 670
     commit: 7dfdc7ff622c443406d22a688689483a491066ac
diff --git a/metadata/org.metabrainz.android.yml b/metadata/org.metabrainz.android.yml
index b4457619b4..1f771c325d 100644
--- a/metadata/org.metabrainz.android.yml
+++ b/metadata/org.metabrainz.android.yml
@@ -50,11 +50,11 @@ Builds:
 
   - versionName: 5.0.1
     versionCode: 42
-    commit: 5fe8640de41d45a36ecf723324a9a7d5a994cdf6
+    commit: 6c7e9f924f08beaba915a6971ba6ec95f9d01710
     subdir: app
     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
diff --git a/metadata/rocks.poopjournal.todont.yml b/metadata/rocks.poopjournal.todont.yml
index 3686d9006b..dae1f36d6f 100644
--- a/metadata/rocks.poopjournal.todont.yml
+++ b/metadata/rocks.poopjournal.todont.yml
@@ -48,6 +48,10 @@ Builds:
     versionCode: 5
     commit: 4d4c0f5674693ef5178cde2091afd5d6392e6cca
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/threads.server.yml b/metadata/threads.server.yml
index 9498d8e1b4..d8875978b8 100644
--- a/metadata/threads.server.yml
+++ b/metadata/threads.server.yml
@@ -345,17 +345,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 2.6.9
-    versionCode: 269
-    commit: d95518ddfe962bd7c1015c33d41e4d65fe39cbb6
-    subdir: app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk
-      - update-alternatives --auto java
-    gradle:
-      - yes
-
   - versionName: 2.7.0
     versionCode: 270
     commit: e1bcdac93f0e944c8d15f937d35a6730bdd6820b
@@ -366,8 +355,6 @@ Builds:
       - update-alternatives --auto java
     gradle:
       - yes
-    prebuild: echo -e '\n' 'org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError
-        -Dfile.encoding=UTF-8' >> ../gradle.properties
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags