From 09fe055eada97356ede71cdf1ee00acde51f4feb Mon Sep 17 00:00:00 2001
From: linsui <2873532-linsui@users.noreply.gitlab.com>
Date: Sat, 29 Jun 2024 16:44:10 +0800
Subject: [PATCH] misc fixes

---
 metadata/be.digitalia.fosdem.yml          |  2 +-
 metadata/com.bithack.principia.yml        |  4 ++--
 metadata/de.keplerchemnitz.kepler_app.yml |  1 +
 metadata/de.tutao.tutanota.yml            |  8 +++++++-
 metadata/dev.theolm.wwc.yml               | 18 +++++-------------
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/metadata/be.digitalia.fosdem.yml b/metadata/be.digitalia.fosdem.yml
index dbde6f815d..e0cbf717c9 100644
--- a/metadata/be.digitalia.fosdem.yml
+++ b/metadata/be.digitalia.fosdem.yml
@@ -321,7 +321,7 @@ Builds:
     subdir: app
     sudo:
       - apt-get update
-      - apt-get install -y g++ openjdk-17-jdk-headless
+      - apt-get install -y g++
     gradle:
       - yes
 
diff --git a/metadata/com.bithack.principia.yml b/metadata/com.bithack.principia.yml
index 67be6b56c4..e1ccfe911f 100644
--- a/metadata/com.bithack.principia.yml
+++ b/metadata/com.bithack.principia.yml
@@ -49,7 +49,7 @@ Builds:
     gradle:
       - yes
     srclibs:
-      - principia-android-deps@3a526799a5c04c49446e46d4a3279563a91a0f91
+      - principia-android-deps@7d3aeee7302af55884c5072b172c986ba5bdf44b
     prebuild: sed -i -e '/preBuild.dependsOn getDeps/d' build.gradle
     scandelete:
       - testmaps/
@@ -60,7 +60,7 @@ Builds:
       - ./build.sh --all x86_64
       - popd
       - mv $$principia-android-deps$$/deps ../
-    ndk: r23c
+    ndk: r26c
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
diff --git a/metadata/de.keplerchemnitz.kepler_app.yml b/metadata/de.keplerchemnitz.kepler_app.yml
index 37d50979fd..1edd87ecff 100644
--- a/metadata/de.keplerchemnitz.kepler_app.yml
+++ b/metadata/de.keplerchemnitz.kepler_app.yml
@@ -238,6 +238,7 @@ Builds:
       - mkdir -p /home/runner
       - chown vagrant /home/runner
     output: build/app/outputs/flutter-apk/app-release.apk
+    binary: https://github.com/AntonioAlbt/kepler_app/releases/download/%v/app-release.apk
     srclibs:
       - flutter@stable
     prebuild:
diff --git a/metadata/de.tutao.tutanota.yml b/metadata/de.tutao.tutanota.yml
index 47e0ada71e..6a3244bdf9 100644
--- a/metadata/de.tutao.tutanota.yml
+++ b/metadata/de.tutao.tutanota.yml
@@ -3253,7 +3253,6 @@ Builds:
 
   - versionName: 232.240626.0
     versionCode: 396355
-    disable: https://github.com/tutao/tutanota/issues/6364#issuecomment-2196335834
     commit: 7b280436c39c5b0f315a98cb0811ba5c1e9f3cd1
     subdir: app-android/app
     submodules: true
@@ -3267,6 +3266,8 @@ Builds:
       - sysctl fs.inotify.max_user_watches=524288 || true
     gradle:
       - fdroid
+    srclibs:
+      - rustup@1.27.1
     rm:
       - app-ios
     prebuild:
@@ -3276,6 +3277,11 @@ Builds:
       - npm run build-packages
       - node --max-old-space-size=4096 webapp prod
       - node buildSrc/prepareMobileBuild.js dist
+      - $$rustup$$/rustup-init.sh -y --default-toolchain 1.79.0 --target aarch64-linux-android
+        armv7-linux-androideabi x86_64-linux-android i686-linux-android
+      - source $HOME/.cargo/env
+      - sed -i -e "/cargo {/a cargoCommand = \"$(which cargo)\"\nrustcCommand = \"$(which
+        rustc)\"" -e "s|\"cargo\"|\"$(which cargo)\"|" tuta-sdk/android/sdk/build.gradle.kts
     scandelete:
       - node_modules/**
 
diff --git a/metadata/dev.theolm.wwc.yml b/metadata/dev.theolm.wwc.yml
index f41393404b..2e0e6b5f5a 100644
--- a/metadata/dev.theolm.wwc.yml
+++ b/metadata/dev.theolm.wwc.yml
@@ -47,17 +47,9 @@ Builds:
       - yes
     binary: https://github.com/theolm/WhatsAppNoContact/releases/download/v%v/app-release.apk
 
-  - versionName: 0.7.0
-    versionCode: 8
-    commit: a81dcfe8f8ad7da6c84a2c29fcebe99fd0c01fba
-    subdir: app
-    gradle:
-      - yes
-    binary: https://github.com/theolm/WhatsAppNoContact/releases/download/v%v/app-release.apk
-
-  - versionName: v0.7.1
-    versionCode: 9
-    commit: 2b12c0382ebe9af2c2aec0479470116bb9e71d87
+  - versionName: v0.8.0
+    versionCode: 10
+    commit: 9cc2366464a4d77cd659a0379f59fba97c58d035
     subdir: app
     gradle:
       - yes
@@ -69,5 +61,5 @@ AllowedAPKSigningKeys: a51bcf4492e81eb4d522c06ca9a0d90ab60be70a1376da7b169f23d38
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
 UpdateCheckData: app/build.gradle.kts|versionCode\s=\s(\d+)|.|versionName\s=\s"(.+)"
-CurrentVersion: v0.7.1
-CurrentVersionCode: 9
+CurrentVersion: v0.8.0
+CurrentVersionCode: 10