From d2572050be710b45644aee5dba9973222adbb14a Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Sun, 14 Aug 2022 17:53:15 -0300 Subject: [PATCH] chore(examples): remove mobile code from API example --- examples/api/src-tauri/.gitignore | 4 --- examples/api/src-tauri/Cargo.toml | 3 -- examples/api/src-tauri/src/lib.rs | 4 --- examples/api/src-tauri/src/mobile.rs | 47 ---------------------------- 4 files changed, 58 deletions(-) delete mode 100644 examples/api/src-tauri/src/mobile.rs diff --git a/examples/api/src-tauri/.gitignore b/examples/api/src-tauri/.gitignore index e5f47c4d3..aba21e242 100644 --- a/examples/api/src-tauri/.gitignore +++ b/examples/api/src-tauri/.gitignore @@ -1,7 +1,3 @@ # Generated by Cargo # will have compiled files and executables /target/ - -# cargo-mobile -.cargo/ -/gen diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml index baae9446c..b7f399d78 100644 --- a/examples/api/src-tauri/Cargo.toml +++ b/examples/api/src-tauri/Cargo.toml @@ -6,9 +6,6 @@ edition = "2021" rust-version = "1.57" license = "Apache-2.0 OR MIT" -[lib] -crate-type = ["staticlib", "cdylib", "rlib"] - [build-dependencies] tauri-build = { path = "../../../core/tauri-build", features = ["isolation", "codegen"] } diff --git a/examples/api/src-tauri/src/lib.rs b/examples/api/src-tauri/src/lib.rs index 735e97dd2..75a4298cf 100644 --- a/examples/api/src-tauri/src/lib.rs +++ b/examples/api/src-tauri/src/lib.rs @@ -8,10 +8,6 @@ )] mod cmd; -#[cfg(mobile)] -mod mobile; -#[cfg(mobile)] -pub use mobile::*; use serde::Serialize; use tauri::{window::WindowBuilder, App, AppHandle, RunEvent, WindowUrl}; diff --git a/examples/api/src-tauri/src/mobile.rs b/examples/api/src-tauri/src/mobile.rs deleted file mode 100644 index beb20e20c..000000000 --- a/examples/api/src-tauri/src/mobile.rs +++ /dev/null @@ -1,47 +0,0 @@ -#[cfg(target_os = "android")] -use tauri_runtime_wry::wry::application::{android_fn, platform::android::ndk_glue::*}; - -#[cfg(target_os = "android")] -fn init_logging(app_name: &str) { - android_logger::init_once( - android_logger::Config::default() - .with_min_level(log::Level::Trace) - .with_tag(app_name), - ); -} - -#[cfg(not(target_os = "android"))] -fn init_logging(_app_name: &str) { - env_logger::init(); -} - -fn stop_unwind T, T>(f: F) -> T { - match std::panic::catch_unwind(std::panic::AssertUnwindSafe(f)) { - Ok(t) => t, - Err(err) => { - eprintln!("attempt to unwind out of `rust` with err: {:?}", err); - std::process::abort() - } - } -} - -fn _start_app() { - stop_unwind(main); -} - -#[no_mangle] -#[inline(never)] -pub extern "C" fn start_app() { - #[cfg(target_os = "android")] - android_fn!(com.tauri, api); - _start_app() -} - -fn main() { - super::AppBuilder::new() - .setup(|app| { - init_logging(&app.package_info().name); - Ok(()) - }) - .run(); -}