Merge pull request #135 from DanielVoogsgerd/deps

Update dependencies

brane-cli/Cargo.toml

@@ -19,7 +19,7 @@ chrono = "0.4.35"
 clap = { version = "4.5.6", features = ["derive","env"] }
 console = "0.15.5"
 dialoguer = "0.11.0"
-dirs-2 = "3.0.1"
+dirs = "5.0.1"
 dotenvy = "0.15.0"
 enum-debug = { git = "https://github.com/Lut99/enum-debug", tag = "v1.0.0", features = ["derive"] }
 error-trace = { git = "https://github.com/Lut99/error-trace-rs", tag = "v2.0.0" }

brane-cli/src/utils.rs

@@ -176,15 +176,15 @@ pub fn determine_kind(path: &Path) -> Result<PackageKind, UtilError> {
 
 
 
-/// **Edited: uses dirs_2 instead of appdirs and returns UtilErrors when it goes wrong.**
+/// **Edited: uses dirs instead of appdirs and returns UtilErrors when it goes wrong.**
 ///
 /// Returns the path of the configuration directory. Is guaranteed to be an absolute path when it returns successfully (but _not_ that it also exists!).
 ///
 /// **Returns**  
 /// The path of the Brane configuration directory if successful, or a UtilError otherwise.
 pub fn get_config_dir() -> Result<PathBuf, UtilError> {
     // Try to get the user directory
-    let user = match dirs_2::config_dir() {
+    let user = match dirs::config_dir() {
         Some(user) => user,
         None => {
             return Err(UtilError::UserConfigDirNotFound);
@@ -278,7 +278,7 @@ pub fn ensure_history_file(create: bool) -> Result<PathBuf, UtilError> {
 /// A PathBuf with the absolute path that is guaranteed to exist, or an UtilError otherwise.
 pub fn get_data_dir() -> Result<PathBuf, UtilError> {
     // Try to get the user directory
-    let user = match dirs_2::data_local_dir() {
+    let user = match dirs::data_local_dir() {
         Some(user) => user,
         None => {
             return Err(UtilError::UserLocalDataDirNotFound);

brane-ctl/Cargo.toml

@@ -15,9 +15,9 @@ bollard = "0.14.0"
 clap = { version = "4.5.6", features = ["derive","env"] }
 console = "0.15.5"
 dialoguer = "0.11.0"
-diesel = { version = "2.1.0", features = ["sqlite"] }
+diesel = { version = "2.2.3", features = ["sqlite"] }
 diesel_migrations = "2.1.0"
-dirs-2 = "3.0.0"
+dirs = "5.0.0"
 dotenvy = "0.15.0"
 eflint-to-json = { git = "https://github.com/epi-project/policy-reasoner" }
 enum-debug = { git = "https://github.com/Lut99/enum-debug", tag = "v1.0.0", features = ["derive"] }

brane-ctl/src/wizard.rs

@@ -26,7 +26,7 @@ use brane_cfg::node::{self, NodeConfig, NodeKind, NodeSpecificConfig};
 use brane_cfg::proxy::{ForwardConfig, ProxyConfig, ProxyProtocol};
 use brane_shr::input::{confirm, input, input_map, input_path, select, FileHistory};
 use console::style;
-use dirs_2::config_dir;
+use dirs::config_dir;
 use enum_debug::EnumDebug as _;
 use log::{debug, info};
 use specifications::address::Address;

brane-tsk/Cargo.toml

@@ -44,7 +44,6 @@ specifications = { path = "../specifications" }
 
 [dev-dependencies]
 clap = { version = "4.4.0", features = ["derive"] }
-dirs-2 = "3.0.0"
 humanlog = { git = "https://github.com/Lut99/humanlog-rs", tag = "v0.1.0" }
 lazy_static = "1.4.0"