From b133a2040bc552b48f948a4ffcf6001331eed7a3 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Fri, 2 Dec 2022 11:29:14 +0800
Subject: [PATCH] misc fixes

---
 metadata/com.asdoi.gymwen.yml |  1 +
 metadata/im.nfc.nfsee.yml     | 54 +++++++++++++++++++++--------------
 2 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/metadata/com.asdoi.gymwen.yml b/metadata/com.asdoi.gymwen.yml
index 7ad872baeb..048cb645c1 100644
--- a/metadata/com.asdoi.gymwen.yml
+++ b/metadata/com.asdoi.gymwen.yml
@@ -128,6 +128,7 @@ Builds:
       - yes
     rm:
       - releases/GymWenApp.zip
+    prebuild: sed -i -e '/android {/a lintOptions{abortOnError false}' build.gradle
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
diff --git a/metadata/im.nfc.nfsee.yml b/metadata/im.nfc.nfsee.yml
index a3e7195b11..df720af997 100644
--- a/metadata/im.nfc.nfsee.yml
+++ b/metadata/im.nfc.nfsee.yml
@@ -14,54 +14,66 @@ Repo: https://github.com/nfcim/nfsee
 Builds:
   - versionName: 2.3.0
     versionCode: 203011
-    disable: waiting for reproducible build
     commit: v2.3.0+20301
     submodules: true
     output: build/app/outputs/flutter-apk/app-x86_64-release.apk
     rm:
       - ios
-    scanignore:
-      - .flutter/packages/flutter_tools/gradle/flutter.gradle
-    scandelete:
-      - .flutter
-    build:
+    prebuild:
+      - export PUB_CACHE=$(pwd)/.pub-cache
       - .flutter/bin/flutter config --no-analytics
       - .flutter/bin/flutter pub get
-      - .flutter/bin/flutter build apk --release --verbose --split-per-abi --target-platform="android-x64"
+    scanignore:
+      - .flutter/packages/flutter_tools/gradle/flutter.gradle
+      - .flutter/bin/cache
+    scandelete:
+      - .flutter
+      - .pub-cache
+    build:
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - .flutter/bin/flutter build apk --release --split-per-abi --target-platform="android-x64"
 
   - versionName: 2.3.0
     versionCode: 203012
-    disable: waiting for reproducible build
     commit: v2.3.0+20301
     submodules: true
     output: build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
     rm:
       - ios
-    scanignore:
-      - .flutter/packages/flutter_tools/gradle/flutter.gradle
-    scandelete:
-      - .flutter
-    build:
+    prebuild:
+      - export PUB_CACHE=$(pwd)/.pub-cache
       - .flutter/bin/flutter config --no-analytics
       - .flutter/bin/flutter pub get
-      - .flutter/bin/flutter build apk --release --verbose --split-per-abi --target-platform="android-arm"
+    scanignore:
+      - .flutter/packages/flutter_tools/gradle/flutter.gradle
+      - .flutter/bin/cache
+    scandelete:
+      - .flutter
+      - .pub-cache
+    build:
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - .flutter/bin/flutter build apk --release --split-per-abi --target-platform="android-arm"
 
   - versionName: 2.3.0
     versionCode: 203013
-    disable: waiting for reproducible build
     commit: v2.3.0+20301
     submodules: true
     output: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
     rm:
       - ios
-    scanignore:
-      - .flutter/packages/flutter_tools/gradle/flutter.gradle
-    scandelete:
-      - .flutter
-    build:
+    prebuild:
+      - export PUB_CACHE=$(pwd)/.pub-cache
       - .flutter/bin/flutter config --no-analytics
       - .flutter/bin/flutter pub get
-      - .flutter/bin/flutter build apk --release --verbose --split-per-abi --target-platform="android-arm64"
+    scanignore:
+      - .flutter/packages/flutter_tools/gradle/flutter.gradle
+      - .flutter/bin/cache
+    scandelete:
+      - .flutter
+      - .pub-cache
+    build:
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - .flutter/bin/flutter build apk --release --split-per-abi --target-platform="android-arm64"
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags