From 9b99ebab17d6a043d82a7aeecfb76c56a995c287 Mon Sep 17 00:00:00 2001 From: Guillaume M <3082385+mrguiman@users.noreply.github.com> Date: Mon, 19 Aug 2024 17:36:48 +0200 Subject: [PATCH] fix(cli): do not force architecture when building and archiving iOS app (#10431) * feat(ios): add a new cli option to dev to use project archs Add a new option to instruct cargo-mobile2 to use architectures configured in the project for building * update cargo-mobile2, add change file * fix change file [skip ci] --------- Co-authored-by: Lucas Nogueira --- .changes/fix-xcodebuild-arch.md | 7 +++++++ tooling/cli/Cargo.lock | 4 ++-- tooling/cli/Cargo.toml | 2 +- tooling/cli/src/mobile/ios/dev.rs | 1 + 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 .changes/fix-xcodebuild-arch.md diff --git a/.changes/fix-xcodebuild-arch.md b/.changes/fix-xcodebuild-arch.md new file mode 100644 index 000000000..59a54a96d --- /dev/null +++ b/.changes/fix-xcodebuild-arch.md @@ -0,0 +1,7 @@ +--- +'tauri-cli': 'patch:bug' +'@tauri-apps/cli': 'patch:bug' +--- + +Do not include the target arch when building and archiving the iOS application, +which makes Xcode project modifications more flexible. diff --git a/tooling/cli/Cargo.lock b/tooling/cli/Cargo.lock index 9f033f281..a4c8daa34 100644 --- a/tooling/cli/Cargo.lock +++ b/tooling/cli/Cargo.lock @@ -557,9 +557,9 @@ dependencies = [ [[package]] name = "cargo-mobile2" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebaedf7b7e292b7f41f892f5c96ee15544e21814e89d0b6b8dc06740a69dabe5" +checksum = "6b933d7440e2fd78462ae586f959883710837c6145ddcd501e8adcf4cb57b2cb" dependencies = [ "colored", "core-foundation", diff --git a/tooling/cli/Cargo.toml b/tooling/cli/Cargo.toml index 524ac9346..1deb58c07 100644 --- a/tooling/cli/Cargo.toml +++ b/tooling/cli/Cargo.toml @@ -39,7 +39,7 @@ name = "cargo-tauri" path = "src/main.rs" [dependencies] -cargo-mobile2 = { version = "0.13.2", default-features = false } +cargo-mobile2 = { version = "0.13.3", default-features = false } jsonrpsee = { version = "0.24", features = [ "server" ] } jsonrpsee-core = "0.24" jsonrpsee-client-transport = { version = "0.24", features = [ "ws" ] } diff --git a/tooling/cli/src/mobile/ios/dev.rs b/tooling/cli/src/mobile/ios/dev.rs index 80ff552c9..a3ee3b6c8 100644 --- a/tooling/cli/src/mobile/ios/dev.rs +++ b/tooling/cli/src/mobile/ios/dev.rs @@ -166,6 +166,7 @@ fn run_command(options: Options, noise_level: NoiseLevel) -> Result<()> { dev_options.features.as_ref(), &Default::default(), ); + (interface, app, config) };