From 9fe3462ef80373bce74f0e5ab6d3931df8bea040 Mon Sep 17 00:00:00 2001
From: linsui <2873532-linsui@users.noreply.gitlab.com>
Date: Thu, 11 Jul 2024 14:28:36 +0800
Subject: [PATCH] misc fixes

---
 metadata/business.braid.f_wallet.yml         | 44 --------------------
 metadata/com.artifex.mupdf.mini.app.yml      |  2 +-
 metadata/com.artifex.mupdf.viewer.app.yml    |  2 +-
 metadata/com.darkempire78.opencalculator.yml | 13 ++----
 metadata/com.fr3ts0n.ecu.gui.androbd.yml     |  5 ++-
 5 files changed, 9 insertions(+), 57 deletions(-)

diff --git a/metadata/business.braid.f_wallet.yml b/metadata/business.braid.f_wallet.yml
index 6f7462ac3b..1a846ea1cc 100644
--- a/metadata/business.braid.f_wallet.yml
+++ b/metadata/business.braid.f_wallet.yml
@@ -240,50 +240,6 @@ Builds:
       - rm -rf /tmp/build
     ndk: r23b
 
-  - versionName: 1.1.7
-    versionCode: 117
-    commit: de10c06e76359feaf404db9c55799a3902673545
-    output: build/app/outputs/flutter-apk/app-release.apk
-    srclibs:
-      - flutter@stable
-    rm:
-      - ios
-      - linux
-      - macos
-      - web
-      - windows
-    prebuild:
-      - export FLUTTER_VERSION="$(cat flutter_version)"
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - pushd $$flutter$$
-      - git checkout -f $FLUTTER_VERSION
-      - popd
-      - cd ..
-      - rm -rf /tmp/build
-      - mv business.braid.f_wallet /tmp/build
-      - pushd /tmp/build
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter pub get
-      - popd
-      - cp -pr /tmp/build/* business.braid.f_wallet
-      - rm -rf /tmp/build
-    scandelete:
-      - .pub-cache
-    build:
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - cd ..
-      - rm -rf /tmp/build
-      - mv business.braid.f_wallet /tmp/build
-      - pushd /tmp/build
-      - export APP_VERSION="v$(cat pubspec.yaml | grep version | awk '{ print $2 }'
-        | cut -f1 -d "+")"
-      - $$flutter$$/bin/flutter gen-l10n
-      - $$flutter$$/bin/flutter build apk --dart-define=FWALLET_IS_STABLE=true --dart-define=FWALLET_VERSION="$APP_VERSION"
-      - popd
-      - cp -pr /tmp/build/* business.braid.f_wallet
-      - rm -rf /tmp/build
-    ndk: r23b
-
   - versionName: 1.1.8
     versionCode: 118
     commit: 0af55b2efb43738139af8aa3f6b0c53a870042e1
diff --git a/metadata/com.artifex.mupdf.mini.app.yml b/metadata/com.artifex.mupdf.mini.app.yml
index dc4b886d67..4ffdcf18c4 100644
--- a/metadata/com.artifex.mupdf.mini.app.yml
+++ b/metadata/com.artifex.mupdf.mini.app.yml
@@ -462,7 +462,7 @@ Builds:
     scandelete:
       - jni/libmupdf/thirdparty
     build: make -C ../jni/libmupdf generate
-    ndk: r23c
+    ndk: r26c
 
 MaintainerNotes: |-
   Upstream builds separate APKs for all target architectures supported by NDK
diff --git a/metadata/com.artifex.mupdf.viewer.app.yml b/metadata/com.artifex.mupdf.viewer.app.yml
index 0974366689..293561840d 100644
--- a/metadata/com.artifex.mupdf.viewer.app.yml
+++ b/metadata/com.artifex.mupdf.viewer.app.yml
@@ -468,7 +468,7 @@ Builds:
     scandelete:
       - jni/libmupdf/thirdparty
     build: make -C ../jni/libmupdf generate
-    ndk: r23c
+    ndk: r26c
 
 MaintainerNotes: |-
   Upstream builds separate APKs for all target architectures supported by NDK
diff --git a/metadata/com.darkempire78.opencalculator.yml b/metadata/com.darkempire78.opencalculator.yml
index 4d07e60ead..0a01c7ed41 100644
--- a/metadata/com.darkempire78.opencalculator.yml
+++ b/metadata/com.darkempire78.opencalculator.yml
@@ -268,14 +268,7 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 3.1.0-beta1
-    versionCode: 47
-    commit: e3aef1b9453a1dfc765d5c4c4014e5291224d9a7
-    subdir: app
-    gradle:
-      - yes
-
 AutoUpdateMode: Version
-UpdateCheckMode: Tags
-CurrentVersion: 3.1.0-beta1
-CurrentVersionCode: 47
+UpdateCheckMode: Tags ^v[\d.]+$
+CurrentVersion: 3.1.0
+CurrentVersionCode: 46
diff --git a/metadata/com.fr3ts0n.ecu.gui.androbd.yml b/metadata/com.fr3ts0n.ecu.gui.androbd.yml
index 073e3a4146..4af80b59fe 100644
--- a/metadata/com.fr3ts0n.ecu.gui.androbd.yml
+++ b/metadata/com.fr3ts0n.ecu.gui.androbd.yml
@@ -1408,9 +1408,12 @@ Builds:
     rm:
       - androbd/libs/*.jar
       - logo/src/*.zip
+    prebuild:
+      - sed -i -e 's/1.6/1.8/g' $$AChartEngineFr3ts0n$$/pom.xml
+      - sed -i -e '/usb-serial-for-android/s/3.3.0/3.3.1/' build.gradle
     build:
       - pushd $$AChartEngineFr3ts0n$$
-      - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
+      - export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64/
       - mvn package
       - popd
       - cp $$AChartEngineFr3ts0n$$/target/achartengine-1.2.0.jar libs/