diff --git a/Cargo.lock b/Cargo.lock index 3219b46..e5f850e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -351,7 +351,7 @@ version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -535,7 +535,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -580,7 +580,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -1520,9 +1520,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.13" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" +checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098" dependencies = [ "aws-lc-rs", "bytes", @@ -1551,7 +1551,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.60.2", + "windows-sys 0.59.0", ] [[package]] @@ -1675,9 +1675,9 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" [[package]] name = "reqwest" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e9018c9d814e5f30cc16a0f03271aeab3571e609612d9fe78c1aa8d11c2f62" +checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801" dependencies = [ "base64", "bytes", @@ -1788,7 +1788,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -1845,7 +1845,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -2207,7 +2207,7 @@ dependencies = [ "getrandom 0.3.4", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -2591,9 +2591,9 @@ dependencies = [ [[package]] name = "wasm-streams" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" +checksum = "9d1ec4f6517c9e11ae630e200b2b65d193279042e28edd4a2cda233e46670bbb" dependencies = [ "futures-util", "js-sys", @@ -2637,7 +2637,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] diff --git a/src/cli/ios/mod.rs b/src/cli/ios/mod.rs index 2cedefe..0f3686f 100644 --- a/src/cli/ios/mod.rs +++ b/src/cli/ios/mod.rs @@ -125,24 +125,20 @@ impl Display for XcodeVersion { pub(crate) fn get_supported_configs() -> Vec<(Option, Option)> { vec![ - (Some(IosDevice::IPhone15), Some(OsVersion::Ios17_5)), - (Some(IosDevice::IPhone15Pro), Some(OsVersion::Ios17_5)), - (Some(IosDevice::IPhone15ProMax), Some(OsVersion::Ios17_5)), - (Some(IosDevice::IPhone11), Some(OsVersion::Ios17_5)), + // iOS-18-2 + (Some(IosDevice::IPhone11), Some(OsVersion::Ios18_2)), (Some(IosDevice::IPhone16), Some(OsVersion::Ios18_2)), (Some(IosDevice::IPhone16Pro), Some(OsVersion::Ios18_2)), (Some(IosDevice::IPhone16ProMax), Some(OsVersion::Ios18_2)), (Some(IosDevice::IPhone16Plus), Some(OsVersion::Ios18_2)), - (Some(IosDevice::IPhone11), Some(OsVersion::Ios18_2)), + // iOS-18-4 + (Some(IosDevice::IPhone11), Some(OsVersion::Ios18_4)), (Some(IosDevice::IPhone16), Some(OsVersion::Ios18_4)), (Some(IosDevice::IPhone16Pro), Some(OsVersion::Ios18_4)), (Some(IosDevice::IPhone16ProMax), Some(OsVersion::Ios18_4)), (Some(IosDevice::IPhone16Plus), Some(OsVersion::Ios18_4)), - (Some(IosDevice::IPhone11), Some(OsVersion::Ios18_4)), + // iOS-26-1 (Some(IosDevice::IPhone16Pro), Some(OsVersion::Ios26_1)), - (Some(IosDevice::IPhone16Pro), Some(OsVersion::Ios18_4)), - (Some(IosDevice::IPhone16Pro), Some(OsVersion::Ios18_2)), - (Some(IosDevice::IPhone16Pro), Some(OsVersion::Ios17_5)), (Some(IosDevice::IPhone17), Some(OsVersion::Ios26_1)), (Some(IosDevice::IPhone17Pro), Some(OsVersion::Ios26_1)), (Some(IosDevice::IPhone17ProMax), Some(OsVersion::Ios26_1)), @@ -402,21 +398,23 @@ async fn validate_device_configuration( message: " Please set --xcode-version, --os-version, and --device correctly. Supported iOS settings combinations are: - --os-version 17.5 --device iPhone-15 => Default - --os-version 17.5 --device iPhone-15-Pro - --os-version 17.5 --device iPhone-15-Pro-Max - --os-version 17.5 --device iPhone-11 --os-version 18.2 --device iPhone-16 --os-version 18.2 --device iPhone-16-Pro --os-version 18.2 --device iPhone-16-Pro-Max --os-version 18.2 --device iPhone-16-Plus --os-version 18.2 --device iPhone-11 + --os-version 18.4 --device iPhone-16 --os-version 18.4 --device iPhone-16-Pro --os-version 18.4 --device iPhone-16-Pro-Max --os-version 18.4 --device iPhone-16-Plus --os-version 18.4 --device iPhone-11 -First example: If you choose --xcode-version 15.4 --device iPhone-15-Pro then the --os-version will be inferred (17.5). + + --os-version 26.1 --device iPhone-17 + --os-version 26.1 --device iPhone-17-Pro + --os-version 26.1 --device iPhone-17-Pro-Max + --os-version 26.1 --device iPhone-16-Pro +First example: If you choose --device iPhone-17 then the --os-version will be inferred (26.1). Second example: If you choose --device iPhone-11 then you will receive an error because --os-version param is ambiguous." .into(), }.into())); @@ -432,41 +430,41 @@ mod tests { #[tokio::test] async fn test_infer_parameters_device_and_xcode_version_provided() -> Result<()> { - let provided_device = Some(IosDevice::IPhone15); - let expected_os_version = OsVersion::Ios17_5; + let provided_device = Some(IosDevice::IPhone17); + let expected_os_version = OsVersion::Ios26_1; let (inferred_device, inferred_os_version) = infer_parameters(provided_device, None).await?; - assert_eq!(inferred_device, IosDevice::IPhone15); + assert_eq!(inferred_device, IosDevice::IPhone17); assert_eq!(inferred_os_version, expected_os_version); Ok(()) } #[tokio::test] - async fn test_infer_parameters_ambiguous_xcode_version_should_error() { + async fn test_infer_parameters_ambiguous_should_error() { let result = infer_parameters(None, None).await; assert!(result.is_err()); } #[tokio::test] async fn test_infer_parameters_complete_input_valid() -> Result<()> { - let provided_device = Some(IosDevice::IPhone15); - let provided_os_version = Some(OsVersion::Ios17_5); + let provided_device = Some(IosDevice::IPhone16); + let provided_os_version = Some(OsVersion::Ios18_2); let (inferred_device, inferred_os_version) = infer_parameters(provided_device, provided_os_version).await?; - assert_eq!(inferred_device, IosDevice::IPhone15); - assert_eq!(inferred_os_version, OsVersion::Ios17_5); + assert_eq!(inferred_device, IosDevice::IPhone16); + assert_eq!(inferred_os_version, OsVersion::Ios18_2); Ok(()) } #[tokio::test] async fn test_infer_parameters_invalid_device_and_xcode_combination_should_error() { - let provided_os_version = Some(OsVersion::Ios17_5); + let provided_os_version = Some(OsVersion::Ios18_2); let result = infer_parameters(None, provided_os_version).await; assert!(result.is_err()); }