rebase and accomodate changes in develop

nymtech · Jan 7, 2025 · b49f722 · b49f722
1 parent 3ad9898
commit b49f722
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/nym-vpn-core/Cargo.lock b/nym-vpn-core/Cargo.lock
diff --git a/nym-vpn-core/Cargo.toml b/nym-vpn-core/Cargo.toml
@@ -150,6 +150,7 @@ tower = "0.5.2"
 tower-http = { version = "0.6.2", features = ["cors"] }
 tracing = "0.1"
 tracing-appender = "0.2.3"
+tracing-oslog = "0.2.0"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 triggered = "0.1.1"
 tun = { version = "0.6.1", features = ["async"] }

diff --git a/nym-vpn-core/crates/nym-vpn-lib/Cargo.toml b/nym-vpn-core/crates/nym-vpn-lib/Cargo.toml
@@ -99,7 +99,8 @@ android_logger.workspace = true
 rand.workspace = true
 
 [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
-tracing-oslog = "0.2.0"
+debounced.workspace = true
+tracing-oslog.workspace = true
 
 [build-dependencies]
 uniffi = { workspace = true, features = ["build"] }

diff --git a/nym-vpn-core/crates/nym-vpn-lib/src/platform/mod.rs b/nym-vpn-core/crates/nym-vpn-lib/src/platform/mod.rs
@@ -47,18 +47,15 @@ pub mod helpers;
 
 mod account;
 mod environment;
-mod state_machine;
 mod logging;
+mod state_machine;
 pub use logging::init_logger;
 
 use std::{path::PathBuf, sync::Arc, time::Duration};
 
 use account::AccountControllerHandle;
 use lazy_static::lazy_static;
-use tokio::{
-    runtime::Runtime,
-    sync::Mutex,
-};
+use tokio::{runtime::Runtime, sync::Mutex};
 
 use state_machine::StateMachineHandle;