diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 8de63190..c5cf4356 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG debian_version=slim-bookworm -ARG rust_version=1.73.0 +ARG rust_version=1.74.0 FROM rust:${rust_version}-${debian_version} ARG DEBIAN_FRONTEND=noninteractive diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b22bd715..f5d81398 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -109,7 +109,7 @@ jobs: matrix: os: [ubuntu-latest] toolchain: - - "1.73" # MSRV (Minimum supported rust version) + - "1.74" # MSRV (Minimum supported rust version) - stable experimental: [false] # Ignore failures in beta @@ -163,7 +163,7 @@ jobs: matrix: os: [windows-latest] toolchain: - - "1.73" # MSRV (Minimum supported rust version) + - "1.74" # 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.73" # MSRV (Minimum supported rust version) + - "1.74" # MSRV (Minimum supported rust version) - stable steps: - name: Checkout code diff --git a/CHANGELOG.md b/CHANGELOG.md index 6896180c..f320c104 100644 --- a/CHANGELOG.md +++ b/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.73 (breaking) +- [core] MSRV is now 1.74 (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 diff --git a/Cargo.lock b/Cargo.lock index 24fe042c..ef1f4d75 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2939,16 +2939,15 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.30.12" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae" +checksum = "2b92e0bdf838cbc1c4c9ba14f9c97a7ec6cdcd1ae66b10e1e42775a25553f45d" dependencies = [ - "cfg-if", "core-foundation-sys", "libc", + "memchr", "ntapi", - "once_cell", - "windows 0.52.0", + "windows 0.54.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index b99531b6..00d94577 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "librespot" version = "0.5.0-dev" -rust-version = "1.73" +rust-version = "1.74" authors = ["Librespot Org"] license = "MIT" description = "An open source client library for Spotify, with support for Spotify Connect" @@ -57,7 +57,7 @@ getopts = "0.2" log = "0.4" rpassword = "7.0" sha1 = "0.10" -sysinfo = { version = "0.30.5", default-features = false } +sysinfo = { version = "0.31.3", default-features = false, features = ["system"] } thiserror = "1.0" tokio = { version = "1", features = ["rt", "macros", "signal", "sync", "parking_lot", "process"] } url = "2.2" diff --git a/audio/Cargo.toml b/audio/Cargo.toml index 3610ed4c..ec0945a5 100644 --- a/audio/Cargo.toml +++ b/audio/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "librespot-audio" version = "0.5.0-dev" -rust-version = "1.73" +rust-version = "1.74" authors = ["Paul Lietar "] description = "The audio fetching logic for librespot" license = "MIT" diff --git a/connect/Cargo.toml b/connect/Cargo.toml index 3c3bbe84..14fad592 100644 --- a/connect/Cargo.toml +++ b/connect/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "librespot-connect" version = "0.5.0-dev" -rust-version = "1.73" +rust-version = "1.74" authors = ["Paul Lietar "] description = "The discovery and Spotify Connect logic for librespot" license = "MIT" diff --git a/contrib/Dockerfile b/contrib/Dockerfile index 448a8f38..377ece7a 100644 --- a/contrib/Dockerfile +++ b/contrib/Dockerfile @@ -28,7 +28,7 @@ RUN apt-get install -y curl git build-essential crossbuild-essential-arm64 cross RUN apt-get install -y libasound2-dev libasound2-dev:arm64 libasound2-dev:armel libasound2-dev:armhf RUN apt-get install -y libpulse0 libpulse0:arm64 libpulse0:armel libpulse0:armhf -RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.73 -y +RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.74 -y ENV PATH="/root/.cargo/bin/:${PATH}" RUN rustup target add aarch64-unknown-linux-gnu RUN rustup target add arm-unknown-linux-gnueabi diff --git a/core/Cargo.toml b/core/Cargo.toml index ea9a906e..6be4d567 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "librespot-core" version = "0.5.0-dev" -rust-version = "1.73" +rust-version = "1.74" authors = ["Paul Lietar "] build = "build.rs" description = "The core functionality provided by librespot" @@ -49,7 +49,7 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" sha1 = { version = "0.10", features = ["oid"] } shannon = "0.2" -sysinfo = { version = "0.30.5", default-features = false } +sysinfo = { version = "0.31.3", default-features = false, features = ["system"] } thiserror = "1.0" time = { version = "0.3", features = ["formatting", "parsing"] } tokio = { version = "1", features = ["io-util", "macros", "net", "parking_lot", "rt", "sync", "time"] } diff --git a/discovery/Cargo.toml b/discovery/Cargo.toml index 8076d8e4..f8b317dc 100644 --- a/discovery/Cargo.toml +++ b/discovery/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "librespot-discovery" version = "0.5.0-dev" -rust-version = "1.73" +rust-version = "1.74" authors = ["Paul Lietar "] description = "The discovery logic for librespot" license = "MIT" diff --git a/metadata/Cargo.toml b/metadata/Cargo.toml index 449cd3d5..bdc2da38 100644 --- a/metadata/Cargo.toml +++ b/metadata/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "librespot-metadata" version = "0.5.0-dev" -rust-version = "1.73" +rust-version = "1.74" authors = ["Paul Lietar "] description = "The metadata logic for librespot" license = "MIT" diff --git a/playback/Cargo.toml b/playback/Cargo.toml index ce60fd29..282d5078 100644 --- a/playback/Cargo.toml +++ b/playback/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "librespot-playback" version = "0.5.0-dev" -rust-version = "1.73" +rust-version = "1.74" authors = ["Sasha Hilton "] description = "The audio playback logic for librespot" license = "MIT" diff --git a/protocol/Cargo.toml b/protocol/Cargo.toml index 7e69971a..28fb3b7f 100644 --- a/protocol/Cargo.toml +++ b/protocol/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "librespot-protocol" version = "0.5.0-dev" -rust-version = "1.73" +rust-version = "1.74" authors = ["Paul LiƩtar "] build = "build.rs" description = "The protobuf logic for communicating with Spotify servers" diff --git a/src/main.rs b/src/main.rs index 3e656be2..a6e54d44 100644 --- a/src/main.rs +++ b/src/main.rs @@ -12,7 +12,7 @@ use std::{ str::FromStr, time::{Duration, Instant}, }; -use sysinfo::System; +use sysinfo::{ProcessesToUpdate, System}; use thiserror::Error; use url::Url; @@ -1700,7 +1700,7 @@ async fn main() { { Ok(d) => break Some(d), Err(e) => { - sys.refresh_processes(); + sys.refresh_processes(ProcessesToUpdate::All); if System::uptime() <= 1 { debug!("Retrying to initialise discovery: {e}");