From 8856ed274c0c6494310a7e997ad76f86cc1f0625 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Mon, 14 Jun 2021 12:07:52 +0800
Subject: [PATCH] misc fixes

---
 metadata/app.crossword.yourealwaysbe.forkyz.yml | 12 ++++--------
 metadata/com.github.webierta.call_counter.yml   |  2 +-
 metadata/com.leinardi.ubuntucountdownwidget.yml |  4 ++--
 metadata/dev.pesic.rpncalc.yml                  |  6 ++----
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/metadata/app.crossword.yourealwaysbe.forkyz.yml b/metadata/app.crossword.yourealwaysbe.forkyz.yml
index a819de540d..075eedde97 100644
--- a/metadata/app.crossword.yourealwaysbe.forkyz.yml
+++ b/metadata/app.crossword.yourealwaysbe.forkyz.yml
@@ -50,15 +50,11 @@ Builds:
     subdir: app
     gradle:
       - yes
+    rm:
+      - puzlib/src/test
     scanignore:
-      - gfx
-      - app/src/main/assets/icons1.ttf
-      - app/src/main/assets/icons4.ttf
-      - puzlib/src/test/resources/puz_110523margulies.puz
-      - puzlib/src/test/resources/2010-7-19-NewYorkTimes.puz
-      - puzlib/src/test/resources/2010-7-4-LosAngelesTimes.puz
-      - puzlib/src/test/resources/puz_110131aniston.puz
-      - puzlib/src/test/resources/test.puz
+      - gfx/*.icns
+      - gfx/*.opacity
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
diff --git a/metadata/com.github.webierta.call_counter.yml b/metadata/com.github.webierta.call_counter.yml
index f46a0d010b..dc0f0a88c0 100644
--- a/metadata/com.github.webierta.call_counter.yml
+++ b/metadata/com.github.webierta.call_counter.yml
@@ -27,7 +27,7 @@ Builds:
     commit: v2.0.0
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
-      - flutter@1.22.5
+      - flutter@2.2.2
     build:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter build apk
diff --git a/metadata/com.leinardi.ubuntucountdownwidget.yml b/metadata/com.leinardi.ubuntucountdownwidget.yml
index ffc6301aac..3aedae969e 100644
--- a/metadata/com.leinardi.ubuntucountdownwidget.yml
+++ b/metadata/com.leinardi.ubuntucountdownwidget.yml
@@ -18,7 +18,7 @@ Builds:
     gradle:
       - yes
 
-  - versionName: v21.10.3
+  - versionName: v21.10.2
     versionCode: 267
     commit: v21.10.2
     subdir: app
@@ -28,5 +28,5 @@ Builds:
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^v.*$
 UpdateCheckData: version.txt|\+(\d+)|.|(.+)\+
-CurrentVersion: v21.10.3
+CurrentVersion: v21.10.2
 CurrentVersionCode: 267
diff --git a/metadata/dev.pesic.rpncalc.yml b/metadata/dev.pesic.rpncalc.yml
index 9ed499bb09..7945bddcec 100644
--- a/metadata/dev.pesic.rpncalc.yml
+++ b/metadata/dev.pesic.rpncalc.yml
@@ -43,11 +43,9 @@ Builds:
   - versionName: 1.2.0
     versionCode: 7
     commit: v1.2.0
-    output: build/app/outputs/apk/release/app-release.apk
+    output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
-      - flutter@1.22.4
-    prebuild: echo 'android.applicationVariants.all { variant -> variant.outputs.all
-        { output -> outputFileName = "app-${output.baseName}.apk" } }' >> android/app/build.gradle
+      - flutter@2.2.2
     build:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter packages pub get