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/ios-27.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
tauri-cli: minor:deps
"@tauri-apps/cli": minor:deps
---

Enable scenes lifecycle by default to support iOS 27.
6 changes: 6 additions & 0 deletions .changes/swift-27.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
tauri: minor:deps
tauri-utils: minor:deps
---

Update swift-rs to support builds using Xcode 27.
6 changes: 6 additions & 0 deletions .changes/xcode-27.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
tauri-cli: minor:deps
"@tauri-apps/cli": minor:deps
---

Update cargo-mobile2 and change the default minimum iOS version to 15.0 to support Xcode 27.
102 changes: 83 additions & 19 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/tauri-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ name = "cargo-tauri"
path = "src/main.rs"

[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"windows\", target_os = \"macos\"))".dependencies]
cargo-mobile2 = { version = "0.22.4", default-features = false }
cargo-mobile2 = { version = "0.22.5", default-features = false }

[dependencies]
jsonrpsee = { version = "0.26", features = ["server"] }
Expand Down
8 changes: 4 additions & 4 deletions crates/tauri-cli/config.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
},
"createUpdaterArtifacts": false,
"iOS": {
"minimumSystemVersion": "14.0"
"minimumSystemVersion": "15.0"
},
"icon": [],
"linux": {
Expand Down Expand Up @@ -2338,7 +2338,7 @@
"iOS": {
"description": "iOS configuration.",
"default": {
"minimumSystemVersion": "14.0"
"minimumSystemVersion": "15.0"
},
"allOf": [
{
Expand Down Expand Up @@ -3923,8 +3923,8 @@
]
},
"minimumSystemVersion": {
"description": "A version string indicating the minimum iOS version that the bundled application supports. Defaults to `13.0`.\n\n Maps to the IPHONEOS_DEPLOYMENT_TARGET value.",
"default": "14.0",
"description": "A version string indicating the minimum iOS version that the bundled application supports. Defaults to `15.0`.\n\n Maps to the IPHONEOS_DEPLOYMENT_TARGET value.",
"default": "15.0",
"type": "string"
},
"infoPlist": {
Expand Down
2 changes: 1 addition & 1 deletion crates/tauri-cli/templates/app/src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ pub fn run() {
Ok(())
})
.run(tauri::generate_context!())
.expect("error while running tauri application");
.expect("error while building tauri application");
}
5 changes: 5 additions & 0 deletions crates/tauri-cli/templates/mobile/ios/project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,12 @@ targets:
sources:
- path: Sources
- path: Assets.xcassets
# Exclude built static libs: regenerating with xcodegen after a build
# otherwise turns the per-configuration libapp.a copies into colliding
# resources ("Multiple commands produce …/libapp.a"). They are linked
# via LIBRARY_SEARCH_PATHS, never bundled as resources.
- path: Externals
excludes: ["**/*.a"]
- path: {{app.name}}_iOS
- path: {{app.asset-dir}}
buildPhase: resources
Expand Down
10 changes: 7 additions & 3 deletions crates/tauri-runtime-wry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ wry = { version = "0.56.0", default-features = false, features = [
"os-webview",
"linux-body",
] }
tao = { version = "0.36.0", default-features = false, features = ["rwh_06"] }
tao = { version = "0.37.0", default-features = false, features = ["rwh_06"] }
tauri-runtime = { workspace = true }
tauri-utils = { workspace = true }
raw-window-handle = "0.6"
Expand All @@ -33,7 +33,11 @@ once_cell = "1.20"

[target."cfg(windows)".dependencies.windows]
version = "0.61"
features = ["Win32_Foundation", "Win32_Graphics_Dwm"]
features = [
"Win32_Foundation",
"Win32_Graphics_Dwm",
"Win32_UI_WindowsAndMessaging",
]

[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
gtk = { version = "0.18", features = ["v3_24"] }
Expand Down Expand Up @@ -67,5 +71,5 @@ objc-exception = []
tracing = ["dep:tracing", "wry/tracing"]
macos-proxy = ["wry/mac-proxy"]
unstable = []
common-controls-v6 = []
common-controls-v6 = ["windows/Win32_UI_Controls", "windows/Win32_UI_Shell"]
dbus = ["tao/dbus"]
8 changes: 4 additions & 4 deletions crates/tauri-schema-generator/schemas/config.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
},
"createUpdaterArtifacts": false,
"iOS": {
"minimumSystemVersion": "14.0"
"minimumSystemVersion": "15.0"
},
"icon": [],
"linux": {
Expand Down Expand Up @@ -2338,7 +2338,7 @@
"iOS": {
"description": "iOS configuration.",
"default": {
"minimumSystemVersion": "14.0"
"minimumSystemVersion": "15.0"
},
"allOf": [
{
Expand Down Expand Up @@ -3923,8 +3923,8 @@
]
},
"minimumSystemVersion": {
"description": "A version string indicating the minimum iOS version that the bundled application supports. Defaults to `13.0`.\n\n Maps to the IPHONEOS_DEPLOYMENT_TARGET value.",
"default": "14.0",
"description": "A version string indicating the minimum iOS version that the bundled application supports. Defaults to `15.0`.\n\n Maps to the IPHONEOS_DEPLOYMENT_TARGET value.",
"default": "15.0",
"type": "string"
},
"infoPlist": {
Expand Down
2 changes: 1 addition & 1 deletion crates/tauri-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ http = "1"
plist = "1"

[target."cfg(target_os = \"macos\")".dependencies]
swift-rs = { version = "1", optional = true, features = ["build"] }
swift-rs = { version = "1.0.8", optional = true, features = ["build"] }

[dev-dependencies]
getrandom = { version = "0.3", features = ["std"] }
Expand Down
4 changes: 2 additions & 2 deletions crates/tauri-utils/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@ fn macos_minimum_system_version() -> Option<String> {
}

fn ios_minimum_system_version() -> String {
"14.0".into()
"15.0".into()
}

/// Configuration for a target language for the WiX build.
Expand Down Expand Up @@ -3304,7 +3304,7 @@ pub struct IosConfig {
/// Translates to the bundle's CFBundleVersion property.
#[serde(alias = "bundle-version")]
pub bundle_version: Option<String>,
/// A version string indicating the minimum iOS version that the bundled application supports. Defaults to `13.0`.
/// A version string indicating the minimum iOS version that the bundled application supports. Defaults to `15.0`.
///
/// Maps to the IPHONEOS_DEPLOYMENT_TARGET value.
#[serde(
Expand Down
Loading
Loading