Upgrade dependencies

Cargo.toml

@@ -33,27 +33,27 @@ path = "playback"
 path = "protocol"
 
 [dependencies]
-base64 = "0.5.0"
-env_logger = "0.6.1"
-futures = "0.1.8"
-getopts = "0.2.14"
-hyper = "0.11.2"
-log = "0.3.5"
-num-bigint = "0.1.35"
-protobuf = "1.1"
-rand = "0.6"
-rpassword = "0.3.0"
-tokio-core = "0.1.2"
+base64 = "0.10"
+env_logger = "0.6"
+futures = "0.1"
+getopts = "0.2"
+hyper = "0.11"
+log = "0.4"
+num-bigint = "0.2"
+protobuf = "2.7"
+rand = "0.7"
+rpassword = "3.0"
+tokio-core = "0.1"
 tokio-io = "0.1"
-tokio-process = "0.2.2"
-tokio-signal = "0.1.2"
-url = "1.7.0"
-sha-1 = "0.8.0"
-hex = "0.3.2"
+tokio-process = "0.2"
+tokio-signal = "0.2"
+url = "1.7"
+sha-1 = "0.8"
+hex = "0.3"
 
 [build-dependencies]
-rand            = "0.6"
-vergen          = "0.1.0"
+rand            = "0.7"
+vergen          = "3.0"
 
 [features]
 alsa-backend = ["librespot-playback/alsa-backend"]

README.md

@@ -26,7 +26,7 @@ If you wish to learn more about how librespot works overall, the best way is to
 If you run into a bug when using librespot, please search the existing issues before opening a new one. Chances are, we've encountered it before, and have provided a resolution. If not, please open a new one, and where possible, include the backtrace librespot generates on crashing, along with anything we can use to reproduce the issue, eg. the Spotify URI of the song that caused the crash.
 
 # Building
-Rust 1.30.0 or later is required to build librespot.
+Rust 1.32.0 or later is required to build librespot.
 
 We recently switched to using [Rodio](https://github.com/tomaka/rodio) for audio playback by default, hene for macOS and Windows, you should just be able to clone and build librespot (with the command below). For linux, you will need to run the additional commands below, depending on your distro.
 

audio/Cargo.toml

@@ -7,15 +7,15 @@ authors = ["Paul Lietar <paul@lietar.net>"]
 path = "../core"
 
 [dependencies]
-bit-set = "0.4.0"
-byteorder = "1.0"
-futures = "0.1.8"
-lewton = "0.9.3"
-log = "0.3.5"
-num-bigint = "0.1.35"
-num-traits = "0.1.36"
-tempfile = "2.1"
-aes-ctr = "0.3.0"
+bit-set = "0.5"
+byteorder = "1.3"
+futures = "0.1"
+lewton = "0.9"
+log = "0.4"
+num-bigint = "0.2"
+num-traits = "0.2"
+tempfile = "3.1"
+aes-ctr = "0.3"
 
 tremor = { git = "https://github.com/plietar/rust-tremor", optional = true }
 vorbis = { version ="0.1.0", optional = true }

audio/src/fetch.rs

@@ -61,7 +61,7 @@ impl AudioFileOpenStreaming {
         });
 
         let mut write_file = NamedTempFile::new().unwrap();
-        write_file.set_len(size as u64).unwrap();
+        write_file.as_file().set_len(size as u64).unwrap();
         write_file.seek(SeekFrom::Start(0)).unwrap();
 
         let read_file = write_file.reopen().unwrap();

connect/Cargo.toml

@@ -11,22 +11,22 @@ path = "../playback"
 path = "../protocol"
 
 [dependencies]
-base64 = "0.5.0"
-futures = "0.1.8"
-hyper = "0.11.2"
-log = "0.3.5"
-num-bigint = "0.1.35"
-protobuf = "2.0.5"
-rand = "0.6"
+base64 = "0.10"
+futures = "0.1"
+hyper = "0.11"
+log = "0.4"
+num-bigint = "0.2"
+protobuf = "2.7"
+rand = "0.7"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
-tokio-core = "0.1.2"
-url = "1.3"
-sha-1 = "0.8.0"
-hmac = "0.7.0"
-aes-ctr = "0.3.0"
-block-modes = "0.2.0"
+tokio-core = "0.1"
+url = "1.7"
+sha-1 = "0.8"
+hmac = "0.7"
+aes-ctr = "0.3"
+block-modes = "0.3"
 
 dns-sd = { version = "0.1.3", optional = true }
 mdns = { git = "https://github.com/plietar/rust-mdns", optional = true }

core/Cargo.toml

@@ -8,36 +8,36 @@ build = "build.rs"
 path = "../protocol"
 
 [dependencies]
-base64 = "0.5.0"
-byteorder = "1.0"
+base64 = "0.10"
+byteorder = "1.3"
 bytes = "0.4"
-error-chain = { version = "0.11.0", default_features = false }
-extprim = "1.5.1"
-futures = "0.1.8"
-httparse = "1.2.4"
-hyper = "0.11.2"
-hyper-proxy = { version = "0.4.1", default_features = false }
-lazy_static = "0.2.0"
-log = "0.3.5"
-num-bigint = "0.1.35"
-num-integer = "0.1.32"
-num-traits = "0.1.36"
-protobuf = "2.0.5"
-rand = "0.6"
+error-chain = { version = "0.12", default_features = false }
+extprim = "1.7"
+futures = "0.1"
+httparse = "1.3"
+hyper = "0.11"
+hyper-proxy = { version = "0.4", default_features = false }
+lazy_static = "1.3"
+log = "0.4"
+num-bigint = "0.2"
+num-integer = "0.1"
+num-traits = "0.2"
+protobuf = "2.7"
+rand = "0.7"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 shannon = "0.2.0"
-tokio-codec = "0.1.1"
-tokio-core = "0.1.2"
+tokio-codec = "0.1"
+tokio-core = "0.1"
 tokio-io = "0.1"
-url = "1.7.0"
-uuid = { version = "0.4", features = ["v4"] }
-sha-1 = "0.8.0"
-hmac = "0.7.0"
-pbkdf2 = "0.3.0"
-aes = "0.3.0"
+url = "1.7"
+uuid = { version = "0.7", features = ["v4"] }
+sha-1 = "0.8"
+hmac = "0.7"
+pbkdf2 = "0.3"
+aes = "0.3"
 
 [build-dependencies]
-rand = "0.6"
+rand = "0.7"
 vergen = "0.1.0"

core/src/config.rs

@@ -15,7 +15,7 @@ pub struct SessionConfig {
 
 impl Default for SessionConfig {
     fn default() -> SessionConfig {
-        let device_id = Uuid::new_v4().hyphenated().to_string();
+        let device_id = Uuid::new_v4().to_hyphenated().to_string();
         SessionConfig {
             user_agent: version::version_string(),
             device_id: device_id,

core/src/session.rs

@@ -1,6 +1,6 @@
 use std::io;
 use std::sync::{Arc, RwLock, Weak};
-use std::sync::atomic::{ATOMIC_USIZE_INIT, AtomicUsize, Ordering};
+use std::sync::atomic::{AtomicUsize, Ordering};
 use std::time::{SystemTime, UNIX_EPOCH};
 
 use byteorder::{BigEndian, ByteOrder};
@@ -42,7 +42,7 @@ struct SessionInternal {
     session_id: usize,
 }
 
-static SESSION_COUNTER: AtomicUsize = ATOMIC_USIZE_INIT;
+static SESSION_COUNTER: AtomicUsize = AtomicUsize::new(0);
 
 #[derive(Clone)]
 pub struct Session(Arc<SessionInternal>);

metadata/Cargo.toml

@@ -4,10 +4,10 @@ version = "0.1.0"
 authors = ["Paul Lietar <paul@lietar.net>"]
 
 [dependencies]
-byteorder = "1.0"
-futures = "0.1.8"
-linear-map = "1.0"
-protobuf = "2.0.5"
+byteorder = "1.3"
+futures = "0.1"
+linear-map = "1.2"
+protobuf = "2.7"
 
 [dependencies.librespot-core]
 path = "../core"

playback/Cargo.toml

@@ -11,9 +11,9 @@ path = "../core"
 path = "../metadata"
 
 [dependencies]
-futures = "0.1.8"
-log = "0.3.5"
-byteorder = "1.2.1"
+futures = "0.1"
+log = "0.4"
+byteorder = "1.3"
 
 alsa            = { version = "0.2.1", optional = true }
 portaudio-rs    = { version = "0.3.0", optional = true }
@@ -21,7 +21,7 @@ libpulse-sys    = { version = "0.0.0", optional = true }
 jack            = { version = "0.5.3", optional = true }
 libc            = { version = "0.2", optional = true }
 rodio           = { git = "https://github.com/tomaka/rodio", optional = true, default-features = false }
-cpal            = { version = "*", optional = true }
+cpal            = { version = "0.8", optional = true }
 sdl2            = { version = "0.32", optional = true }
 
 [features]

protocol/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Paul Liétar <paul@lietar.net>"]
 build = "build.rs"
 
 [dependencies]
-protobuf = "2.0.5"
+protobuf = "2.7"
 
 [build-dependencies]
-protobuf-codegen-pure = "2.0.5"
+protobuf-codegen-pure = "2.7"

src/main.rs

@@ -397,7 +397,7 @@ impl Main {
             spirc: None,
             spirc_task: None,
             shutdown: false,
-            signal: Box::new(tokio_signal::ctrl_c(&handle).flatten_stream()),
+            signal: Box::new(tokio_signal::ctrl_c().flatten_stream()),
 
             player_event_channel: None,
             player_event_program: setup.player_event_program,