From 0aad7b218389265afa5da19a8c95a38dd2baf037 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Thu, 18 Jan 2024 16:34:56 +0800
Subject: [PATCH] misc fixes

---
 metadata/ch.simonste.jasstafel.yml  |  2 +-
 metadata/com.android.geto.yml       | 22 +++++---------
 metadata/com.axiel7.anihyou.yml     |  1 +
 metadata/com.froxot.cuscon.foss.yml | 13 ---------
 metadata/com.ismartcoding.plain.yml | 45 -----------------------------
 metadata/se.lublin.mumla.yml        |  4 ++-
 6 files changed, 12 insertions(+), 75 deletions(-)

diff --git a/metadata/ch.simonste.jasstafel.yml b/metadata/ch.simonste.jasstafel.yml
index 965fa3bf9a..b5ed584d4f 100644
--- a/metadata/ch.simonste.jasstafel.yml
+++ b/metadata/ch.simonste.jasstafel.yml
@@ -24,7 +24,7 @@ Builds:
       - web
       - windows
     prebuild:
-      - version=$(sed -n -E "s/.*flutter-version:\ '(.*)'/\1/p" .github/workflows/build.yml)
+      - version=$(sed -n -E "s/.*FLUTTER_VERSION:\ (.*)/\1/p" .github/workflows/build.yml)
       - pushd $$flutter$$
       - git checkout -f $version
       - popd
diff --git a/metadata/com.android.geto.yml b/metadata/com.android.geto.yml
index 74be066d4d..429a6ae7e8 100644
--- a/metadata/com.android.geto.yml
+++ b/metadata/com.android.geto.yml
@@ -78,22 +78,9 @@ Builds:
     scandelete:
       - build-logic/convention/build
 
-  - versionName: '1.9'
-    versionCode: 9
-    disable: https://github.com/JackEblan/Geto/issues/13
-    commit: 618e8192c1c173757945fb55b4633c10581fd9f0
-    subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-17-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - yes
-    scandelete:
-      - build-logic/convention/build
-
   - versionName: '1.10'
     versionCode: 10
+    disable: https://github.com/JackEblan/Geto/issues/13
     commit: 548b4ce1e1f1c6d984f44af669c11f76099ff270
     subdir: app
     sudo:
@@ -101,7 +88,12 @@ Builds:
       - apt-get install -y openjdk-17-jdk-headless
       - update-alternatives --auto java
     gradle:
-      - yes
+      - fdroid
+    rm:
+      - build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt
+    prebuild:
+      - sed -i -e '/firebase/d' ../build.gradle.kts ../gradle/libs.versions.toml
+      - sed -i -e '/crashlytics/d' -e '/androidFirebase/,/^        }/d' ../build-logic/convention/build.gradle.kts
     scandelete:
       - build-logic/convention/build
 
diff --git a/metadata/com.axiel7.anihyou.yml b/metadata/com.axiel7.anihyou.yml
index 979cf3ec0d..96b1194b8f 100644
--- a/metadata/com.axiel7.anihyou.yml
+++ b/metadata/com.axiel7.anihyou.yml
@@ -37,6 +37,7 @@ Builds:
 
   - versionName: 1.2.4
     versionCode: 49
+    disable: https://github.com/axiel7/AniHyou-android/issues/96
     commit: 9191aab5e2a58f27b3a5e0e4b3174580ac0756df
     subdir: app
     sudo:
diff --git a/metadata/com.froxot.cuscon.foss.yml b/metadata/com.froxot.cuscon.foss.yml
index 64629fcf92..9b9825f2f8 100644
--- a/metadata/com.froxot.cuscon.foss.yml
+++ b/metadata/com.froxot.cuscon.foss.yml
@@ -85,19 +85,6 @@ Builds:
     postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$
       'META-INF/services/*'
 
-  - versionName: 3.0.3.6
-    versionCode: 3036
-    commit: 95ebe1c38de4a8da3a44acbf7d55603e62fed33f
-    subdir: app
-    gradle:
-      - foss
-    srclibs:
-      - reproducible-apk-tools@v0.2.3
-    rm:
-      - requests
-    postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$
-      'META-INF/services/*'
-
   - versionName: 3.0.3.7
     versionCode: 3037
     commit: 0a3f0c18fe5bc66bf3e51818f9b222b2f4566757
diff --git a/metadata/com.ismartcoding.plain.yml b/metadata/com.ismartcoding.plain.yml
index 77ac997791..00b6936e4b 100644
--- a/metadata/com.ismartcoding.plain.yml
+++ b/metadata/com.ismartcoding.plain.yml
@@ -1845,51 +1845,6 @@ Builds:
     gradleprops:
       - abiFilters=x86_64
 
-  - versionName: 1.2.30
-    versionCode: 221
-    commit: f618629ea05648529b4a045f919c01970411de81
-    subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-17-jdk-headless
-      - update-java-alternatives -a
-    gradle:
-      - github
-    prebuild: sed -i -e '/com.google.gms/d' -e '/firebase/d' -e '/CrashlyticsExtension/,+2d'
-      {..,.}/build.gradle.kts
-    gradleprops:
-      - abiFilters=armeabi-v7a
-
-  - versionName: 1.2.30
-    versionCode: 222
-    commit: f618629ea05648529b4a045f919c01970411de81
-    subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-17-jdk-headless
-      - update-java-alternatives -a
-    gradle:
-      - github
-    prebuild: sed -i -e '/com.google.gms/d' -e '/firebase/d' -e '/CrashlyticsExtension/,+2d'
-      {..,.}/build.gradle.kts
-    gradleprops:
-      - abiFilters=arm64-v8a
-
-  - versionName: 1.2.30
-    versionCode: 223
-    commit: f618629ea05648529b4a045f919c01970411de81
-    subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-17-jdk-headless
-      - update-java-alternatives -a
-    gradle:
-      - github
-    prebuild: sed -i -e '/com.google.gms/d' -e '/firebase/d' -e '/CrashlyticsExtension/,+2d'
-      {..,.}/build.gradle.kts
-    gradleprops:
-      - abiFilters=x86_64
-
   - versionName: 1.2.31
     versionCode: 224
     commit: 19caba002646bcc0f81be4b1f5681d731fb0aff6
diff --git a/metadata/se.lublin.mumla.yml b/metadata/se.lublin.mumla.yml
index 2c7dab0eba..8acd991152 100644
--- a/metadata/se.lublin.mumla.yml
+++ b/metadata/se.lublin.mumla.yml
@@ -379,6 +379,8 @@ Builds:
     sudo:
       - apt-get update
       - apt-get install -y file make
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - official
     rm:
@@ -391,7 +393,7 @@ Builds:
       - gradle jar
     buildjni:
       - ../libraries/humla/src/main/jni
-    ndk: r22b
+    ndk: r25b
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^[^-]*$