Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changes/install-ios-platform.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@tauri-apps/cli": minor:enhance
"tauri-cli": minor:enhance
---

Prompt to install the iOS platform if it isn't installed yet.
6 changes: 5 additions & 1 deletion crates/tauri-cli/src/mobile/ios/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use crate::{
flock,
},
interface::{AppInterface, Interface, Options as InterfaceOptions},
mobile::{write_options, CliOptions},
mobile::{ios::ensure_ios_runtime_installed, write_options, CliOptions},
ConfigValue, Result,
};
use clap::{ArgAction, Parser, ValueEnum};
Expand Down Expand Up @@ -224,6 +224,10 @@ pub fn command(options: Options, noise_level: NoiseLevel) -> Result<()> {

let mut env = env()?;

if !options.open {
ensure_ios_runtime_installed()?;
}

let mut export_options_plist = plist::Dictionary::new();
if let Some(method) = options.export_method {
let xcode_version =
Expand Down
7 changes: 6 additions & 1 deletion crates/tauri-cli/src/mobile/ios/dev.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ use crate::{
},
interface::{AppInterface, Interface, MobileOptions, Options as InterfaceOptions},
mobile::{
use_network_address_for_dev_url, write_options, CliOptions, DevChild, DevHost, DevProcess,
ios::ensure_ios_runtime_installed, use_network_address_for_dev_url, write_options, CliOptions,
DevChild, DevHost, DevProcess,
},
ConfigValue, Result,
};
Expand Down Expand Up @@ -166,6 +167,10 @@ fn run_command(options: Options, noise_level: NoiseLevel) -> Result<()> {
}
};

if device.is_some() {
ensure_ios_runtime_installed()?;
}

let mut dev_options: DevOptions = options.clone().into();
let target_triple = device
.as_ref()
Expand Down
53 changes: 53 additions & 0 deletions crates/tauri-cli/src/mobile/ios/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ use cargo_mobile2::{
util::{prompt, relativize_path},
};
use clap::{Parser, Subcommand};
use serde::Deserialize;
use sublime_fuzzy::best_match;
use tauri_utils::resources::ResourcePaths;

Expand Down Expand Up @@ -325,12 +326,23 @@ fn connected_device_prompt<'a>(env: &'_ Env, target: Option<&str>) -> Result<Dev
device,
device.target().triple,
);

Ok(device)
} else {
Err(anyhow::anyhow!("No connected iOS devices detected"))
}
}

#[derive(Default, Deserialize)]
struct InstalledRuntimesList {
runtimes: Vec<InstalledRuntime>,
}

#[derive(Deserialize)]
struct InstalledRuntime {
name: String,
}

fn simulator_prompt(env: &'_ Env, target: Option<&str>) -> Result<device::Simulator> {
let simulator_list = device::list_simulators(env).map_err(|cause| {
anyhow::anyhow!("Failed to detect connected iOS Simulator devices: {cause}")
Expand Down Expand Up @@ -367,6 +379,19 @@ fn simulator_prompt(env: &'_ Env, target: Option<&str>) -> Result<device::Simula
};
Ok(device)
} else {
log::warn!("No available iOS Simulator detected");
let install_ios = crate::helpers::prompts::confirm(
"Would you like to install the latest iOS runtime?",
Some(false),
)
.unwrap_or_default();
if install_ios {
duct::cmd("xcodebuild", ["-downloadPlatform", "iOS"])
.stdout_file(os_pipe::dup_stdout().unwrap())
.stderr_file(os_pipe::dup_stderr().unwrap())
.run()?;
return simulator_prompt(env, target);
}
Err(anyhow::anyhow!("No available iOS Simulator detected"))
}
}
Expand All @@ -382,6 +407,34 @@ fn device_prompt<'a>(env: &'_ Env, target: Option<&str>) -> Result<Device<'a>> {
}
}

fn ensure_ios_runtime_installed() -> Result<()> {
let installed_platforms_json =
duct::cmd("xcrun", ["simctl", "list", "runtimes", "--json"]).read()?;
let installed_platforms: InstalledRuntimesList =
serde_json::from_str(&installed_platforms_json).unwrap_or_default();
if !installed_platforms
.runtimes
.iter()
.any(|r| r.name.starts_with("iOS"))
{
log::warn!("iOS platform not installed");
let install_ios = crate::helpers::prompts::confirm(
"Would you like to install the latest iOS runtime?",
Some(false),
)
.unwrap_or_default();
if install_ios {
duct::cmd("xcodebuild", ["-downloadPlatform", "iOS"])
.stdout_file(os_pipe::dup_stdout().unwrap())
.stderr_file(os_pipe::dup_stderr().unwrap())
.run()?;
} else {
anyhow::bail!("iOS platform not installed");
}
}
Ok(())
}

fn detect_target_ok<'a>(env: &Env) -> Option<&'a Target<'a>> {
device_prompt(env, None).map(|device| device.target()).ok()
}
Expand Down
Loading