refactor: remove mobile log initialization, ref #6049 (#6081)

Author: lucasfernog

.changes/package-info-crate-name.md

@@ -0,0 +1,6 @@
+---
+"tauri-utils": patch
+"tauri-codegen": patch
+---
+
+Added `crate_name` field on `PackageInfo`.

.changes/remove-mobile-log.md

@@ -0,0 +1,7 @@
+---
+"tauri": patch
+"tauri-macros": patch
+"tauri-build": patch
+---
+
+Removed mobile logging initialization, which will be handled by `tauri-plugin-log`.

core/tauri-build/src/lib.rs

@@ -221,20 +221,14 @@ pub fn try_build(attributes: Attributes) -> Result<()> {
 
   let s = config.tauri.bundle.identifier.split('.');
   let last = s.clone().count() - 1;
-  let mut domain = String::new();
   let mut android_package_prefix = String::new();
   for (i, w) in s.enumerate() {
     if i != last {
-      domain.push_str(w);
-      domain.push('.');
-
       android_package_prefix.push_str(w);
       android_package_prefix.push('_');
     }
   }
-  domain.pop();
   android_package_prefix.pop();
-  println!("cargo:rustc-env=TAURI_MOBILE_DOMAIN={domain}");
   println!("cargo:rustc-env=TAURI_ANDROID_PACKAGE_PREFIX={android_package_prefix}");
 
   cfg_alias("dev", !has_feature("custom-protocol"));

core/tauri-codegen/src/context.rs

@@ -303,6 +303,7 @@ pub fn context_codegen(data: ContextData) -> Result<TokenStream, EmbeddedAssetsE
       version: #package_version.parse().unwrap(),
       authors: env!("CARGO_PKG_AUTHORS"),
       description: env!("CARGO_PKG_DESCRIPTION"),
+      crate_name: env!("CARGO_PKG_NAME"),
     }
   );
 

core/tauri-macros/src/mobile.rs

@@ -40,8 +40,6 @@ pub fn entry_point(_attributes: TokenStream, item: TokenStream) -> TokenStream {
     &mut error,
     &function,
   );
-  let domain_str = var("TAURI_MOBILE_DOMAIN").unwrap();
-  let app_name_str = var("CARGO_PKG_NAME").unwrap();
 
   if let Some(e) = error {
     quote!(#e).into()
@@ -61,10 +59,9 @@ pub fn entry_point(_attributes: TokenStream, item: TokenStream) -> TokenStream {
 
       fn _start_app() {
         #[cfg(target_os = "ios")]
-        ::tauri::init_logging(&format!("{}.{}", #domain_str, #app_name_str));
+        ::tauri::log_stdout();
         #[cfg(target_os = "android")]
         {
-          ::tauri::init_logging(#app_name_str);
           use ::tauri::paste;
           ::tauri::wry_android_binding!(#domain, #app_name, _start_app, ::tauri::wry);
         }

core/tauri-utils/src/lib.rs

@@ -34,6 +34,8 @@ pub struct PackageInfo {
   pub authors: &'static str,
   /// The crate description.
   pub description: &'static str,
+  /// The crate name.
+  pub crate_name: &'static str,
 }
 
 impl PackageInfo {

core/tauri/Cargo.toml

@@ -110,11 +110,9 @@ win7-notifications = { version = "0.3.1", optional = true }
 
 [target."cfg(target_os = \"android\")".dependencies]
 paste = "1.0"
-android_logger = "0.9"
 log = "0.4"
 
 [target."cfg(target_os = \"ios\")".dependencies]
-oslog = "0.2"
 log = "0.4"
 libc = "0.2"
 

core/tauri/src/lib.rs

@@ -278,19 +278,9 @@ pub use self::runtime::ClipboardManager;
 #[cfg_attr(doc_cfg, doc(cfg(feature = "global-shortcut")))]
 pub use self::runtime::GlobalShortcutManager;
 
-#[cfg(target_os = "android")]
-#[doc(hidden)]
-pub fn init_logging(tag: &str) {
-  android_logger::init_once(
-    android_logger::Config::default()
-      .with_min_level(log::Level::Trace)
-      .with_tag(tag),
-  );
-}
-
 #[cfg(target_os = "ios")]
 #[doc(hidden)]
-pub fn init_logging(subsystem: &str) {
+pub fn log_stdout() {
   use std::{
     ffi::CString,
     fs::File,
@@ -323,11 +313,6 @@ pub fn init_logging(subsystem: &str) {
       }
     }
   });
-
-  oslog::OsLogger::new(subsystem)
-    .level_filter(log::LevelFilter::Trace)
-    .init()
-    .unwrap();
 }
 
 /// Updater events.

core/tauri/src/test/mod.rs

@@ -74,6 +74,7 @@ pub fn mock_context<A: Assets>(assets: A) -> crate::Context<A> {
       version: "0.1.0".parse().unwrap(),
       authors: "Tauri",
       description: "Tauri test",
+      crate_name: "test",
     },
     _info_plist: (),
     pattern: Pattern::Brownfield(std::marker::PhantomData),