From 1fe5c6b905b725bb17179b5bce01fd06d094dd96 Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Tue, 20 Apr 2021 09:39:44 +0200
Subject: [PATCH] Misc fixes after build cycle

---
 metadata/com.ahorcado.yml                   | 2 +-
 metadata/com.annie.dictionary.fork.yml      | 1 +
 metadata/com.nextcloud_cookbook_flutter.yml | 2 +-
 metadata/com.termux.yml                     | 2 +-
 metadata/de.rwth_aachen.phyphox.yml         | 1 +
 metadata/eu.pretix.pretixprint.yml          | 2 +-
 metadata/fm.helio.yml                       | 4 ++--
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/metadata/com.ahorcado.yml b/metadata/com.ahorcado.yml
index aeb47e2151..3662371b93 100644
--- a/metadata/com.ahorcado.yml
+++ b/metadata/com.ahorcado.yml
@@ -44,7 +44,7 @@ Builds:
     commit: v1.5.1
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
-      - flutter@1.22.5
+      - flutter@2.0.5
     rm:
       - ios
       - test
diff --git a/metadata/com.annie.dictionary.fork.yml b/metadata/com.annie.dictionary.fork.yml
index 512ed4ceb6..05bb5e1053 100644
--- a/metadata/com.annie.dictionary.fork.yml
+++ b/metadata/com.annie.dictionary.fork.yml
@@ -13,6 +13,7 @@ Repo: https://github.com/marmistrz/QDict
 Builds:
   - versionName: 2.1.3
     versionCode: 20210415
+    disable: fails to build https://github.com/marmistrz/QDict/issues/1
     commit: 2.1.3
     subdir: qDict
     gradle:
diff --git a/metadata/com.nextcloud_cookbook_flutter.yml b/metadata/com.nextcloud_cookbook_flutter.yml
index 72a4ad21c3..06b6865033 100644
--- a/metadata/com.nextcloud_cookbook_flutter.yml
+++ b/metadata/com.nextcloud_cookbook_flutter.yml
@@ -51,7 +51,7 @@ Builds:
     subdir: android/app
     output: ../../build/app/outputs/flutter-apk/app-release.apk
     srclibs:
-      - flutter@1.22.4
+      - flutter@2.0.5
     rm:
       - ios
     prebuild: echo "flutter.sdk=$$flutter$$" >> ../local.properties
diff --git a/metadata/com.termux.yml b/metadata/com.termux.yml
index d1f1cc367f..a0d7a067a6 100644
--- a/metadata/com.termux.yml
+++ b/metadata/com.termux.yml
@@ -683,7 +683,7 @@ Builds:
     prebuild:
       - sed -i -e '/splits\ {/,+8d' build.gradle
       - sed -i -e '/publishing {/,/^}/d' ../terminal-{emulator,view}/build.gradle
-      - sed -i -e 's/22.0.7026061/22.1.7171670/' build.gradle
+      - sed -i -e 's/22.0.7026061/22.1.7171670/' ../gradle.properties
     ndk: r22b
 
 AutoUpdateMode: Version v%v
diff --git a/metadata/de.rwth_aachen.phyphox.yml b/metadata/de.rwth_aachen.phyphox.yml
index 1169594302..79848e8e84 100644
--- a/metadata/de.rwth_aachen.phyphox.yml
+++ b/metadata/de.rwth_aachen.phyphox.yml
@@ -114,6 +114,7 @@ Builds:
 
   - versionName: 1.1.9
     versionCode: 1010901
+    disable: contains binaries https://github.com/Staacks/phyphox-android/issues/18
     commit: v1.1.9
     subdir: app
     submodules: true
diff --git a/metadata/eu.pretix.pretixprint.yml b/metadata/eu.pretix.pretixprint.yml
index ead2f3ec32..3f54055c0a 100644
--- a/metadata/eu.pretix.pretixprint.yml
+++ b/metadata/eu.pretix.pretixprint.yml
@@ -113,7 +113,7 @@ Builds:
     subdir: pretixprint/app
     submodules: true
     gradle:
-      - yes
+      - floss
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
diff --git a/metadata/fm.helio.yml b/metadata/fm.helio.yml
index 7272b29502..15848312df 100644
--- a/metadata/fm.helio.yml
+++ b/metadata/fm.helio.yml
@@ -52,10 +52,10 @@ Builds:
     gradle:
       - yes
     output: build/outputs/apk/release_/release/app-release_-release-unsigned.apk
-    prebuild: sed -i 's/21\.3\.6528147/22.0.7026061/g' build.gradle
+    prebuild: sed -i 's/21\.3\.6528147/22.1.7171670/g' build.gradle
     scandelete:
       - .
-    ndk: r22
+    ndk: r22b
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags