diff --git a/Cargo.lock b/Cargo.lock index bb014512..7b577713 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4148,6 +4148,17 @@ dependencies = [ "serde_json", ] +[[package]] +name = "swift-rs" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc903dccb086f72f6e93a12e149d84aceda2ad4b08647e14e0330a3bfea61e2b" +dependencies = [ + "base64 0.21.0", + "serde", + "serde_json", +] + [[package]] name = "syn" version = "1.0.107" @@ -4288,7 +4299,7 @@ dependencies = [ "serde_repr", "serialize-to-javascript", "state", - "swift-rs", + "swift-rs 0.3.0", "tar", "tauri-build", "tauri-macros", @@ -4318,7 +4329,7 @@ dependencies = [ "semver 1.0.16", "serde", "serde_json", - "swift-rs", + "swift-rs 0.3.0", "tauri-utils", "tauri-winres", "walkdir", @@ -4441,7 +4452,7 @@ dependencies = [ "serde", "serde_json", "serde_repr", - "swift-rs", + "swift-rs 1.0.0", "tauri", "tauri-build", "time 0.3.15", diff --git a/plugins/log/Cargo.toml b/plugins/log/Cargo.toml index da7b104d..1190ce1c 100644 --- a/plugins/log/Cargo.toml +++ b/plugins/log/Cargo.toml @@ -26,7 +26,7 @@ fern = "0.6" android_logger = "0.11" [target."cfg(target_os = \"ios\")".dependencies] -swift-rs = { git = "https://github.com/Brendonovich/swift-rs", rev = "56b14aa4aa61e93d0fddf695d0cad78b6dd392b4" } +swift-rs = "1" [features] colored = ["fern/colored"] \ No newline at end of file diff --git a/plugins/log/ios/Sources/LogPlugin.swift b/plugins/log/ios/Sources/LogPlugin.swift index 04c98aa1..4ae3621d 100644 --- a/plugins/log/ios/Sources/LogPlugin.swift +++ b/plugins/log/ios/Sources/LogPlugin.swift @@ -3,11 +3,11 @@ import Tauri import SwiftRs @_cdecl("tauri_log") -func log(level: Int, message: UnsafePointer) { +func log(level: Int, message: SRString) { switch level { - case 1: Logger.debug(message.pointee.to_string()) - case 2: Logger.info(message.pointee.to_string()) - case 3: Logger.error(message.pointee.to_string()) + case 1: Logger.debug(message.toString()) + case 2: Logger.info(message.toString()) + case 3: Logger.error(message.toString()) default: break } } diff --git a/plugins/log/src/lib.rs b/plugins/log/src/lib.rs index 86c2b618..66d534b4 100644 --- a/plugins/log/src/lib.rs +++ b/plugins/log/src/lib.rs @@ -23,9 +23,9 @@ use tauri::{ pub use fern; #[cfg(target_os = "ios")] -extern "C" { - fn tauri_log(level: u8, message: &swift_rs::SRString); -} +swift_rs::swift!(fn tauri_log( + level: u8, message: &swift_rs::SRString +)); const DEFAULT_MAX_FILE_SIZE: u128 = 40000; const DEFAULT_ROTATION_STRATEGY: RotationStrategy = RotationStrategy::KeepOne;