From 7a3558ea7ecd23f02f00149e40d050c5436f9522 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Thu, 27 May 2021 20:47:31 +0800
Subject: [PATCH] misc fixes

---
 .../com.github.jameshnsears.quoteunquote.yml  |  9 ------
 metadata/com.ichi2.anki.yml                   | 30 +++----------------
 metadata/com.nextcloud_cookbook_flutter.yml   |  6 ++--
 metadata/eu.faircode.email.yml                |  1 +
 metadata/org.softeg.slartus.forpdaplus.yml    | 11 -------
 metadata/org.traffxml.roadeagle.yml           |  6 ----
 6 files changed, 7 insertions(+), 56 deletions(-)

diff --git a/metadata/com.github.jameshnsears.quoteunquote.yml b/metadata/com.github.jameshnsears.quoteunquote.yml
index 8da3b1b188..771a4b91e7 100644
--- a/metadata/com.github.jameshnsears.quoteunquote.yml
+++ b/metadata/com.github.jameshnsears.quoteunquote.yml
@@ -89,15 +89,6 @@ Builds:
       - fdroid
     prebuild: sed -i -e '/firebase/d' build.gradle
 
-  - versionName: 2.4.4-fdroid
-    versionCode: 63
-    commit: 2.4.4-fdroid
-    subdir: app
-    submodules: true
-    gradle:
-      - fdroid
-    prebuild: sed -i -e '/firebase/d' build.gradle
-
   - versionName: 2.4.5-fdroid
     versionCode: 64
     commit: 2.4.5-fdroid
diff --git a/metadata/com.ichi2.anki.yml b/metadata/com.ichi2.anki.yml
index 0d286231bc..75bf4505fd 100644
--- a/metadata/com.ichi2.anki.yml
+++ b/metadata/com.ichi2.anki.yml
@@ -710,32 +710,9 @@ Builds:
     prebuild: sed -i -e 's/21.1.6352462/21.3.6528147/' -e '/splits\ {/,+30d' build.gradle
     ndk: r21d
 
-  - versionName: 2.15.0
-    versionCode: 21500300
-    commit: v2.15.0
-    subdir: AnkiDroid
-    gradle:
-      - yes
-    rm:
-      - tools
-      - docs
-    prebuild: sed -i -e 's/21.1.6352462/21.3.6528147/' -e '/splits\ {/,+30d' build.gradle
-    ndk: r21d
-
-  - versionName: 2.15.1
-    versionCode: 21501300
-    commit: v2.15.1
-    subdir: AnkiDroid
-    gradle:
-      - yes
-    rm:
-      - tools
-      - docs
-    prebuild: sed -i -e 's/21.1.6352462/21.3.6528147/' -e '/splits\ {/,+30d' build.gradle
-    ndk: r21d
-
   - versionName: 2.15.2
     versionCode: 21502300
+    disable: Unknown maven repo https://github.com/ankidroid/Anki-Android/issues/8982
     commit: v2.15.2
     subdir: AnkiDroid
     gradle:
@@ -743,8 +720,9 @@ Builds:
     rm:
       - tools
       - docs
-    prebuild: sed -i -e 's/21.1.6352462/21.3.6528147/' -e '/splits\ {/,+30d' build.gradle
-    ndk: r21d
+    prebuild: sed -i -e 's/22.0.7026061/22.1.7171670/' -e '/splits {/,/^    }/d' -e
+        '/applicationVariants.all/,/^    }/d' build.gradle
+    ndk: r22b
 
 MaintainerNotes: Uses DexLoader to load custom decks and plugins (?).
 
diff --git a/metadata/com.nextcloud_cookbook_flutter.yml b/metadata/com.nextcloud_cookbook_flutter.yml
index 01c295b086..ac66ee1d3f 100644
--- a/metadata/com.nextcloud_cookbook_flutter.yml
+++ b/metadata/com.nextcloud_cookbook_flutter.yml
@@ -63,13 +63,11 @@ Builds:
   - versionName: 0.6.0
     versionCode: 18
     commit: 0.6.0
-    subdir: android/app
-    output: ../../build/app/outputs/flutter-apk/app-release.apk
+    output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
-      - flutter@2.0.5
+      - flutter@2.2.0
     rm:
       - ios
-    prebuild: echo "flutter.sdk=$$flutter$$" >> ../local.properties
     build:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter packages pub get
diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml
index 9209fd23d6..8352bf38ab 100644
--- a/metadata/eu.faircode.email.yml
+++ b/metadata/eu.faircode.email.yml
@@ -4210,6 +4210,7 @@ Builds:
 
   - versionName: '1.1600'
     versionCode: 1600
+    disable: build failed
     commit: '1.1600'
     subdir: app
     submodules: true
diff --git a/metadata/org.softeg.slartus.forpdaplus.yml b/metadata/org.softeg.slartus.forpdaplus.yml
index 207a4a7fb2..3bf76671ed 100644
--- a/metadata/org.softeg.slartus.forpdaplus.yml
+++ b/metadata/org.softeg.slartus.forpdaplus.yml
@@ -320,17 +320,6 @@ Builds:
     scanignore:
       - app/src/main/assets/databases/*.zip
 
-  - versionName: 3.5.8.1
-    versionCode: 649
-    commit: 3.5.8.1
-    subdir: app
-    gradle:
-      - rel
-    prebuild: sed -i -e '/applicationVariants.all/,/^    }/d' -e '/signingConfig/d'
-        build.gradle
-    scanignore:
-      - app/src/main/assets/databases/*.zip
-
   - versionName: 3.5.8.2
     versionCode: 650
     commit: 3.5.8.2
diff --git a/metadata/org.traffxml.roadeagle.yml b/metadata/org.traffxml.roadeagle.yml
index dd162f69fc..34cbdf9a97 100644
--- a/metadata/org.traffxml.roadeagle.yml
+++ b/metadata/org.traffxml.roadeagle.yml
@@ -18,12 +18,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 1.0.2
-    versionCode: 10002
-    commit: 1.0.2
-    gradle:
-      - yes
-
   - versionName: 1.0.3
     versionCode: 10003
     commit: 1.0.3