From a6981845cfb6ea3491202c550e76b9f0db1bff51 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Mon, 7 Feb 2022 16:31:47 +0800
Subject: [PATCH] misc fixes

---
 metadata/com.oasisfeng.island.fdroid.yml      | 24 +------------------
 ...e.bahnhoefe.deutschlands.bahnhofsfotos.yml |  4 ++++
 metadata/la.daube.photochiotte.yml            |  1 +
 metadata/org.bibledit.android.yml             |  2 ++
 metadata/se.manyver.yml                       |  9 +++----
 5 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/metadata/com.oasisfeng.island.fdroid.yml b/metadata/com.oasisfeng.island.fdroid.yml
index c8d039dc05..37a251f9c9 100644
--- a/metadata/com.oasisfeng.island.fdroid.yml
+++ b/metadata/com.oasisfeng.island.fdroid.yml
@@ -425,31 +425,9 @@ Builds:
         ../settings.gradle
       - echo 'org.gradle.jvmargs=-Xmx4096m' >> ../gradle.properties
 
-  - versionName: 6.0.2-21fbf17d
-    versionCode: 51620
-    disable: https://gitlab.com/secure-system/Insular/-/issues/43
-    commit: 05a8365ac18a085b88230aa68d2df60003aa67a9
-    subdir: assembly
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - complete
-      - fdroid
-    srclibs:
-      - deagle@d4767d5e69074b03e641186fa9504be37f09c673
-      - setupwizard@android12--mainline-release
-    rm:
-      - assembly/google-services.json
-      - shared/src/main/res/xml/analytics_tracker.xml
-    prebuild:
-      - sed -i -e 's!../deagle!$$deagle$$!' -e 's!../setup-wizard!$$setupwizard$$!'
-        ../settings.gradle
-      - echo 'org.gradle.jvmargs=-Xmx4096m' >> ../gradle.properties
-
   - versionName: 6.0.2-4507bbd9
     versionCode: 51624
+    disable: https://gitlab.com/secure-system/Insular/-/issues/43
     commit: f6b117d8282c4798da247796b9081e3bd53bd55d
     subdir: assembly
     sudo:
diff --git a/metadata/de.bahnhoefe.deutschlands.bahnhofsfotos.yml b/metadata/de.bahnhoefe.deutschlands.bahnhofsfotos.yml
index 665f2a74b8..f6adfdf84c 100644
--- a/metadata/de.bahnhoefe.deutschlands.bahnhofsfotos.yml
+++ b/metadata/de.bahnhoefe.deutschlands.bahnhofsfotos.yml
@@ -87,6 +87,10 @@ Builds:
     versionCode: 63
     commit: 330d5ecc699a1094145a37a2f87abea93cae5314
     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/la.daube.photochiotte.yml b/metadata/la.daube.photochiotte.yml
index ee9d91b56d..60e955e2fb 100644
--- a/metadata/la.daube.photochiotte.yml
+++ b/metadata/la.daube.photochiotte.yml
@@ -219,6 +219,7 @@ Builds:
 
   - versionName: '1.19'
     versionCode: 20
+    disable: https://gitlab.com/fdroid/fdroiddata/-/merge_requests/10560
     commit: f25fde6bb4cf090cfc55dcd40a559b40133a926d
     subdir: app
     sudo:
diff --git a/metadata/org.bibledit.android.yml b/metadata/org.bibledit.android.yml
index d3a5a78441..02f3000fe4 100644
--- a/metadata/org.bibledit.android.yml
+++ b/metadata/org.bibledit.android.yml
@@ -53,6 +53,8 @@ Builds:
       - update-alternatives --auto java
     gradle:
       - yes
+    prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager
+        'cmake;3.10.2.4988404' > /dev/null
     ndk: r21e
 
 AutoUpdateMode: Version %v
diff --git a/metadata/se.manyver.yml b/metadata/se.manyver.yml
index 83b6437bfc..16a3fd10ba 100644
--- a/metadata/se.manyver.yml
+++ b/metadata/se.manyver.yml
@@ -2178,12 +2178,13 @@ Builds:
     prebuild: sed -i -e '/lifecycle/d' ../build.gradle
     scanignore:
       - android/build.gradle
-      - node_modules/react-native-localize/android/build.gradle
-      - node_modules/react-native-vector-icons/android/build.gradle
-      - node_modules/react-native-svg/android/build.gradle
       - node_modules/react-native/android
-      - node_modules/hermes-engine
       - node_modules/jsc-android
+      - node_modules/hermes-engine
+      - node_modules/react-native-localize/android/build.gradle
+      - node_modules/react-native-svg/android/build.gradle
+      - node_modules/react-native-vector-icons/android/build.gradle
+      - node_modules/@react-native-async-storage/async-storage/android/build.gradle
     scandelete:
       - node_modules
     build: