Merge branch 'dev' into fix/mobile-identifier

tauri-apps · Aug 21, 2024 · 003d8e8 · 003d8e8
2 parents 2c1a8dd + da8c9a7
commit 003d8e8
Show file tree

Hide file tree

Showing 17 changed files with 2,468 additions and 146 deletions.
diff --git a/.changes/fix-android-remove-current-script.md b/.changes/fix-android-remove-current-script.md
@@ -0,0 +1,5 @@
+---
+"tauri-utils": patch:bug
+---
+
+Properly remove isolation script on Android.
diff --git a/.changes/ios-codesign-on-build.md b/.changes/ios-codesign-on-build.md
@@ -0,0 +1,6 @@
+---
+"tauri-cli": patch:breaking
+"@tauri-apps/cli": patch:breaking
+---
+
+The `IOS_CERTIFICATE`, `IOS_CERTIFICATE_PASSWORD` and `IOS_MOBILE_PROVISION` environment variables are now read by the `ios build` command instead of `ios init`.
diff --git a/.changes/synchronize-pbxproj-export-options.md b/.changes/synchronize-pbxproj-export-options.md
@@ -0,0 +1,6 @@
+---
+"tauri-cli": patch:bug
+"@tauri-apps/cli": patch:bug
+---
+
+Synchronize Xcode project changes with the ExportOptions.plist file so `ios build` calls can work with code signing changes made in Xcode.
diff --git a/.changes/update-pbxproj-codesign.md b/.changes/update-pbxproj-codesign.md
@@ -0,0 +1,6 @@
+---
+"tauri-cli": patch:enhance
+"@tauri-apps/cli": patch:enhance
+---
+
+Modify both ExportOptions.plist and project.pbxproj to reflect changes for the `IOS_CERTIFICATE`, `IOS_CERTIFICATE_PASSWORD` and `IOS_MOBILE_PROVISION` environment variables.
diff --git a/core/tauri-utils/src/pattern/isolation.js b/core/tauri-utils/src/pattern/isolation.js
@@ -149,6 +149,6 @@
   }
 
   setTimeout(waitUntilReady, readyIntervalMs)
-
-  document.currentScript.remove()
 })()
+
+document.currentScript?.remove()
diff --git a/tooling/cli/Cargo.lock b/tooling/cli/Cargo.lock
diff --git a/tooling/cli/Cargo.toml b/tooling/cli/Cargo.toml
@@ -101,6 +101,10 @@ phf = { version = "0.11", features = ["macros"] }
 walkdir = "2"
 elf = "0.7"
 memchr = "2"
+tempfile = "3"
+
+[dev-dependencies]
+insta = "1"
 
 [target."cfg(windows)".dependencies.windows-sys]
 version = "0.59"

diff --git a/tooling/cli/src/helpers/mod.rs b/tooling/cli/src/helpers/mod.rs
@@ -10,6 +10,8 @@ pub mod flock;
 pub mod framework;
 pub mod fs;
 pub mod npm;
+#[cfg(target_os = "macos")]
+pub mod pbxproj;
 pub mod plugins;
 pub mod prompts;
 pub mod template;