make futures a workspace dependency

Author: Threated

Cargo.toml

@@ -8,6 +8,7 @@ beam-lib = { path = "./beam-lib", features = [ "strict-ids" ] }
 # Command Line Interface
 clap = { version = "4", features = ["env", "derive"] }
 reqwest = { version = "0.13", default-features = false }
+futures = { version = "0.3" }
 
 [profile.release]
 #opt-level = "z"     # Optimize for size.

broker/Cargo.toml

@@ -27,7 +27,7 @@ tracing = "0.1"
 
 # Server-sent Events (SSE) support
 async-stream = "0.3"
-futures-core = { version = "0.3", default-features = false }
+futures.workspace = true
 once_cell = "1"
 # Socket dependencies
 bytes = { version = "1", optional = true }

broker/src/serve_health.rs

@@ -3,7 +3,7 @@ use std::{collections::HashMap, convert::Infallible, marker::PhantomData, sync::
 use axum::{extract::{Path, State}, http::StatusCode, response::{sse::{Event, KeepAlive, KeepAliveStream}, Response, Sse}, routing::get, Json, Router};
 use axum_extra::{headers::{authorization::Basic, Authorization}, TypedHeader};
 use beam_lib::ProxyId;
-use futures_core::Stream;
+use futures::Stream;
 use serde::{Serialize, Deserialize};
 use shared::{crypto_jwt::Authorized, Msg};
 use tokio::sync::{Mutex, OwnedMutexGuard, RwLock};

broker/src/serve_tasks.rs

@@ -12,7 +12,7 @@ use axum::{
     Json, Router,
 };
 use beam_lib::AppOrProxyId;
-use futures_core::{stream, Stream};
+use futures::{stream, Stream};
 use serde::Deserialize;
 use beam_lib::WorkStatus;
 use shared::{

broker/src/task_manager.rs

@@ -4,7 +4,7 @@ use std::{
 
 use axum::{response::{IntoResponse, sse::Event, Sse}, Json, http::StatusCode};
 use dashmap::DashMap;
-use futures_core::Stream;
+use futures::Stream;
 use once_cell::sync::Lazy;
 use serde::Serialize;
 use serde_json::json;

proxy/Cargo.toml

@@ -34,7 +34,7 @@ rsa = "0.9"
 
 # Server-sent Events (SSE) support
 tokio-util = { version = "0.7", features = ["io"] }
-futures = "0.3"
+futures.workspace = true
 async-sse = "5.1"
 async-stream = "0.3"
 

shared/Cargo.toml

@@ -20,6 +20,7 @@ clap.workspace = true
 tokio = { version = "1", features = ["full"] }
 axum = { version = "0.8", features = [] }
 bytes = "1.4"
+futures.workspace = true
 
 # This includes all default features of reqwest but uses native-tls aka openssl as we depend on it for encryption anyways
 reqwest = { workspace = true, features = ["stream", "native-tls", "charset", "system-proxy", "http2"] }

tests/Cargo.toml

@@ -14,7 +14,7 @@ anyhow = "1"
 rand = "0.8"
 serde = { version = "1", features = ["derive"] }
 reqwest = { workspace = true, features = ["stream"], default-features = false }
-futures = "0.3.28"
+futures.workspace = true
 async-sse = "5.1.0"
 
 [features]