From 1f5c813d50c850b7a1863db4e1a5d769243fa27a Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Fri, 9 Apr 2021 22:50:21 +0800
Subject: [PATCH] Misc fix

---
 metadata/com.krawieck.lemmur.yml            | 18 +-----------------
 metadata/de.chagemann.regexcrossword.yml    |  2 +-
 metadata/de.jbservices.nc_passwords_app.yml |  6 +++---
 metadata/oppen.gemini.ariane.yml            |  2 ++
 metadata/org.adaway.yml                     |  3 +--
 5 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/metadata/com.krawieck.lemmur.yml b/metadata/com.krawieck.lemmur.yml
index 77334980a9..5f25d28294 100644
--- a/metadata/com.krawieck.lemmur.yml
+++ b/metadata/com.krawieck.lemmur.yml
@@ -46,28 +46,12 @@ Builds:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter build apk
 
-  - versionName: 0.4.0
-    versionCode: 13
-    commit: v0.4.0
-    output: build/app/outputs/flutter-apk/app-release.apk
-    srclibs:
-      - flutter@1.22.5
-    rm:
-      - ios
-      - linux
-      - scripts
-      - test
-      - windows
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter build apk
-
   - versionName: 0.4.1
     versionCode: 14
     commit: v0.4.1
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
-      - flutter@1.22.5
+      - flutter@2.0.4
     rm:
       - ios
       - linux
diff --git a/metadata/de.chagemann.regexcrossword.yml b/metadata/de.chagemann.regexcrossword.yml
index ac79eeabbb..6bece6e43a 100644
--- a/metadata/de.chagemann.regexcrossword.yml
+++ b/metadata/de.chagemann.regexcrossword.yml
@@ -42,7 +42,7 @@ Builds:
     subdir: app
     gradle:
       - yes
-    prebuild: sed -i -e '/play {/,+5d' -e '/com.github.triplet.play/d' build.gradle
+    prebuild: sed -i -e '/play {/,+5d' -e '/com.github.triplet/d' build.gradle
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
diff --git a/metadata/de.jbservices.nc_passwords_app.yml b/metadata/de.jbservices.nc_passwords_app.yml
index 2a5fab118c..4f8588e3f5 100644
--- a/metadata/de.jbservices.nc_passwords_app.yml
+++ b/metadata/de.jbservices.nc_passwords_app.yml
@@ -80,16 +80,16 @@ Builds:
     versionCode: 18
     commit: v21.4.0
     subdir: android/app
-    output: ../../build/app/outputs/apk/fdroid/release/app-fdroid-release.apk
+    output: ../../build/app/outputs/flutter-apk/app-fdroid-profile.apk
     srclibs:
-      - flutter@1.22.6
+      - flutter@2.0.4
     prebuild:
       - rm -fr ios
       - echo "flutter.sdk=$$flutter$$" >> ../local.properties
     build:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter packages pub get
-      - $$flutter$$/bin/flutter build apk --flavor fdroid
+      - $$flutter$$/bin/flutter build apk --profile --flavor fdroid
 
 MaintainerNotes: |-
     Builds will fail when the srclib ref of flutter and the version with which
diff --git a/metadata/oppen.gemini.ariane.yml b/metadata/oppen.gemini.ariane.yml
index 1b09e7e122..5fbb3f429e 100644
--- a/metadata/oppen.gemini.ariane.yml
+++ b/metadata/oppen.gemini.ariane.yml
@@ -38,6 +38,8 @@ Builds:
       - update-alternatives --auto java
     gradle:
       - yes
+    rm:
+      - ariadne/build
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
diff --git a/metadata/org.adaway.yml b/metadata/org.adaway.yml
index fa07c41699..c5930125a6 100644
--- a/metadata/org.adaway.yml
+++ b/metadata/org.adaway.yml
@@ -594,10 +594,9 @@ Builds:
     subdir: app
     gradle:
       - yes
-    prebuild: sed -i -e 's/22.1.7171670/22.0.7026061/' build.gradle
     scanignore:
       - Resources/symlink_hosts_to_data.zip
-    ndk: r22
+    ndk: r22b
 
 MaintainerNotes: '* uses Sentry.io (foss, Apache-2.0) in opt-in mode, so no Tracking
     AntiFeature required for that. See https://gitlab.com/fdroid/fdroiddata/-/issues/2289#note_503409470'