update tauri to cef/wry feature flag removal

plugins/barcode-scanner/Cargo.toml

@@ -31,4 +31,4 @@ log = { workspace = true }
 thiserror = { workspace = true }
 
 [target.'cfg(target_os = "ios")'.dependencies]
-tauri = { workspace = true, features = ["wry"] }
+tauri = { workspace = true }

plugins/clipboard-manager/Cargo.toml

@@ -32,7 +32,7 @@ log = { workspace = true }
 thiserror = { workspace = true }
 
 [target.'cfg(target_os = "ios")'.dependencies]
-tauri = { workspace = true, features = ["wry"] }
+tauri = { workspace = true }
 
 [target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
 arboard = { version = "3", features = ["wayland-data-control"] }

plugins/deep-link/examples/app/src-tauri/Cargo.toml

@@ -19,7 +19,9 @@ tauri-build = { workspace = true }
 [dependencies]
 serde = { workspace = true }
 serde_json = { workspace = true }
-tauri = { workspace = true, features = ["wry", "common-controls-v6", "x11"] }
+tauri = { workspace = true }
+tauri-runtime-wry = { workspace = true, optional = true }
+tauri-runtime-cef = { workspace = true, optional = true }
 tauri-plugin-deep-link = { path = "../../../" }
 tauri-plugin-log = { path = "../../../../log" }
 tauri-plugin-single-instance = { path = "../../../../single-instance", features = [
@@ -28,6 +30,9 @@ tauri-plugin-single-instance = { path = "../../../../single-instance", features
 log = "0.4"
 
 [features]
+default = ["wry"]
+wry = ["dep:tauri-runtime-wry"]
+cef = ["dep:tauri-runtime-cef"]
 # this feature is used for production builds or when `devUrl` points to the filesystem and the built-in dev server is disabled.
 # If you use cargo directly instead of tauri's cli you can use this feature flag to switch between tauri's `dev` and `build` modes.
 # DO NOT REMOVE!!

plugins/deep-link/examples/app/src-tauri/src/lib.rs

@@ -2,6 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
+#[cfg(feature = "cef")]
+type TauriRuntime = tauri_runtime_cef::CefRuntime<tauri::EventLoopMessage>;
+#[cfg(feature = "wry")]
+type TauriRuntime = tauri_runtime_wry::Wry<tauri::EventLoopMessage>;
+
 use tauri_plugin_deep_link::DeepLinkExt;
 
 // Learn more about Tauri commands at https://tauri.app/v1/guides/features/command
@@ -13,7 +18,7 @@ fn greet(name: &str) -> String {
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     #[allow(unused_mut)]
-    let mut builder = tauri::Builder::default();
+    let mut builder = tauri::Builder::<TauriRuntime>::new();
 
     #[cfg(desktop)]
     {

plugins/dialog/Cargo.toml

@@ -28,7 +28,7 @@ ios = { level = "partial", notes = "Does not support folder picker" }
 tauri-plugin = { workspace = true, features = ["build"] }
 
 [dev-dependencies]
-tauri = { workspace = true, features = ["wry"] }
+tauri = { workspace = true }
 
 [dependencies]
 serde = { workspace = true }
@@ -40,7 +40,7 @@ url = { workspace = true }
 tauri-plugin-fs = { path = "../fs", version = "2.4.5" }
 
 [target.'cfg(target_os = "ios")'.dependencies]
-tauri = { workspace = true, features = ["wry"] }
+tauri = { workspace = true }
 
 [target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
 rfd = { version = "0.16", default-features = false, features = [

plugins/geolocation/Cargo.toml

@@ -30,7 +30,7 @@ thiserror = { workspace = true }
 specta = { workspace = true, optional = true }
 
 [target.'cfg(target_os = "ios")'.dependencies]
-tauri = { workspace = true, features = ["wry"] }
+tauri = { workspace = true }
 
 [features]
 specta = ["dep:specta", "tauri/specta"]

plugins/haptics/Cargo.toml

@@ -30,7 +30,7 @@ thiserror = { workspace = true }
 specta = { workspace = true, optional = true }
 
 [target.'cfg(target_os = "ios")'.dependencies]
-tauri = { workspace = true, features = ["wry"] }
+tauri = { workspace = true }
 
 [features]
 specta = ["dep:specta", "tauri/specta"]

plugins/notification/Cargo.toml

@@ -34,7 +34,7 @@ url = { version = "2", features = ["serde"] }
 serde_repr = "0.1"
 
 [target.'cfg(target_os = "ios")'.dependencies]
-tauri = { workspace = true, features = ["wry"] }
+tauri = { workspace = true }
 
 [target."cfg(windows)".dependencies]
 win7-notifications = { version = "0.4.5", optional = true }

plugins/opener/Cargo.toml

@@ -58,4 +58,4 @@ default-features = false
 features = ["std", "NSURL", "NSArray", "NSString"]
 
 [target.'cfg(target_os = "ios")'.dependencies]
-tauri = { workspace = true, features = ["wry"] }
+tauri = { workspace = true }

plugins/shell/Cargo.toml

@@ -35,4 +35,4 @@ encoding_rs = "0.8"
 os_pipe = "1"
 
 [target.'cfg(target_os = "ios")'.dependencies]
-tauri = { workspace = true, features = ["wry"] }
+tauri = { workspace = true }

plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml

@@ -10,7 +10,9 @@ rust-version = "1.77.2"
 [dependencies]
 serde = { workspace = true }
 serde_json = { workspace = true }
-tauri = { workspace = true, features = ["wry", "common-controls-v6", "x11"] }
+tauri = { workspace = true }
+tauri-runtime-wry = { workspace = true, optional = true }
+tauri-runtime-cef = { workspace = true, optional = true }
 tauri-plugin-single-instance = { path = "../../../" }
 tauri-plugin-cli = { path = "../../../../cli" }
 
@@ -18,4 +20,7 @@ tauri-plugin-cli = { path = "../../../../cli" }
 tauri-build = { workspace = true }
 
 [features]
+default = ["wry"]
+wry = ["dep:tauri-runtime-wry"]
+cef = ["dep:tauri-runtime-cef"]
 prod = ["tauri/custom-protocol"]

plugins/single-instance/examples/vanilla/src-tauri/src/main.rs

@@ -7,8 +7,13 @@
     windows_subsystem = "windows"
 )]
 
+#[cfg(feature = "cef")]
+type TauriRuntime = tauri_runtime_cef::CefRuntime<tauri::EventLoopMessage>;
+#[cfg(feature = "wry")]
+type TauriRuntime = tauri_runtime_wry::Wry<tauri::EventLoopMessage>;
+
 fn main() {
-    tauri::Builder::default()
+    tauri::Builder::<TauriRuntime>::new()
         .plugin(
             tauri_plugin_single_instance::Builder::new()
                 .callback(move |app, argv, cwd| {

plugins/store/Cargo.toml

@@ -29,7 +29,7 @@ dunce = { workspace = true }
 tokio = { version = "1", features = ["sync", "time", "macros"] }
 
 [target.'cfg(target_os = "ios")'.dependencies]
-tauri = { workspace = true, features = ["wry"] }
+tauri = { workspace = true }
 
 [dev-dependencies]
-tauri = { workspace = true, features = ["wry"] }
+tauri = { workspace = true }

plugins/store/examples/AppSettingsManager/src-tauri/Cargo.toml

@@ -13,12 +13,17 @@ edition = "2021"
 tauri-build = { workspace = true }
 
 [dependencies]
-tauri = { workspace = true, features = ["wry", "common-controls-v6", "x11"] }
+tauri = { workspace = true }
+tauri-runtime-wry = { workspace = true, optional = true }
+tauri-runtime-cef = { workspace = true, optional = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tauri-plugin-store = { path = "../../../" }
 
 [features]
+default = ["wry"]
+wry = ["dep:tauri-runtime-wry"]
+cef = ["dep:tauri-runtime-cef"]
 # this feature is used for production builds or when `devPath` points to the filesystem
 # DO NOT REMOVE!!
 prod = ["tauri/custom-protocol"]

plugins/store/examples/AppSettingsManager/src-tauri/src/main.rs

@@ -5,6 +5,11 @@
 // Prevents additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
+#[cfg(feature = "cef")]
+type TauriRuntime = tauri_runtime_cef::CefRuntime<tauri::EventLoopMessage>;
+#[cfg(feature = "wry")]
+type TauriRuntime = tauri_runtime_wry::Wry<tauri::EventLoopMessage>;
+
 use serde_json::json;
 use tauri::Listener;
 use tauri_plugin_store::StoreExt;
@@ -13,7 +18,7 @@ mod app;
 use app::settings::AppSettings;
 
 fn main() {
-    tauri::Builder::default()
+    tauri::Builder::<TauriRuntime>::new()
         .plugin(tauri_plugin_store::Builder::new().build())
         .setup(|app| {
             // Init store and load it from disk

plugins/updater/tests/app-updater/Cargo.toml

@@ -7,7 +7,9 @@ edition = { workspace = true }
 tauri-build = { workspace = true }
 
 [dependencies]
-tauri = { workspace = true, features = ["wry", "common-controls-v6", "x11"] }
+tauri = { workspace = true }
+tauri-runtime-wry = { workspace = true, optional = true }
+tauri-runtime-cef = { workspace = true, optional = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tauri-plugin-updater = { path = "../.." }
@@ -15,4 +17,7 @@ tiny_http = "0.12"
 time = { version = "0.3", features = ["formatting"] }
 
 [features]
+default = ["wry"]
+wry = ["dep:tauri-runtime-wry"]
+cef = ["dep:tauri-runtime-cef"]
 prod = ["tauri/custom-protocol"]

plugins/updater/tests/app-updater/src/main.rs

@@ -4,13 +4,18 @@
 
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
+#[cfg(feature = "cef")]
+type TauriRuntime = tauri_runtime_cef::CefRuntime<tauri::EventLoopMessage>;
+#[cfg(feature = "wry")]
+type TauriRuntime = tauri_runtime_wry::Wry<tauri::EventLoopMessage>;
+
 use tauri_plugin_updater::UpdaterExt;
 
 fn main() {
     #[allow(unused_mut)]
     let mut context = tauri::generate_context!();
 
-    tauri::Builder::default()
+    tauri::Builder::<TauriRuntime>::new()
         .plugin(tauri_plugin_updater::Builder::new().build())
         .setup(|app| {
             let handle = app.handle().clone();

plugins/updater/tests/updater-migration/Cargo.toml

@@ -7,7 +7,7 @@ edition = { workspace = true }
 tauri-build = { workspace = true }
 
 [dependencies]
-tauri = { workspace = true, features = ["wry", "common-controls-v6", "x11"] }
+tauri = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tauri-plugin-updater = { path = "../.." }

plugins/updater/tests/updater-migration/v2-app/Cargo.toml

@@ -7,8 +7,15 @@ edition = { workspace = true }
 tauri-build = { workspace = true }
 
 [dependencies]
-tauri = { workspace = true, features = ["wry", "common-controls-v6", "x11"] }
+tauri = { workspace = true }
+tauri-runtime-wry = { workspace = true, optional = true }
+tauri-runtime-cef = { workspace = true, optional = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tauri-plugin-updater = { path = "../../.." }
 tiny_http = "0.12"
+
+[features]
+default = ["wry"]
+wry = ["dep:tauri-runtime-wry"]
+cef = ["dep:tauri-runtime-cef"]

plugins/updater/tests/updater-migration/v2-app/src/main.rs

@@ -4,13 +4,18 @@
 
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
+#[cfg(feature = "cef")]
+type TauriRuntime = tauri_runtime_cef::CefRuntime<tauri::EventLoopMessage>;
+#[cfg(feature = "wry")]
+type TauriRuntime = tauri_runtime_wry::Wry<tauri::EventLoopMessage>;
+
 use tauri_plugin_updater::UpdaterExt;
 
 fn main() {
     #[allow(unused_mut)]
     let mut context = tauri::generate_context!();
 
-    tauri::Builder::default()
+    tauri::Builder::<TauriRuntime>::new()
         .plugin(tauri_plugin_updater::Builder::new().build())
         .setup(|app| {
             println!("version={}", app.package_info().version);

plugins/websocket/examples/tauri-app/src-tauri/Cargo.toml

@@ -7,7 +7,9 @@ edition = "2021"
 [dependencies]
 serde = { workspace = true }
 serde_json = { workspace = true }
-tauri = { workspace = true, features = ["wry", "common-controls-v6", "x11"] }
+tauri = { workspace = true }
+tauri-runtime-wry = { workspace = true, optional = true }
+tauri-runtime-cef = { workspace = true, optional = true }
 tokio = { version = "1", features = ["net"] }
 futures-util = "0.3"
 tauri-plugin-websocket = { path = "../../../" }
@@ -17,4 +19,7 @@ tokio-tungstenite = "0.28"
 tauri-build = { workspace = true }
 
 [features]
+default = ["wry"]
+wry = ["dep:tauri-runtime-wry"]
+cef = ["dep:tauri-runtime-cef"]
 prod = ["tauri/custom-protocol"]

plugins/websocket/examples/tauri-app/src-tauri/src/main.rs

@@ -7,6 +7,11 @@
   windows_subsystem = "windows"
 )]
 
+#[cfg(feature = "cef")]
+type TauriRuntime = tauri_runtime_cef::CefRuntime<tauri::EventLoopMessage>;
+#[cfg(feature = "wry")]
+type TauriRuntime = tauri_runtime_wry::Wry<tauri::EventLoopMessage>;
+
 use futures_util::StreamExt;
 use tokio::net::{TcpListener, TcpStream};
 
@@ -35,7 +40,7 @@ async fn accept_connection(stream: TcpStream) {
 
 fn main() {
   tauri::async_runtime::spawn(start_server());
-  tauri::Builder::default()
+  tauri::Builder::<TauriRuntime>::new()
     .plugin(tauri_plugin_websocket::init())
     .run(tauri::generate_context!())
     .expect("error while running tauri application");