Skip to content

Commit cbd9629

Browse files
authored
fix(cli): load --config values on xcode and android-studio scripts (#13730)
1 parent 0079d08 commit cbd9629

File tree

3 files changed

+57
-9
lines changed

3 files changed

+57
-9
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"tauri-cli": patch:bug
3+
"@tauri-apps/cli": patch:bug
4+
---
5+
6+
Load `--config` arguments when running the Xcode and Android Studio build scripts.

crates/tauri-cli/src/mobile/android/android_studio_script.rs

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use super::{detect_target_ok, ensure_init, env, get_app, get_config, read_options, MobileTarget};
66
use crate::{
7-
helpers::config::get as get_tauri_config,
7+
helpers::config::{get as get_tauri_config, reload as reload_tauri_config},
88
interface::{AppInterface, Interface},
99
mobile::CliOptions,
1010
Result,
@@ -46,12 +46,33 @@ pub fn command(options: Options) -> Result<()> {
4646
Profile::Debug
4747
};
4848

49-
let tauri_config = get_tauri_config(tauri_utils::platform::Target::Android, &[])?;
49+
let (tauri_config, cli_options) = {
50+
let tauri_config = get_tauri_config(tauri_utils::platform::Target::Ios, &[])?;
51+
let cli_options = {
52+
let tauri_config_guard = tauri_config.lock().unwrap();
53+
let tauri_config_ = tauri_config_guard.as_ref().unwrap();
54+
read_options(tauri_config_)
55+
};
5056

51-
let (config, metadata, cli_options) = {
57+
let tauri_config = if cli_options.config.is_empty() {
58+
tauri_config
59+
} else {
60+
// reload config with merges from the android dev|build script
61+
reload_tauri_config(
62+
&cli_options
63+
.config
64+
.iter()
65+
.map(|conf| &conf.0)
66+
.collect::<Vec<_>>(),
67+
)?
68+
};
69+
70+
(tauri_config, cli_options)
71+
};
72+
73+
let (config, metadata) = {
5274
let tauri_config_guard = tauri_config.lock().unwrap();
5375
let tauri_config_ = tauri_config_guard.as_ref().unwrap();
54-
let cli_options = read_options(tauri_config_);
5576
let (config, metadata) = get_config(
5677
&get_app(
5778
MobileTarget::Android,
@@ -62,7 +83,7 @@ pub fn command(options: Options) -> Result<()> {
6283
None,
6384
&cli_options,
6485
);
65-
(config, metadata, cli_options)
86+
(config, metadata)
6687
};
6788

6889
ensure_init(

crates/tauri-cli/src/mobile/ios/xcode_script.rs

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use super::{ensure_init, env, get_app, get_config, read_options, MobileTarget};
66
use crate::{
7-
helpers::config::get as get_tauri_config,
7+
helpers::config::{get as get_tauri_config, reload as reload_tauri_config},
88
interface::{AppInterface, Interface, Options as InterfaceOptions},
99
mobile::ios::LIB_OUTPUT_FILE_NAME,
1010
Result,
@@ -82,9 +82,30 @@ pub fn command(options: Options) -> Result<()> {
8282
let profile = profile_from_configuration(&options.configuration);
8383
let macos = macos_from_platform(&options.platform);
8484

85-
let tauri_config = get_tauri_config(tauri_utils::platform::Target::Ios, &[])?;
85+
let (tauri_config, cli_options) = {
86+
let tauri_config = get_tauri_config(tauri_utils::platform::Target::Ios, &[])?;
87+
let cli_options = {
88+
let tauri_config_guard = tauri_config.lock().unwrap();
89+
let tauri_config_ = tauri_config_guard.as_ref().unwrap();
90+
read_options(tauri_config_)
91+
};
92+
let tauri_config = if cli_options.config.is_empty() {
93+
tauri_config
94+
} else {
95+
// reload config with merges from the ios dev|build script
96+
reload_tauri_config(
97+
&cli_options
98+
.config
99+
.iter()
100+
.map(|conf| &conf.0)
101+
.collect::<Vec<_>>(),
102+
)?
103+
};
104+
105+
(tauri_config, cli_options)
106+
};
86107

87-
let (config, metadata, cli_options) = {
108+
let (config, metadata) = {
88109
let tauri_config_guard = tauri_config.lock().unwrap();
89110
let tauri_config_ = tauri_config_guard.as_ref().unwrap();
90111
let cli_options = read_options(tauri_config_);
@@ -98,7 +119,7 @@ pub fn command(options: Options) -> Result<()> {
98119
None,
99120
&cli_options,
100121
)?;
101-
(config, metadata, cli_options)
122+
(config, metadata)
102123
};
103124
ensure_init(
104125
&tauri_config,

0 commit comments

Comments
 (0)