build: patch tauri with its git repo to include unreleased fix for ta…

…uri-apps/tauri#11171

Cargo.toml

@@ -41,3 +41,9 @@ path = "dnas/relay/zomes/integrity/relay"
 edition = "2021"
 rust-version = "1.74.0"
 version = "0.5.0-beta"
+
+
+[patch.crates-io]
+# Patch tauri with unreleased fix for https://github.com/tauri-apps/tauri/issues/11171
+tauri = { git = "https://github.com/tauri-apps/tauri.git", rev = "4a2d51a73adc2005701e801c0b7a41ca2e135f8b" }
+tauri-build = { git = "https://github.com/tauri-apps/tauri.git", rev = "4a2d51a73adc2005701e801c0b7a41ca2e135f8b" }

package.json

@@ -23,8 +23,8 @@
     "build:happ": "npm run build:zomes && hc app pack workdir --recursive",
     "build:zomes": "CARGO_TARGET_DIR=target cargo build --release --target wasm32-unknown-unknown --workspace --exclude volla_messages",
     "local-services": "hc run-local-services --bootstrap-interface $INTERNAL_IP --bootstrap-port $BOOTSTRAP_PORT --signal-interfaces $INTERNAL_IP --signal-port $SIGNAL_PORT",
-    "network:android": "npm run build:happ && BOOTSTRAP_PORT=$(port) SIGNAL_PORT=$(port) INTERNAL_IP=$(internal-ip --ipv4) concurrently -k \"npm run local-services\" \"UI_PORT=1420 npm run -w ui start\" \"npm run tauri dev\" \"npm run tauri android dev\"",
-    "start:android": "npm run build:happ && BOOTSTRAP_PORT=$(port) SIGNAL_PORT=$(port) INTERNAL_IP=$(internal-ip --ipv4) concurrently -k \"npm run local-services\" \"UI_PORT=1420 npm run -w ui start\" \"npm run tauri android dev\"",
+    "network:android": "npm run build:happ && TAURI_ANDROID_PACKAGE_UNESCAPED='com.volla.messages' BOOTSTRAP_PORT=$(port) SIGNAL_PORT=$(port) INTERNAL_IP=$(internal-ip --ipv4) concurrently -k \"npm run local-services\" \"UI_PORT=1420 npm run -w ui start\" \"npm run tauri android dev\" \"npm run tauri dev\"",
+    "start:android": "npm run build:happ && TAURI_ANDROID_PACKAGE_UNESCAPED='com.volla.messages' BOOTSTRAP_PORT=$(port) SIGNAL_PORT=$(port) INTERNAL_IP=$(internal-ip --ipv4) concurrently -k \"npm run local-services\" \"UI_PORT=1420 npm run -w ui start\" \"npm run tauri android dev\"",
     "launch": "concurrently-repeat \"npm run tauri dev\" $AGENTS",
     "tauri": "tauri"
   },

src-tauri/gen/android/buildSrc/src/main/java/com/volla/messages/kotlin/BuildTask.kt

@@ -16,7 +16,7 @@ open class BuildTask : DefaultTask() {
 
     @TaskAction
     fun assemble() {
-        val executable = """pnpm""";
+        val executable = """npm""";
         try {
             runTauriCli(executable)
         } catch (e: Exception) {
@@ -32,7 +32,7 @@ open class BuildTask : DefaultTask() {
         val rootDirRel = rootDirRel ?: throw GradleException("rootDirRel cannot be null")
         val target = target ?: throw GradleException("target cannot be null")
         val release = release ?: throw GradleException("release cannot be null")
-        val args = listOf("tauri", "android", "android-studio-script");
+        val args = listOf("run", "--", "tauri", "android", "android-studio-script");
 
         project.exec {
             workingDir(File(project.projectDir, rootDirRel))