From daf8740e1a47a1051d5eecd484d64047d7587a48 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Tue, 2 Nov 2021 21:43:33 +0800
Subject: [PATCH] misc fixes

---
 metadata/com.spicychair.weather.yml  |  7 ++++++-
 metadata/de.rampro.activitydiary.yml |  1 +
 metadata/eu.dorfbrunnen.momkin.yml   | 14 +++++++++-----
 metadata/io.nekohasekai.sagernet.yml |  6 +++---
 metadata/org.scoutant.rpn.yml        |  4 ++++
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/metadata/com.spicychair.weather.yml b/metadata/com.spicychair.weather.yml
index e57ba816e3..c141ac0256 100644
--- a/metadata/com.spicychair.weather.yml
+++ b/metadata/com.spicychair.weather.yml
@@ -65,10 +65,15 @@ Builds:
 
   - versionName: 1.4.6
     versionCode: 32
+    disable: https://github.com/SpicyChair/pluvia_weather_flutter/issues/36
     commit: 1d0b151ae128c57163dd2fe46db1f8ed95ea669a
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
-      - flutter@2.5.1
+      - flutter@2.5.3
     rm:
       - ios
     build:
diff --git a/metadata/de.rampro.activitydiary.yml b/metadata/de.rampro.activitydiary.yml
index 2961f2bd1d..4d7a243d78 100644
--- a/metadata/de.rampro.activitydiary.yml
+++ b/metadata/de.rampro.activitydiary.yml
@@ -109,6 +109,7 @@ Builds:
 
   - versionName: 1.4.2
     versionCode: 136
+    disable: https://github.com/ramack/ActivityDiary/issues/305
     commit: 22593ca02b897132c5649f1219aa93448dc18b06
     subdir: app
     sudo:
diff --git a/metadata/eu.dorfbrunnen.momkin.yml b/metadata/eu.dorfbrunnen.momkin.yml
index 0128c3c887..ee8eff7d6c 100644
--- a/metadata/eu.dorfbrunnen.momkin.yml
+++ b/metadata/eu.dorfbrunnen.momkin.yml
@@ -20,14 +20,18 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 0.1.1
-    versionCode: 2
-    commit: 09344adcdfc2c978119794b3a22939fd6f9f6f27
+  - versionName: 0.1.2
+    versionCode: 3
+    commit: 9a3aee8ef3318d0e28e2bad5bf5604deca57da6b
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
-CurrentVersion: 0.1.1
-CurrentVersionCode: 2
+CurrentVersion: 0.1.2
+CurrentVersionCode: 3
diff --git a/metadata/io.nekohasekai.sagernet.yml b/metadata/io.nekohasekai.sagernet.yml
index c48cfcb99b..e326d33e6e 100644
--- a/metadata/io.nekohasekai.sagernet.yml
+++ b/metadata/io.nekohasekai.sagernet.yml
@@ -284,6 +284,7 @@ Builds:
 
   - versionName: 0.6-beta03
     versionCode: 610
+    disable: ndk r23
     commit: c9f234835a9db1b182f99b53941ae9b710ba31fc
     subdir: app
     sudo:
@@ -303,10 +304,9 @@ Builds:
     build:
       - pushd ..
       - ./run fdroid build
-    ndk: r21e
+    ndk: r23b
 
-ArchivePolicy: 12 versions
-AutoUpdateMode: Version %v
+AutoUpdateMode: None
 UpdateCheckMode: Tags
 VercodeOperation: '%c * 5'
 UpdateCheckData: sager.properties|VERSION_CODE=(\d+)||
diff --git a/metadata/org.scoutant.rpn.yml b/metadata/org.scoutant.rpn.yml
index 9a9d722175..ba7218d9a1 100644
--- a/metadata/org.scoutant.rpn.yml
+++ b/metadata/org.scoutant.rpn.yml
@@ -36,6 +36,10 @@ Builds:
     versionCode: 4
     commit: c6e6cabe0d01c8870fa59c68af55227d27365b54
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
     output: build/outputs/apk/release/rpn-*-release-unsigned.apk