From 3465003d2551f8abc90d31addccadd7294762cb3 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Mon, 24 May 2021 21:16:41 +0800
Subject: [PATCH] misc fixes

---
 .../com.github.jameshnsears.quoteunquote.yml  |  9 ------
 metadata/com.invoiceninja.app.yml             | 28 +------------------
 metadata/com.kanedias.holywarsoo.yml          | 26 ++---------------
 metadata/com.mcsnowflake.worktimer.yml        |  2 +-
 metadata/org.xphnx.ameixa.yml                 |  7 -----
 metadata/org.xphnx.ameixamonochrome.yml       |  9 ------
 6 files changed, 4 insertions(+), 77 deletions(-)

diff --git a/metadata/com.github.jameshnsears.quoteunquote.yml b/metadata/com.github.jameshnsears.quoteunquote.yml
index 4c5fad1e60..cc0ad63a98 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.3-fdroid
-    versionCode: 62
-    commit: 2.4.3-fdroid
-    subdir: app
-    submodules: true
-    gradle:
-      - fdroid
-    prebuild: sed -i -e '/firebase/d' build.gradle
-
   - versionName: 2.4.4-fdroid
     versionCode: 63
     commit: 2.4.4-fdroid
diff --git a/metadata/com.invoiceninja.app.yml b/metadata/com.invoiceninja.app.yml
index c495c9320a..7f408ddf27 100644
--- a/metadata/com.invoiceninja.app.yml
+++ b/metadata/com.invoiceninja.app.yml
@@ -115,35 +115,9 @@ Builds:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter build apk
 
-  - versionName: 5.0.48
-    versionCode: 48
-    disable: no tag
-    commit: v5.0.48
-    output: build/app/outputs/flutter-apk/app-release.apk
-    srclibs:
-      - flutter@2.0.5
-    rm:
-      - ios
-      - linux
-      - macos
-      - web
-      - windows
-    prebuild:
-      - cp lib/.env.dart.example lib/.env.dart
-      - cp android/app/build.gradle.dev android/app/build.gradle
-      - cp android/build.gradle.foss android/build.gradle
-      - cp lib/utils/oauth.dart.foss lib/utils/oauth.dart
-      - cp lib/ui/app/upgrade_dialog.dart.foss lib/ui/app/upgrade_dialog.dart
-      - cp android/app/src/main/AndroidManifest.foss.xml android/app/src/main/AndroidManifest.xml
-      - cp pubspec.foss.yaml pubspec.yaml
-      - rm pubspec.lock
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter build apk
-
   - versionName: 5.0.49
     versionCode: 49
-    commit: v5.0.49
+    commit: v5.0.50
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
       - flutter@2.0.5
diff --git a/metadata/com.kanedias.holywarsoo.yml b/metadata/com.kanedias.holywarsoo.yml
index 760a8636db..93809dfbb5 100644
--- a/metadata/com.kanedias.holywarsoo.yml
+++ b/metadata/com.kanedias.holywarsoo.yml
@@ -151,28 +151,6 @@ Builds:
       - ../html2md-build.sh
     ndk: r21d
 
-  - versionName: 1.5.9
-    versionCode: 290000
-    commit: 1.5.9
-    subdir: app
-    submodules: true
-    gradle:
-      - fdroid
-    output: build/outputs/apk/fdroid/release/app-fdroid-universal-release-unsigned.apk
-    srclibs:
-      - rustup@1.21.1
-    build:
-      - $$rustup$$/rustup-init.sh -y
-      - source $HOME/.cargo/env
-      - rustup default 1.42.0
-      - rustup target add armv7-linux-androideabi
-      - rustup target add aarch64-linux-android
-      - rustup target add i686-linux-android
-      - rustup target add x86_64-linux-android
-      - export NDK_HOME=$$NDK$$
-      - ../html2md-build.sh
-    ndk: r21d
-
   - versionName: 1.5.10
     versionCode: 300000
     commit: 1.5.10
@@ -180,9 +158,9 @@ Builds:
     submodules: true
     gradle:
       - fdroid
-    output: build/outputs/apk/fdroid/release/app-fdroid-universal-release-unsigned.apk
     srclibs:
       - rustup@1.21.1
+    prebuild: sed -i -e 's/21.3.6528147/21.4.7075529/' -e '/setEnable/d' build.gradle.kts
     build:
       - $$rustup$$/rustup-init.sh -y
       - source $HOME/.cargo/env
@@ -193,7 +171,7 @@ Builds:
       - rustup target add x86_64-linux-android
       - export NDK_HOME=$$NDK$$
       - ../html2md-build.sh
-    ndk: r21d
+    ndk: r21e
 
 MaintainerNotes: |-
     - This app is unofficial, I'm not related to Holywarsoo team in any way
diff --git a/metadata/com.mcsnowflake.worktimer.yml b/metadata/com.mcsnowflake.worktimer.yml
index 099a6a73e9..f52b954e9d 100644
--- a/metadata/com.mcsnowflake.worktimer.yml
+++ b/metadata/com.mcsnowflake.worktimer.yml
@@ -19,7 +19,7 @@ Builds:
 
   - versionName: '1.2'
     versionCode: 3
-    commit: '1.2'
+    commit: v1.2
     subdir: app
     gradle:
       - yes
diff --git a/metadata/org.xphnx.ameixa.yml b/metadata/org.xphnx.ameixa.yml
index e3f8efb815..0d473db7b4 100644
--- a/metadata/org.xphnx.ameixa.yml
+++ b/metadata/org.xphnx.ameixa.yml
@@ -245,13 +245,6 @@ Builds:
     gradle:
       - chromatic
 
-  - versionName: 4.8.0
-    versionCode: 480
-    commit: v4.8.0
-    subdir: app
-    gradle:
-      - chromatic
-
   - versionName: 4.8.1
     versionCode: 481
     commit: v4.8.1
diff --git a/metadata/org.xphnx.ameixamonochrome.yml b/metadata/org.xphnx.ameixamonochrome.yml
index 6909a1fa04..0231890593 100644
--- a/metadata/org.xphnx.ameixamonochrome.yml
+++ b/metadata/org.xphnx.ameixamonochrome.yml
@@ -218,15 +218,6 @@ Builds:
     prebuild: sed -i -e 's/applicationIdSuffix "monochrome"/applicationId "org.xphnx.ameixamonochrome"/'
         build.gradle
 
-  - versionName: 4.8.0
-    versionCode: 480
-    commit: v4.8.0
-    subdir: app
-    gradle:
-      - monochromatic
-    prebuild: sed -i -e 's/applicationIdSuffix "monochrome"/applicationId "org.xphnx.ameixamonochrome"/'
-        build.gradle
-
   - versionName: 4.8.1
     versionCode: 481
     commit: v4.8.1