From df59413baaaa72c8bbe0fbdce7983af0d736405b Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Thu, 31 Mar 2022 00:13:12 +0800
Subject: [PATCH] misc fixes

---
 metadata/com.dx.anonymousmessenger.yml |  2 ++
 metadata/com.ferrarid.converterpro.yml |  2 +-
 metadata/com.mdiqentw.lifedots.yml     |  3 ++-
 metadata/com.standardnotes.yml         |  3 ++-
 metadata/com.subtracks.yml             |  9 ++++++++-
 metadata/fr.nuage.souvenirs.yml        | 13 -------------
 6 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/metadata/com.dx.anonymousmessenger.yml b/metadata/com.dx.anonymousmessenger.yml
index b86042a67e..15e7edcea5 100644
--- a/metadata/com.dx.anonymousmessenger.yml
+++ b/metadata/com.dx.anonymousmessenger.yml
@@ -419,6 +419,8 @@ Builds:
     sudo:
       - apt-get update || apt-get update
       - apt-get install -y autogen build-essential gcc-arm-linux-gnueabihf libevent-dev
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
     srclibs:
diff --git a/metadata/com.ferrarid.converterpro.yml b/metadata/com.ferrarid.converterpro.yml
index 80edf03a1e..80f81f33df 100644
--- a/metadata/com.ferrarid.converterpro.yml
+++ b/metadata/com.ferrarid.converterpro.yml
@@ -150,7 +150,7 @@ Builds:
       - update-alternatives --auto java
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
-      - flutter@2.8.0
+      - flutter@2.10.3
     prebuild: sed -i -e 's/signingConfig signingConfigs.release//' android/app/build.gradle
     build:
       - $$flutter$$/bin/flutter config --no-analytics
diff --git a/metadata/com.mdiqentw.lifedots.yml b/metadata/com.mdiqentw.lifedots.yml
index d4f946ea05..33a1eb37db 100644
--- a/metadata/com.mdiqentw.lifedots.yml
+++ b/metadata/com.mdiqentw.lifedots.yml
@@ -20,10 +20,11 @@ Builds:
     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
+    prebuild: sed -i -e '/keystoreProperties/d' build.gradle
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
diff --git a/metadata/com.standardnotes.yml b/metadata/com.standardnotes.yml
index 5f2d976124..2ef74cba88 100644
--- a/metadata/com.standardnotes.yml
+++ b/metadata/com.standardnotes.yml
@@ -3037,8 +3037,9 @@ Builds:
 
   - versionName: 3.14.0
     versionCode: 3000338
+    disable: build failed
     commit: 3.14.0
-    subdir: android/app/
+    subdir: android/app
     sudo:
       - sysctl fs.inotify.max_user_watches=524288
       - curl -Lo node.tar.xz https://nodejs.org/dist/v16.13.2/node-v16.13.2-linux-x64.tar.xz
diff --git a/metadata/com.subtracks.yml b/metadata/com.subtracks.yml
index 6fe072730b..db2890453f 100644
--- a/metadata/com.subtracks.yml
+++ b/metadata/com.subtracks.yml
@@ -183,6 +183,8 @@ Builds:
       - npm -g install yarn
       - apt-get update || apt-get update
       - apt-get install -y wget
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
     srclibs:
@@ -217,10 +219,15 @@ Builds:
       - submodules
     build:
       - ../../scripts/prepare-exoplayer-ffmpeg.sh
+      - REACT_NATIVE_VERSION=`npm pkg get 'dependencies.react-native' | sed -E 's/^"([0-9]+\.[0-9]+\.[0-9]+)"/\1/'`
+      - REACT_NATIVE_VERSION_MINOR=`echo ${REACT_NATIVE_VERSION} | sed -E 's/^[0-9]+\.([0-9]+)\.[0-9]+/\1/'`
       - pushd $$react-native-reanimated$$
+      - pushd ..
+      - yarn add react-native@"${REACT_NATIVE_VERSION}"
+      - popd
       - FOR_HERMES=True gradle :assembleRelease
       - popd
-      - mv $$react-native-reanimated$$/build/outputs/aar/android-release.aar ../../node_modules/react-native-reanimated/android/react-native-reanimated-64-hermes.aar
+      - mv $$react-native-reanimated$$/build/outputs/aar/android-release.aar ../../node_modules/react-native-reanimated/android/react-native-reanimated-${REACT_NATIVE_VERSION_MINOR}-hermes.aar
     ndk: r21e
 
 AutoUpdateMode: Version v%v
diff --git a/metadata/fr.nuage.souvenirs.yml b/metadata/fr.nuage.souvenirs.yml
index 17e5669faa..29e18a903c 100644
--- a/metadata/fr.nuage.souvenirs.yml
+++ b/metadata/fr.nuage.souvenirs.yml
@@ -97,19 +97,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 2.4.0
-    versionCode: 18
-    commit: 16731f954f830adc791c3ea6177b2e2354503105
-    subdir: app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - yes
-    rm:
-      - app/gradle
-
   - versionName: 2.4.1
     versionCode: 19
     commit: 7571c4c7c6212d72ada7308c6608d1a1469da58d