diff --git a/crates/tauri-cli/src/mobile/android/mod.rs b/crates/tauri-cli/src/mobile/android/mod.rs index 002ed73ac..8ea6490d0 100644 --- a/crates/tauri-cli/src/mobile/android/mod.rs +++ b/crates/tauri-cli/src/mobile/android/mod.rs @@ -104,7 +104,6 @@ enum Commands { } pub fn command(cli: Cli, verbosity: u8) -> Result<()> { - let dirs = crate::helpers::app_paths::resolve_dirs(); let noise_level = NoiseLevel::from_occurrences(verbosity as u64); match cli.command { Commands::Init(options) => init_command( @@ -113,7 +112,6 @@ pub fn command(cli: Cli, verbosity: u8) -> Result<()> { false, options.skip_targets_install, options.config, - &dirs, )?, Commands::Dev(options) => dev::command(options, noise_level)?, Commands::Build(options) => build::command(options, noise_level).map(|_| ())?, diff --git a/crates/tauri-cli/src/mobile/init.rs b/crates/tauri-cli/src/mobile/init.rs index 0a7324970..f187b9f12 100644 --- a/crates/tauri-cli/src/mobile/init.rs +++ b/crates/tauri-cli/src/mobile/init.rs @@ -29,8 +29,8 @@ pub fn command( reinstall_deps: bool, skip_targets_install: bool, config: Vec, - dirs: &Dirs, ) -> Result<()> { + let dirs = crate::helpers::app_paths::resolve_dirs(); let wrapper = TextWrapper::default(); exec( @@ -45,14 +45,14 @@ pub fn command( Ok(()) } -pub fn exec( +fn exec( target: Target, wrapper: &TextWrapper, #[allow(unused_variables)] non_interactive: bool, #[allow(unused_variables)] reinstall_deps: bool, skip_targets_install: bool, config: Vec, - dirs: &Dirs, + dirs: Dirs, ) -> Result { let tauri_config = get_tauri_config( target.platform_target(), diff --git a/crates/tauri-cli/src/mobile/ios/build.rs b/crates/tauri-cli/src/mobile/ios/build.rs index 160e0995e..5ad7e58d5 100644 --- a/crates/tauri-cli/src/mobile/ios/build.rs +++ b/crates/tauri-cli/src/mobile/ios/build.rs @@ -167,7 +167,12 @@ pub struct BuiltApplication { options_handle: OptionsHandle, } -pub fn command(options: Options, noise_level: NoiseLevel, dirs: &Dirs) -> Result { +pub fn command(options: Options, noise_level: NoiseLevel) -> Result { + let dirs = crate::helpers::app_paths::resolve_dirs(); + run(options, noise_level, &dirs) +} + +pub fn run(options: Options, noise_level: NoiseLevel, dirs: &Dirs) -> Result { let mut build_options: BuildOptions = options.clone().into(); build_options.target = Some( Target::all() diff --git a/crates/tauri-cli/src/mobile/ios/mod.rs b/crates/tauri-cli/src/mobile/ios/mod.rs index 0590e772a..6c0e0af87 100644 --- a/crates/tauri-cli/src/mobile/ios/mod.rs +++ b/crates/tauri-cli/src/mobile/ios/mod.rs @@ -102,7 +102,6 @@ enum Commands { pub fn command(cli: Cli, verbosity: u8) -> Result<()> { let noise_level = NoiseLevel::from_occurrences(verbosity as u64); - let dirs = crate::helpers::app_paths::resolve_dirs(); match cli.command { Commands::Init(options) => init_command( MobileTarget::Ios, @@ -110,10 +109,9 @@ pub fn command(cli: Cli, verbosity: u8) -> Result<()> { options.reinstall_deps, options.skip_targets_install, options.config, - &dirs, )?, Commands::Dev(options) => dev::command(options, noise_level)?, - Commands::Build(options) => build::command(options, noise_level, &dirs).map(|_| ())?, + Commands::Build(options) => build::command(options, noise_level).map(|_| ())?, Commands::Run(options) => run::command(options, noise_level)?, Commands::XcodeScript(options) => xcode_script::command(options)?, } diff --git a/crates/tauri-cli/src/mobile/ios/run.rs b/crates/tauri-cli/src/mobile/ios/run.rs index 6c75c5acc..0021ef868 100644 --- a/crates/tauri-cli/src/mobile/ios/run.rs +++ b/crates/tauri-cli/src/mobile/ios/run.rs @@ -76,7 +76,7 @@ pub fn command(options: Options, noise_level: NoiseLevel) -> Result<()> { let dirs = crate::helpers::app_paths::resolve_dirs(); - let mut built_application = super::build::command( + let mut built_application = super::build::run( super::build::Options { debug: !options.release, targets: Some(vec![]), /* skips IPA build since there's no target */