Merge pull request #1255 from yubiuser/update/dependencies

Update/dependencies

.github/workflows/test.yml

@@ -109,7 +109,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         toolchain:
-          - "1.70" # MSRV (Minimum supported rust version)
+          - "1.71" # MSRV (Minimum supported rust version)
           - stable
         experimental: [false]
         # Ignore failures in beta
@@ -163,7 +163,7 @@ jobs:
       matrix:
         os: [windows-latest]
         toolchain:
-          - "1.70" # MSRV (Minimum supported rust version)
+          - "1.71" # MSRV (Minimum supported rust version)
           - stable
     steps:
       - name: Checkout code
@@ -206,7 +206,7 @@ jobs:
         os: [ubuntu-latest]
         target: [armv7-unknown-linux-gnueabihf]
         toolchain:
-          - "1.70" # MSRV (Minimum supported rust version)
+          - "1.71" # MSRV (Minimum supported rust version)
           - stable
     steps:
       - name: Checkout code

CHANGELOG.md

@@ -41,7 +41,7 @@ https://github.com/librespot-org/librespot
   configurations.
 - [audio] Files are now downloaded over the HTTPS CDN (breaking)
 - [audio] Improve file opening and seeking performance (breaking)
-- [core] MSRV is now 1.70 (breaking)
+- [core] MSRV is now 1.71 (breaking)
 - [connect] `DeviceType` moved out of `connect` into `core` (breaking)
 - [connect] Update and expose all `spirc` context fields (breaking)
 - [connect] Add `Clone, Defaut` traits to `spirc` contexts

Cargo.toml

@@ -51,13 +51,13 @@ version = "0.5.0-dev"
 
 [dependencies]
 data-encoding = "2.5"
-env_logger =  { version = "0.10", default-features = false, features = ["color", "humantime", "auto-color"] }
+env_logger =  { version = "0.11.2", default-features = false, features = ["color", "humantime", "auto-color"] }
 futures-util = { version = "0.3", default_features = false }
 getopts = "0.2"
 log = "0.4"
 rpassword = "7.0"
 sha1 = "0.10"
-sysinfo = { version = "0.29", default-features = false }
+sysinfo = { version = "0.30.5", default-features = false }
 thiserror = "1.0"
 tokio = { version = "1", features = ["rt", "macros", "signal", "sync", "parking_lot", "process"] }
 url = "2.2"

core/Cargo.toml

@@ -47,7 +47,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 sha1 = { version = "0.10", features = ["oid"] }
 shannon = "0.2"
-sysinfo = { version = "0.29", default-features = false }
+sysinfo = { version = "0.30.5", default-features = false }
 thiserror = "1.0"
 time = { version = "0.3", features = ["formatting", "parsing"] }
 tokio = { version = "1", features = ["io-util", "macros", "net", "parking_lot", "rt", "sync", "time"] }
@@ -63,7 +63,7 @@ rand = "0.8"
 vergen = { version = "8", default-features = false, features = ["build", "git", "gitcl"] }
 
 [dev-dependencies]
-env_logger = "0.10"
+env_logger = "0.11.2"
 tokio = { version = "1", features = ["macros", "parking_lot"] }
 
 [features]

core/src/http_client.rs

@@ -20,7 +20,7 @@ use hyper_rustls::{HttpsConnector, HttpsConnectorBuilder};
 use nonzero_ext::nonzero;
 use once_cell::sync::OnceCell;
 use parking_lot::Mutex;
-use sysinfo::{System, SystemExt};
+use sysinfo::System;
 use thiserror::Error;
 use url::Url;
 
@@ -105,9 +105,7 @@ pub struct HttpClient {
 impl HttpClient {
     pub fn new(proxy_url: Option<&Url>) -> Self {
         let zero_str = String::from("0");
-        let os_version = System::new()
+        let os_version = System::os_version().unwrap_or_else(|| zero_str.clone());
-            .os_version()
-            .unwrap_or_else(|| zero_str.clone());
 
         let (spotify_platform, os_version) = match OS {
             "android" => ("Android", os_version),

core/src/spclient.rs

@@ -17,7 +17,7 @@ use hyper::{
 use protobuf::{Enum, Message, MessageFull};
 use rand::RngCore;
 use sha1::{Digest, Sha1};
-use sysinfo::{System, SystemExt};
+use sysinfo::System;
 use thiserror::Error;
 
 use crate::{
@@ -204,9 +204,8 @@ impl SpClient {
             .platform_specific_data
             .mut_or_insert_default();
 
-        let sys = System::new();
+        let os_version = System::os_version().unwrap_or_else(|| String::from("0"));
-        let os_version = sys.os_version().unwrap_or_else(|| String::from("0"));
+        let kernel_version = System::kernel_version().unwrap_or_else(|| String::from("0"));
-        let kernel_version = sys.kernel_version().unwrap_or_else(|| String::from("0"));
 
         match os {
             "windows" => {

discovery/Cargo.toml

@@ -19,7 +19,7 @@ futures-core = "0.3"
 futures-util = "0.3"
 hmac = "0.12"
 hyper = { version = "0.14", features = ["http1", "server", "tcp"] }
-libmdns = "0.7"
+libmdns = "0.8"
 log = "0.4"
 rand = "0.8"
 serde_json = "1.0"

playback/Cargo.toml

@@ -28,19 +28,19 @@ parking_lot = { version = "0.12", features = ["deadlock_detection"] }
 shell-words = "1.1"
 thiserror = "1"
 tokio = { version = "1", features = ["parking_lot", "rt", "rt-multi-thread", "sync"] }
-zerocopy = { version = "0.7.31", features = ["derive"] }
+zerocopy = { version = "0.7.32", features = ["derive"] }
 
 # Backends
-alsa            = { version = "0.8.1", optional = true }
+alsa            = { version = "0.9.0", optional = true }
 portaudio-rs    = { version = "0.3", optional = true }
 libpulse-binding        = { version = "2", optional = true, default-features = false }
 libpulse-simple-binding = { version = "2", optional = true, default-features = false }
 jack            = { version = "0.11", optional = true }
-sdl2            = { version = "0.35", optional = true }
+sdl2            = { version = "0.36", optional = true }
-gstreamer       = { version = "0.21.2", optional = true }
+gstreamer       = { version = "0.22.1", optional = true }
-gstreamer-app   = { version = "0.21.2", optional = true }
+gstreamer-app   = { version = "0.22.0", optional = true }
-gstreamer-audio = { version = "0.21.2", optional = true }
+gstreamer-audio = { version = "0.22.0", optional = true }
-glib            = { version = "0.18.1", optional = true }
+glib            = { version = "0.19.2", optional = true }
 
 # Rodio dependencies
 rodio           = { version = "0.17.1", optional = true, default-features = false }

playback/src/audio_backend/gstreamer.rs

@@ -60,13 +60,13 @@ impl Open for GstreamerSink {
         let sink = match device {
             None => {
                 // no need to dither twice; use librespot dithering instead
-                gst::parse_bin_from_description(
+                gst::parse::bin_from_description(
                     "audioconvert dithering=none ! audioresample ! autoaudiosink",
                     true,
                 )
                 .expect("Failed to create default GStreamer sink")
             }
-            Some(ref x) => gst::parse_bin_from_description(x, true)
+            Some(ref x) => gst::parse::bin_from_description(x, true)
                 .expect("Failed to create custom GStreamer sink"),
         };
         pipeline

src/main.rs

@@ -12,7 +12,7 @@ use std::{
     str::FromStr,
     time::{Duration, Instant},
 };
-use sysinfo::{System, SystemExt};
+use sysinfo::System;
 use thiserror::Error;
 use url::Url;
 
@@ -1693,7 +1693,7 @@ async fn main() {
                 Err(e) => {
                     sys.refresh_processes();
 
-                    if sys.uptime() <= 1 {
+                    if System::uptime() <= 1 {
                         debug!("Retrying to initialise discovery: {e}");
                         tokio::time::sleep(DISCOVERY_RETRY_TIMEOUT).await;
                     } else {