From 90ffcbb66c806adba3625dcab8ab15ca8683a568 Mon Sep 17 00:00:00 2001
From: Licaon_Kter <licaon.kter@protonmail.com>
Date: Tue, 5 Sep 2023 13:44:17 +0000
Subject: [PATCH] yubioath - java17, bump Flutter, scan deps

---
 metadata/com.yubico.yubioath.yml | 48 ++++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/metadata/com.yubico.yubioath.yml b/metadata/com.yubico.yubioath.yml
index 3592f0e7e6..e08aed82cd 100644
--- a/metadata/com.yubico.yubioath.yml
+++ b/metadata/com.yubico.yubioath.yml
@@ -363,49 +363,79 @@ Builds:
   - versionName: 6.3.0
     versionCode: 603001
     commit: 9467d9a4a03df483c938f7de96fb661a81568d39
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a    
     output: build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
     srclibs:
-      - flutter@3.7.11
+      - flutter@3.13.2
     rm:
       - linux
       - macos
       - test
       - windows
-    prebuild: sed -i -e '/gms/d' android/{app/build.gradle,build.gradle}
-    build:
+    prebuild:
+      - sed -i -e '/gms/d' android/{app/build.gradle,build.gradle}
+      - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter config --no-analytics
+      - $$flutter$$/bin/flutter pub get
+    scandelete:
+      - .pub-cache
+    build:
+      - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform="android-arm"
 
   - versionName: 6.3.0
     versionCode: 603002
     commit: 9467d9a4a03df483c938f7de96fb661a81568d39
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     output: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
     srclibs:
-      - flutter@3.7.11
+      - flutter@3.13.2
     rm:
       - linux
       - macos
       - test
       - windows
-    prebuild: sed -i -e '/gms/d' android/{app/build.gradle,build.gradle}
-    build:
+    prebuild:
+      - sed -i -e '/gms/d' android/{app/build.gradle,build.gradle}
+      - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter config --no-analytics
+      - $$flutter$$/bin/flutter pub get
+    scandelete:
+      - .pub-cache
+    build:
+      - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform="android-arm64"
 
   - versionName: 6.3.0
     versionCode: 603004
     commit: 9467d9a4a03df483c938f7de96fb661a81568d39
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     output: build/app/outputs/flutter-apk/app-x86_64-release.apk
     srclibs:
-      - flutter@3.7.11
+      - flutter@3.13.2
     rm:
       - linux
       - macos
       - test
       - windows
-    prebuild: sed -i -e '/gms/d' android/{app/build.gradle,build.gradle}
-    build:
+    prebuild:
+      - sed -i -e '/gms/d' android/{app/build.gradle,build.gradle}
+      - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter config --no-analytics
+      - $$flutter$$/bin/flutter pub get
+    scandelete:
+      - .pub-cache
+    build:
+      - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform="android-x64"
 
 AutoUpdateMode: Version