From 4a28b52bcee0cc8f600e70695594def3a41ec8f7 Mon Sep 17 00:00:00 2001
From: linsui <2873532-linsui@users.noreply.gitlab.com>
Date: Mon, 9 Sep 2024 09:31:56 +0800
Subject: [PATCH] misc fixes

---
 metadata/app.alextran.immich.yml | 80 --------------------------
 metadata/chat.delta.lite.yml     | 96 +++-----------------------------
 2 files changed, 8 insertions(+), 168 deletions(-)

diff --git a/metadata/app.alextran.immich.yml b/metadata/app.alextran.immich.yml
index 7f2d849137..84f5f9d5b9 100644
--- a/metadata/app.alextran.immich.yml
+++ b/metadata/app.alextran.immich.yml
@@ -3100,86 +3100,6 @@ Builds:
       - $$flutter$$/bin/flutter build apk --release
     ndk: 25.2.9519653
 
-  - versionName: 1.113.0
-    versionCode: 155
-    commit: cc88cbb456e6f3e1c77680cebde4806ed44a8915
-    subdir: mobile
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y gcc-multilib libc-dev make
-    output: build/app/outputs/flutter-apk/app-release.apk
-    srclibs:
-      - flutter@stable
-      - rustup@1.25.2
-    rm:
-      - design
-      - docker
-      - machine-learning
-      - mobile/ios
-      - server
-      - web
-    prebuild:
-      - export flutterVersion=$(sed -n -E "s/.*flutter:\s([0-9.]+)/\1/p" pubspec.yaml)
-      - '[[ $flutterVersion ]] || exit 1'
-      - pushd $$flutter$$
-      - git checkout -f $flutterVersion
-      - popd
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - sed -i -e "s/^\#f//" pubspec.yaml
-      - sed -i -e 's/^\/\/f //' android/app/build.gradle
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter pub get
-    scandelete:
-      - mobile/.pub-cache
-    build:
-      - $$rustup$$/rustup-init.sh -y
-      - source $HOME/.cargo/env
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - bash ./scripts/fdroid_build_isar.sh
-      - $$flutter$$/bin/flutter build apk --release
-    ndk: 25.2.9519653
-
-  - versionName: 1.113.1
-    versionCode: 157
-    commit: 48da4c931773edae26c8ab13b17f399003268a92
-    subdir: mobile
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y gcc-multilib libc-dev make
-    output: build/app/outputs/flutter-apk/app-release.apk
-    srclibs:
-      - flutter@stable
-      - rustup@1.25.2
-    rm:
-      - design
-      - docker
-      - machine-learning
-      - mobile/ios
-      - server
-      - web
-    prebuild:
-      - export flutterVersion=$(sed -n -E "s/.*flutter:\s([0-9.]+)/\1/p" pubspec.yaml)
-      - '[[ $flutterVersion ]] || exit 1'
-      - pushd $$flutter$$
-      - git checkout -f $flutterVersion
-      - popd
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - sed -i -e "s/^\#f//" pubspec.yaml
-      - sed -i -e 's/^\/\/f //' android/app/build.gradle
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter pub get
-    scandelete:
-      - mobile/.pub-cache
-    build:
-      - $$rustup$$/rustup-init.sh -y
-      - source $HOME/.cargo/env
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - bash ./scripts/fdroid_build_isar.sh
-      - $$flutter$$/bin/flutter build apk --release
-    ndk: 25.2.9519653
-
   - versionName: 1.114.0
     versionCode: 158
     disable: https://github.com/immich-app/immich/issues/12425
diff --git a/metadata/chat.delta.lite.yml b/metadata/chat.delta.lite.yml
index 39f2a63172..7b7e203907 100644
--- a/metadata/chat.delta.lite.yml
+++ b/metadata/chat.delta.lite.yml
@@ -12,94 +12,6 @@ Repo: https://github.com/ArcaneChat/android.git
 Binaries: https://github.com/ArcaneChat/android/releases/download/v%v/ArcaneChat-foss-arm64-v8a-%v.apk
 
 Builds:
-  - versionName: 1.46.17
-    versionCode: 300006891
-    commit: 6fa725e8ff005c38460b977005288e0e2f131913
-    timeout: 20000
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y make g++ cmake
-    gradle:
-      - foss
-    binary: https://github.com/ArcaneChat/android/releases/download/v%v/ArcaneChat-foss-armeabi-v7a-%v.apk
-    srclibs:
-      - rustup@1.25.1
-    build:
-      - $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
-        --target armv7-linux-androideabi
-      - source $HOME/.cargo/env
-      - scripts/ndk-make.sh armeabi-v7a
-    ndk: r23c
-    gradleprops:
-      - ABI_FILTER=armeabi-v7a
-
-  - versionName: 1.46.17
-    versionCode: 300006892
-    commit: 6fa725e8ff005c38460b977005288e0e2f131913
-    timeout: 20000
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y make g++ cmake
-    gradle:
-      - foss
-    binary: https://github.com/ArcaneChat/android/releases/download/v%v/ArcaneChat-foss-arm64-v8a-%v.apk
-    srclibs:
-      - rustup@1.25.1
-    build:
-      - $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
-        --target aarch64-linux-android
-      - source $HOME/.cargo/env
-      - scripts/ndk-make.sh arm64-v8a
-    ndk: r23c
-    gradleprops:
-      - ABI_FILTER=arm64-v8a
-
-  - versionName: 1.46.17
-    versionCode: 300006893
-    commit: 6fa725e8ff005c38460b977005288e0e2f131913
-    timeout: 20000
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y make g++ cmake
-    gradle:
-      - foss
-    binary: https://github.com/ArcaneChat/android/releases/download/v%v/ArcaneChat-foss-x86-%v.apk
-    srclibs:
-      - rustup@1.25.1
-    build:
-      - $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
-        --target i686-linux-android
-      - source $HOME/.cargo/env
-      - scripts/ndk-make.sh x86
-    ndk: r23c
-    gradleprops:
-      - ABI_FILTER=x86
-
-  - versionName: 1.46.17
-    versionCode: 300006894
-    commit: 6fa725e8ff005c38460b977005288e0e2f131913
-    timeout: 20000
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y make g++ cmake
-    gradle:
-      - foss
-    binary: https://github.com/ArcaneChat/android/releases/download/v%v/ArcaneChat-foss-x86_64-%v.apk
-    srclibs:
-      - rustup@1.25.1
-    build:
-      - $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
-        --target x86_64-linux-android
-      - source $HOME/.cargo/env
-      - scripts/ndk-make.sh x86_64
-    ndk: r23c
-    gradleprops:
-      - ABI_FILTER=x86_64
-
   - versionName: 1.46.18
     versionCode: 300006901
     commit: 6efe5403109af7363d31f049afae64cbc2401c1e
@@ -113,6 +25,8 @@ Builds:
     binary: https://github.com/ArcaneChat/android/releases/download/v%v/ArcaneChat-foss-armeabi-v7a-%v.apk
     srclibs:
       - rustup@1.25.1
+    scandelete:
+      - jni/deltachat-core-rust
     build:
       - $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
         --target armv7-linux-androideabi
@@ -135,6 +49,8 @@ Builds:
     binary: https://github.com/ArcaneChat/android/releases/download/v%v/ArcaneChat-foss-arm64-v8a-%v.apk
     srclibs:
       - rustup@1.25.1
+    scandelete:
+      - jni/deltachat-core-rust
     build:
       - $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
         --target aarch64-linux-android
@@ -157,6 +73,8 @@ Builds:
     binary: https://github.com/ArcaneChat/android/releases/download/v%v/ArcaneChat-foss-x86-%v.apk
     srclibs:
       - rustup@1.25.1
+    scandelete:
+      - jni/deltachat-core-rust
     build:
       - $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
         --target i686-linux-android
@@ -179,6 +97,8 @@ Builds:
     binary: https://github.com/ArcaneChat/android/releases/download/v%v/ArcaneChat-foss-x86_64-%v.apk
     srclibs:
       - rustup@1.25.1
+    scandelete:
+      - jni/deltachat-core-rust
     build:
       - $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
         --target x86_64-linux-android