From a3cd9779a47428e306a628d658740669faf69ccd Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Mon, 5 Aug 2024 09:57:54 -0300 Subject: [PATCH] chore(cli): remove `android open` and `ios open` commands (#10480) It is recommended to use `[android|ios] dev --open` or `[android|ios] build --open` instead as it properly sets up the requirements for developing and building apps with Tauri. --- .changes/remove-open-command.md | 6 +++++ tooling/cli/src/mobile/android/mod.rs | 4 --- tooling/cli/src/mobile/android/open.rs | 36 ------------------------- tooling/cli/src/mobile/ios/mod.rs | 4 --- tooling/cli/src/mobile/ios/open.rs | 37 -------------------------- 5 files changed, 6 insertions(+), 81 deletions(-) create mode 100644 .changes/remove-open-command.md delete mode 100644 tooling/cli/src/mobile/android/open.rs delete mode 100644 tooling/cli/src/mobile/ios/open.rs diff --git a/.changes/remove-open-command.md b/.changes/remove-open-command.md new file mode 100644 index 000000000..29210b0b4 --- /dev/null +++ b/.changes/remove-open-command.md @@ -0,0 +1,6 @@ +--- +"tauri-cli": patch:changes +"@tauri-apps/cli": patch:changes +--- + +Removed the `[android|ios] open` command. It is recommended to use `[android|ios] dev --open` or `[android|ios] build --open` instead. diff --git a/tooling/cli/src/mobile/android/mod.rs b/tooling/cli/src/mobile/android/mod.rs index 1e29fe806..ffb16cb88 100644 --- a/tooling/cli/src/mobile/android/mod.rs +++ b/tooling/cli/src/mobile/android/mod.rs @@ -37,7 +37,6 @@ use crate::{helpers::config::Config as TauriConfig, Result}; mod android_studio_script; mod build; mod dev; -mod open; pub(crate) mod project; #[derive(Parser)] @@ -67,8 +66,6 @@ pub struct InitOptions { #[derive(Subcommand)] enum Commands { Init(InitOptions), - /// Open project in Android Studio - Open, Dev(dev::Options), Build(build::Options), #[clap(hide(true))] @@ -84,7 +81,6 @@ pub fn command(cli: Cli, verbosity: u8) -> Result<()> { false, options.skip_targets_install, )?, - Commands::Open => open::command()?, Commands::Dev(options) => dev::command(options, noise_level)?, Commands::Build(options) => build::command(options, noise_level)?, Commands::AndroidStudioScript(options) => android_studio_script::command(options)?, diff --git a/tooling/cli/src/mobile/android/open.rs b/tooling/cli/src/mobile/android/open.rs deleted file mode 100644 index e15b3d601..000000000 --- a/tooling/cli/src/mobile/android/open.rs +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2019-2024 Tauri Programme within The Commons Conservancy -// SPDX-License-Identifier: Apache-2.0 -// SPDX-License-Identifier: MIT - -use super::{ensure_init, env, get_app, get_config, inject_assets, MobileTarget}; -use crate::{ - helpers::config::get as get_tauri_config, - interface::{AppInterface, Interface}, - Result, -}; - -use cargo_mobile2::os; - -pub fn command() -> Result<()> { - let tauri_config = get_tauri_config(tauri_utils::platform::Target::Android, None)?; - - let (config, _metadata) = { - let tauri_config_guard = tauri_config.lock().unwrap(); - let tauri_config_ = tauri_config_guard.as_ref().unwrap(); - get_config( - &get_app(tauri_config_, &AppInterface::new(tauri_config_, None)?), - tauri_config_, - None, - &Default::default(), - ) - }; - ensure_init( - &tauri_config, - config.app(), - config.project_dir(), - MobileTarget::Android, - )?; - inject_assets(&config, tauri_config.lock().unwrap().as_ref().unwrap())?; - let env = env()?; - os::open_file_with("Android Studio", config.project_dir(), &env.base).map_err(Into::into) -} diff --git a/tooling/cli/src/mobile/ios/mod.rs b/tooling/cli/src/mobile/ios/mod.rs index 285a235cf..9c38358e8 100644 --- a/tooling/cli/src/mobile/ios/mod.rs +++ b/tooling/cli/src/mobile/ios/mod.rs @@ -42,7 +42,6 @@ use std::{ mod build; mod dev; -mod open; pub(crate) mod project; mod xcode_script; @@ -79,8 +78,6 @@ pub struct InitOptions { #[derive(Subcommand)] enum Commands { Init(InitOptions), - /// Open project in Xcode - Open, Dev(dev::Options), Build(build::Options), #[clap(hide(true))] @@ -96,7 +93,6 @@ pub fn command(cli: Cli, verbosity: u8) -> Result<()> { options.reinstall_deps, options.skip_targets_install, )?, - Commands::Open => open::command()?, Commands::Dev(options) => dev::command(options, noise_level)?, Commands::Build(options) => build::command(options, noise_level)?, Commands::XcodeScript(options) => xcode_script::command(options)?, diff --git a/tooling/cli/src/mobile/ios/open.rs b/tooling/cli/src/mobile/ios/open.rs deleted file mode 100644 index aca787d89..000000000 --- a/tooling/cli/src/mobile/ios/open.rs +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2019-2024 Tauri Programme within The Commons Conservancy -// SPDX-License-Identifier: Apache-2.0 -// SPDX-License-Identifier: MIT - -use super::{ensure_init, env, get_app, get_config, inject_assets, MobileTarget}; -use crate::{ - helpers::config::get as get_tauri_config, - interface::{AppInterface, Interface}, - Result, -}; - -use cargo_mobile2::os; - -pub fn command() -> Result<()> { - let tauri_config = get_tauri_config(tauri_utils::platform::Target::Ios, None)?; - - let (config, _metadata) = { - let tauri_config_guard = tauri_config.lock().unwrap(); - let tauri_config_ = tauri_config_guard.as_ref().unwrap(); - get_config( - &get_app(tauri_config_, &AppInterface::new(tauri_config_, None)?), - tauri_config_, - None, - &Default::default(), - ) - }; - - ensure_init( - &tauri_config, - config.app(), - config.project_dir(), - MobileTarget::Ios, - )?; - inject_assets(&config)?; - let env = env()?; - os::open_file_with("Xcode", config.project_dir(), &env).map_err(Into::into) -}