mirror of
https://github.com/librespot-org/librespot.git
synced 2024-12-18 17:11:53 +00:00
Update MSRV to 1.74.0 and sysinfo to 0.31.3
Signed-off-by: yubiuser <github@yubiuser.dev>
This commit is contained in:
parent
2ea7436e60
commit
dcd592bafb
14 changed files with 22 additions and 23 deletions
|
@ -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
|
||||
|
|
6
.github/workflows/test.yml
vendored
6
.github/workflows/test.yml
vendored
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
9
Cargo.lock
generated
9
Cargo.lock
generated
|
@ -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]]
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
[package]
|
||||
name = "librespot-audio"
|
||||
version = "0.5.0-dev"
|
||||
rust-version = "1.73"
|
||||
rust-version = "1.74"
|
||||
authors = ["Paul Lietar <paul@lietar.net>"]
|
||||
description = "The audio fetching logic for librespot"
|
||||
license = "MIT"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
[package]
|
||||
name = "librespot-connect"
|
||||
version = "0.5.0-dev"
|
||||
rust-version = "1.73"
|
||||
rust-version = "1.74"
|
||||
authors = ["Paul Lietar <paul@lietar.net>"]
|
||||
description = "The discovery and Spotify Connect logic for librespot"
|
||||
license = "MIT"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
[package]
|
||||
name = "librespot-core"
|
||||
version = "0.5.0-dev"
|
||||
rust-version = "1.73"
|
||||
rust-version = "1.74"
|
||||
authors = ["Paul Lietar <paul@lietar.net>"]
|
||||
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"] }
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
[package]
|
||||
name = "librespot-discovery"
|
||||
version = "0.5.0-dev"
|
||||
rust-version = "1.73"
|
||||
rust-version = "1.74"
|
||||
authors = ["Paul Lietar <paul@lietar.net>"]
|
||||
description = "The discovery logic for librespot"
|
||||
license = "MIT"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
[package]
|
||||
name = "librespot-metadata"
|
||||
version = "0.5.0-dev"
|
||||
rust-version = "1.73"
|
||||
rust-version = "1.74"
|
||||
authors = ["Paul Lietar <paul@lietar.net>"]
|
||||
description = "The metadata logic for librespot"
|
||||
license = "MIT"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
[package]
|
||||
name = "librespot-playback"
|
||||
version = "0.5.0-dev"
|
||||
rust-version = "1.73"
|
||||
rust-version = "1.74"
|
||||
authors = ["Sasha Hilton <sashahilton00@gmail.com>"]
|
||||
description = "The audio playback logic for librespot"
|
||||
license = "MIT"
|
||||
|
|
|
@ -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 <paul@lietar.net>"]
|
||||
build = "build.rs"
|
||||
description = "The protobuf logic for communicating with Spotify servers"
|
||||
|
|
|
@ -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}");
|
||||
|
|
Loading…
Reference in a new issue