Skip to content

Commit

Permalink
refactor(cli): synchronize pbxproj and export options, handle cert on…
Browse files Browse the repository at this point in the history
… build (#10669)
  • Loading branch information
lucasfernog authored Aug 21, 2024
1 parent 9bcff3c commit da8c9a7
Show file tree
Hide file tree
Showing 15 changed files with 2,491 additions and 172 deletions.
6 changes: 6 additions & 0 deletions .changes/ios-codesign-on-build.md
Original file line number Diff line number Diff line change
@@ -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`.
6 changes: 6 additions & 0 deletions .changes/synchronize-pbxproj-export-options.md
Original file line number Diff line number Diff line change
@@ -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.
6 changes: 6 additions & 0 deletions .changes/update-pbxproj-codesign.md
Original file line number Diff line number Diff line change
@@ -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.
82 changes: 55 additions & 27 deletions tooling/cli/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion tooling/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ name = "cargo-tauri"
path = "src/main.rs"

[dependencies]
cargo-mobile2 = { version = "0.13.3", default-features = false }
cargo-mobile2 = { version = "0.13.4", default-features = false }
jsonrpsee = { version = "0.24", features = [ "server" ] }
jsonrpsee-core = "0.24"
jsonrpsee-client-transport = { version = "0.24", features = [ "ws" ] }
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions tooling/cli/src/helpers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading

0 comments on commit da8c9a7

Please sign in to comment.