use patched tauri-cli

.github/workflows/release.yml

@@ -156,6 +156,8 @@ jobs:
         if: startsWith(matrix.target, 'android')
         shell: bash
         run: |
+          # TODO: Remove this once patches are merged
+          cargo install --git https://github.com/mariotaku/tauri.git --branch devman tauri-cli
           npm run tauri android init
           npm run tauri android build -- --aab
           if [ -n "$AAB_SIGNING_KEYSTORE" ]; then

Cargo.toml

@@ -7,4 +7,5 @@ members = [
 [patch.crates-io]
 cc = { git = "https://github.com/mariotaku/cc-rs.git", rev = "01a3414" }
 r2d2 = { git = "https://github.com/mariotaku/r2d2.git", rev = "aaa2a2b" }
+# TODO: remove this patch when this branch is merged
 tauri-build = { git = "https://github.com/mariotaku/tauri.git", branch = "feature/android-version-info" }

scripts/tauri-wrapper.js

@@ -68,8 +68,28 @@ async function run() {
   if (process.platform === 'win32' && process.argv[2] === 'android') {
     await prepareOpenSSL();
   }
+  const hasCargoTauri = await (new Promise((resolve, reject) => {
+    child_process.exec('cargo tauri -V', (err, stdout) => {
+      if (err) {
+        reject(new Error('Tauri is not installed'));
+      } else {
+        resolve();
+      }
+    });
+  }).then(() => true).catch(() => false));
+  if (hasCargoTauri) {
+    return new Promise((resolve, reject) => {
+      const child = child_process.spawn('cargo', ['tauri', ...process.argv.slice(2)], {stdio: 'inherit'});
+      child.on('exit', (code) => {
+        if (code === 0) {
+          resolve();
+        } else {
+          reject(new Error(`Tauri CLI exited with code ${code}`));
+        }
+      });
+    });
+  }
   await cli.run(process.argv.slice(2), null);
-
 }
 
 run().then(async () => {