Updating rodio, cpal, and min rust version

.devcontainer/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG debian_version=slim-bookworm
-ARG rust_version=1.85.0
+ARG rust_version=1.87.0
 FROM rust:${rust_version}-${debian_version}
 
 ARG DEBIAN_FRONTEND=noninteractive

.devcontainer/Dockerfile.alpine

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG alpine_version=alpine3.20
-ARG rust_version=1.85.0
+ARG rust_version=1.87.0
 FROM rust:${rust_version}-${alpine_version}
 
 ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL="sparse"

.github/workflows/build.yml

@@ -38,7 +38,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest]
         toolchain:
-          - "1.85" # MSRV (Minimum supported rust version)
+          - "1.87" # MSRV (Minimum supported rust version)
           - stable
     steps:
       - name: Checkout code

.github/workflows/cross-compile.yml

@@ -45,7 +45,7 @@ jobs:
             target: riscv64gc-unknown-linux-gnu
 
         toolchain:
-          - "1.85" # MSRV (Minimum Supported Rust Version)
+          - "1.87" # MSRV (Minimum Supported Rust Version)
           - stable
 
     steps:

CHANGELOG.md

@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - [core] Made `SpotifyId::to_base62`, `SpotifyId::to_base16`, `FileId::to_base16`, `SpotifyUri::to_id`, `SpotifyUri::to_uri` infallible (breaking)
+- [playback] Updated `rodio` to 0.22.2 and `cpal` to 0.17
+- [core] MSRV is now 1.87
 
 ### Fixed
 

Cargo.toml

@@ -29,7 +29,7 @@ include = [
 ]
 
 [workspace.package]
-rust-version = "1.85"
+rust-version = "1.87"
 authors = ["Librespot Org"]
 license = "MIT"
 repository = "https://github.com/librespot-org/librespot"

contrib/cross-compile-armv6hf/Dockerfile

@@ -22,7 +22,7 @@ RUN mkdir /sysroot && \
     dpkg -x libasound2-dev*.deb /sysroot/
 
 # Install rust.
-RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.85 -y
+RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.87 -y
 ENV PATH="/root/.cargo/bin/:${PATH}"
 RUN rustup target add arm-unknown-linux-gnueabihf
 RUN mkdir /.cargo && \

core/src/spclient.rs

@@ -535,7 +535,7 @@ impl SpClient {
                 match network_error.kind {
                     ErrorKind::Unavailable | ErrorKind::DeadlineExceeded => {
                         // Keep trying the current access point three times before dropping it.
-                        if tries % 3 == 0 {
+                        if tries.is_multiple_of(3) {
                             self.flush_accesspoint().await
                         }
                     }

playback/Cargo.toml

@@ -75,8 +75,8 @@ libpulse-binding = { version = "2", optional = true, default-features = false }
 libpulse-simple-binding = { version = "2", optional = true, default-features = false }
 
 # Rodio dependencies
-cpal = { version = "0.16", optional = true }
-rodio = { version = "0.21", optional = true, default-features = false, features = [
+cpal = { version = "0.17", optional = true }
+rodio = { version = "0.22", optional = true, default-features = false, features = [
     "playback",
 ] }