Merge commit 'f6473319f6309b2702a20ff5371763c48e129676' into spotty-dev

# Conflicts:
#	.github/workflows/test.yml
#	Cargo.lock
#	Cargo.toml

.cargo/config.toml

@@ -0,0 +1,3 @@
+
+[target.armv7-unknown-linux-gnueabihf]
+linker = "arm-linux-gnueabihf-gcc"

.devcontainer/Dockerfile

@@ -1,12 +1,12 @@
 # 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
 ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL="sparse"
 ENV RUST_BACKTRACE=1
-ENV RUSTFLAGS=-Dwarnings
+ENV RUSTFLAGS="-D warnings -A renamed-and-removed-lints"
 
 
 RUN apt-get update && \

.github/workflows/test.yml

@@ -38,7 +38,7 @@ on:
 env:
   RUST_BACKTRACE: 1
   KEYMASTER_CLIENT_ID: ${{ secrets.KEYMASTER_CLIENT_ID }}
-  RUSTFLAGS: -D warnings
+  RUSTFLAGS: -D warnings -A renamed-and-removed-lints
 
 # The layering here is as follows:
 #  1. code formatting
@@ -117,7 +117,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
@@ -171,12 +171,16 @@ 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
         uses: actions/[email protected]
 
+      # hyper-rustls >=0.27 uses aws-lc as default backend which requires NASM to build
+      - name: Install NASM
+        uses: ilammy/[email protected]
+
       - name: Write Build Configuration File
         uses: DamianReeves/[email protected]
         with:
@@ -221,7 +225,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
@@ -251,7 +255,15 @@ jobs:
             ~/.cargo/git
             target
           key: ${{ runner.os }}-${{ matrix.target }}-${{ steps.get-rustc-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}
-      - name: Install cross
-        run: cargo install cross || true
+
+      - name: Install the cross compiler targets
+        run: rustup target add ${{ matrix.target }}
+
+      - name: Install cross compiler toolchain
+        run: sudo apt-get install -y gcc-arm-linux-gnueabihf
+
       - name: Build
-        run: cross build --target ${{ matrix.target }} --no-default-features
+        run: cargo build --verbose --target ${{ matrix.target }} --no-default-features
+
+      - name: Check binary
+        run: file target/${{ matrix.target }}/debug/librespot

.gitignore

@@ -1,5 +1,4 @@
 target
-.cargo
 spotify_appkey.key
 .vagrant/
 .project

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