Task: Update Dependencies (#127)

.github/workflows/ci.yml

@@ -52,7 +52,7 @@ jobs:
         run: cargo make cov-ci
 
       - name: Upload coverage data to codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           files: lcov.info
           fail_ci_if_error: true

CHANGELOG.md

@@ -5,11 +5,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.25.0]
+
+### Changed
+
+- `nakago-axum` - Upgrade Axum to v0.8, with breaking changes.
+- `nakago-ws` - Upgrade Axum to v0.8, with breaking changes.
+- `nakago-warp` - Upgrade tower-http to v0.6
+- `nakago-async-graphql` - Upgrade Axum to v0.8 and async-graphql to a git branch for compatibility.
+- _(all packages)_ - Other minor dependency updates.
+
 ## [0.24.1]
 
 ### Changed
 
-- (all packages) - Remove the `git = "<https://github.com/cksac/fake-rs.git>"` parameter from the `fake` dependency, as it is no longer needed.
+- _(all packages)_ - Remove the `git = "<https://github.com/cksac/fake-rs.git>"` parameter from the `fake` dependency, as it is no longer needed.
 - `nakago-axum` - Change `std::panic::PanicInfo` to `std::panic::PanicHookInfo`
 
 ## [0.24.0]
@@ -409,7 +419,8 @@ Expect major changes to the Application and Lifecycle systems going forward, bui
 - Injection Providers
 - Documentation
 
-[unreleased]: https://github.com/bkonkle/nakago/compare/0.24.1...HEAD
+[unreleased]: https://github.com/bkonkle/nakago/compare/0.25.0...HEAD
+[0.25.0]: https://github.com/bkonkle/nakago/compare/0.24.1...0.25.0
 [0.24.1]: https://github.com/bkonkle/nakago/compare/0.24.0...0.24.1
 [0.24.0]: https://github.com/bkonkle/nakago/compare/0.22.0...0.24.0
 [0.23.0]: https://github.com/bkonkle/nakago/compare/0.22.0...0.23.0

examples/async-graphql/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nakago-examples-async-graphql"
-version = "0.24.1"
+version = "0.25.0"
 description = "A lightweight Rust toolkit for sharp dependency injection 😎"
 license.workspace = true
 edition.workspace = true
@@ -15,27 +15,27 @@ integration = []
 
 [dependencies]
 anyhow = "1.0"
-async-graphql = { git = "https://github.com/bkonkle/async-graphql.git", branch = "update-http-axum", features = [
+async-graphql = { git = "https://github.com/aumetra/async-graphql", branch = "axum-0.8", features = [
     "chrono",
     "dataloader",
 ] }
-async-graphql-axum = { git = "https://github.com/bkonkle/async-graphql.git", branch = "update-http-axum" }
+async-graphql-axum = { git = "https://github.com/aumetra/async-graphql", branch = "axum-0.8" }
 async-trait = "0.1"
-axum = { version = "0.7", features = ["ws", "macros"] }
+axum = { version = "0.8", features = ["ws", "macros"] }
 chrono = { version = "0.4.19", features = ["serde"] }
 derive-new = "0.7"
-fake = { version = "2.9", features = ['derive', 'chrono', 'http', 'uuid'] }
+fake = { version = "3.1", features = ['derive', 'chrono', 'http', 'uuid'] }
 figment = { version = "0.10", features = ["env", "toml", "yaml", "json"] }
 futures = "0.3"
 hyper = "1.0"
 log = "0.4"
-nakago-async-graphql = "0.24"
-nakago-axum = "0.24"
-nakago-derive = "0.23"
-nakago-figment = "0.23"
-nakago-sea-orm = "0.23"
-nakago-ws = "0.24"
-nakago = "0.23"
+nakago-async-graphql = "0.25"
+nakago-axum = "0.25"
+nakago-derive = "0.25"
+nakago-figment = "0.25"
+nakago-sea-orm = "0.25"
+nakago-ws = "0.25"
+nakago = "0.25"
 oso = "0.27"
 pico-args = "0.5.0"
 pretty_env_logger = "0.5"
@@ -66,5 +66,5 @@ hyper-tls = "0.6"
 maplit = { version = "1" }
 mockall = "0.13"
 pretty_assertions = "1.2"
-tokio-tungstenite = { version = "0.24", features = ["url"] }
+tokio-tungstenite = { version = "0.26", features = ["url"] }
 url = "2.0.0"

examples/async-graphql/src/domains/episodes/loaders.rs

@@ -18,7 +18,6 @@ pub struct Loader {
     episodes: Arc<Box<dyn Service>>,
 }
 
-#[async_trait]
 impl dataloader::Loader<String> for Loader {
     type Value = Episode;
     type Error = FieldError;

examples/async-graphql/src/domains/profiles/loaders.rs

@@ -18,7 +18,6 @@ pub struct Loader {
     profiles: Arc<Box<dyn Service>>,
 }
 
-#[async_trait]
 impl dataloader::Loader<String> for Loader {
     type Value = Profile;
     type Error = FieldError;

examples/async-graphql/src/domains/role_grants/loaders.rs

@@ -18,7 +18,6 @@ pub struct Loader {
     role_grants: Arc<Box<dyn Service>>,
 }
 
-#[async_trait]
 impl dataloader::Loader<String> for Loader {
     type Value = RoleGrant;
     type Error = FieldError;

examples/async-graphql/src/domains/shows/loaders.rs

@@ -18,7 +18,6 @@ pub struct Loader {
     shows: Arc<Box<dyn Service>>,
 }
 
-#[async_trait]
 impl dataloader::Loader<String> for Loader {
     type Value = Show;
     type Error = FieldError;

examples/async-graphql/src/domains/users/loaders.rs

@@ -18,7 +18,6 @@ pub struct Loader {
     locations: Arc<Box<dyn Service>>,
 }
 
-#[async_trait]
 impl dataloader::Loader<String> for Loader {
     type Value = User;
     type Error = FieldError;

examples/async-graphql/src/events/messages.rs

@@ -42,6 +42,10 @@ pub enum OutgoingMessage {
 
 impl From<OutgoingMessage> for Message {
     fn from(msg: OutgoingMessage) -> Message {
-        Message::Text(serde_json::to_string(&msg).expect("Unable to serialize OutgoingMessage"))
+        Message::Text(
+            serde_json::to_string(&msg)
+                .expect("Unable to serialize OutgoingMessage")
+                .into(),
+        )
     }
 }

examples/async-graphql/tests/test_events_integration.rs

@@ -20,7 +20,7 @@ async fn test_ping() -> Result<()> {
     let message = serde_json::to_string(&IncomingMessage::Ping)?;
 
     utils
-        .send_message(Message::Text(message), Some(&token), |read| {
+        .send_message(Message::Text(message.into()), Some(&token), |read| {
             read.take(1).for_each(|message| async {
                 let data = message.unwrap().into_data();
                 let result = std::str::from_utf8(&data).unwrap();

examples/cqrs-es/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nakago-examples-cqrs-es"
-version = "0.24.1"
+version = "0.25.0"
 description = "A lightweight Rust toolkit for sharp dependency injection 😎"
 license.workspace = true
 edition.workspace = true
@@ -16,10 +16,10 @@ pretty_env_logger = "0.5"
 serde = { version = "1.0", features = ["derive"] }
 serde_derive = "1.0"
 serde_json = "1.0"
-nakago = "0.23"
+nakago = "0.25"
 
 [dev-dependencies]
 criterion = "0.5"
-fake = { version = "2.9", features = ['derive', 'chrono', 'http', 'uuid'] }
+fake = { version = "3.1", features = ['derive', 'chrono', 'http', 'uuid'] }
 mockall = "0.13"
 pretty_assertions = "1.2"

examples/simple-warp/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nakago-examples-simple-warp"
-version = "0.24.1"
+version = "0.25.0"
 description = "A lightweight Rust toolkit for sharp dependency injection 😎"
 license.workspace = true
 edition.workspace = true
@@ -17,15 +17,15 @@ integration = []
 anyhow = "1.0"
 async-trait = "0.1"
 chrono = { version = "0.4.19", features = ["serde"] }
-fake = { version = "2.9", features = ['derive', 'chrono', 'http', 'uuid'] }
+fake = { version = "3.1", features = ['derive', 'chrono', 'http', 'uuid'] }
 figment = { version = "0.10", features = ["env", "toml", "yaml", "json"] }
 futures = "0.3"
 hyper = "1.0"
 log = "0.4"
-nakago = "0.23"
-nakago-figment = "0.23"
-nakago-warp = "0.23"
-nakago-derive = "0.23"
+nakago = "0.25"
+nakago-figment = "0.25"
+nakago-warp = "0.25"
+nakago-derive = "0.25"
 pico-args = "0.5.0"
 pretty_env_logger = "0.5"
 rand = "0.8"

examples/simple/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nakago-examples-simple"
-version = "0.24.1"
+version = "0.25.0"
 description = "A lightweight Rust toolkit for sharp dependency injection 😎"
 license.workspace = true
 edition.workspace = true
@@ -16,17 +16,17 @@ integration = []
 [dependencies]
 anyhow = "1.0"
 async-trait = "0.1"
-axum = { version = "0.7", features = ["ws", "macros"] }
+axum = { version = "0.8", features = ["ws", "macros"] }
 chrono = { version = "0.4.19", features = ["serde"] }
-fake = { version = "2.9", features = ['derive', 'chrono', 'http', 'uuid'] }
+fake = { version = "3.1", features = ['derive', 'chrono', 'http', 'uuid'] }
 figment = { version = "0.10", features = ["env", "toml", "yaml", "json"] }
 futures = "0.3"
 hyper = "1.0"
 log = "0.4"
-nakago = "0.23"
-nakago-axum = "0.24"
-nakago-derive = "0.23"
-nakago-figment = "0.23"
+nakago = "0.25"
+nakago-axum = "0.25"
+nakago-derive = "0.25"
+nakago-figment = "0.25"
 pico-args = "0.5.0"
 pretty_env_logger = "0.5"
 rand = "0.8"

nakago/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nakago"
-version = "0.24.1"
+version = "0.25.0"
 description = "A lightweight Rust toolkit for sharp dependency injection 😎"
 documentation = "https://docs.rs/nakago/"
 license.workspace = true
@@ -17,20 +17,20 @@ derive-new = "0.7"
 fnv = "1.0.7"
 futures = "0.3.28"
 log = "0.4"
-nakago-derive = "0.23"
+nakago-derive = "0.25"
 pretty_env_logger = "0.5"
 rand = "0.8"
 serde = { version = "1.0", features = ["derive"] }
 serde_derive = "1.0"
 serde_json = "1.0"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["fmt", "env-filter"] }
-thiserror = "1.0"
+thiserror = "2.0"
 tokio = { version = "1", features = ["full"] }
 
 [dev-dependencies]
 criterion = "0.5"
-fake = { version = "2.9", features = ['derive', 'chrono', 'http', 'uuid'] }
+fake = { version = "3.1", features = ['derive', 'chrono', 'http', 'uuid'] }
 mockall = "0.13"
 pretty_assertions = "1.2"
-googletest = "0.12"
+googletest = "0.13"

nakago/src/errors.rs

@@ -36,7 +36,7 @@ pub enum Error {
     Provider(#[from] Box<provider::Error>),
 
     /// An error thrown when an Any type cannot be downcast to the given concrete type
-    #[error("{0} was not able to be downcast to {}", .0.type_name)]
+    #[error("{} was not able to be downcast to {}", .0, .0.type_name)]
     TypeMismatch(
         /// The Key of the entity that was not found
         Key,

nakago_async_graphql/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nakago-async-graphql"
-version = "0.24.1"
+version = "0.25.0"
 description = "An Async-GraphQL integration for Nakago"
 documentation = "https://docs.rs/nakago-async-graphql/"
 license.workspace = true
@@ -11,29 +11,29 @@ homepage.workspace = true
 
 [dependencies]
 anyhow = "1.0"
-async-graphql = { version = "6.0", git = "https://github.com/bkonkle/async-graphql.git", branch = "update-http-axum", features = [
+async-graphql = { git = "https://github.com/aumetra/async-graphql", branch = "axum-0.8", features = [
     "chrono",
     "dataloader",
 ] }
-async-graphql-axum = { version = "6.0", git = "https://github.com/bkonkle/async-graphql.git", branch = "update-http-axum" }
+async-graphql-axum = { git = "https://github.com/aumetra/async-graphql", branch = "axum-0.8" }
 async-trait = "0.1"
-axum = { version = "0.7", features = ["macros"] }
+axum = { version = "0.8", features = ["macros"] }
 derive-new = "0.7"
-fake = { version = "2.9", features = ['derive', 'chrono', 'http', 'uuid'] }
+fake = { version = "3.1", features = ['derive', 'chrono', 'http', 'uuid'] }
 figment = { version = "0.10", features = ["env"] }
 hyper = "1.0"
 log = "0.4"
-nakago = "0.23"
-nakago-axum = "0.24"
-nakago-derive = "0.23"
-nakago-figment = "0.23"
+nakago = "0.25"
+nakago-axum = "0.25"
+nakago-derive = "0.25"
+nakago-figment = "0.25"
 pretty_env_logger = "0.5"
 rand = "0.8"
 reqwest = { version = "0.12", features = ["json"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_derive = "1.0"
 serde_json = "1.0"
-thiserror = "1.0"
+thiserror = "2.0"
 tokio = { version = "1", features = ["full"] }
 tracing = "0.1"
 

nakago_axum/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nakago-axum"
-version = "0.24.1"
+version = "0.25.0"
 description = "An Axum HTTP routes integration for Nakago"
 documentation = "https://docs.rs/nakago-axum/"
 license.workspace = true
@@ -12,13 +12,13 @@ homepage.workspace = true
 [dependencies]
 anyhow = "1.0"
 async-trait = "0.1"
-axum = { version = "0.7", features = ["ws", "macros"] }
+axum = { version = "0.8", features = ["ws", "macros"] }
 backtrace = "0.3"
 biscuit = "0.7.0"
 bytes = "1"
 crossterm = "0.28"
 derive-new = "0.7"
-fake = { version = "2.9", features = ['derive', 'chrono', 'http', 'uuid'] }
+fake = { version = "3.1", features = ['derive', 'chrono', 'http', 'uuid'] }
 figment = { version = "0.10", features = ["env"] }
 futures-util = { version = "0.3", default-features = false, features = [
     "sink",
@@ -27,17 +27,17 @@ futures-util = { version = "0.3", default-features = false, features = [
 hyper = "1.0"
 jsonwebtoken = "9.0"
 log = "0.4"
-nakago = "0.23"
-nakago-derive = "0.23"
-nakago-figment = "0.23"
+nakago = "0.25"
+nakago-derive = "0.25"
+nakago-figment = "0.25"
 pretty_env_logger = "0.5"
 rand = "0.8"
 reqwest = { version = "0.12", features = ["json"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_derive = "1.0"
 serde_json = "1.0"
-thiserror = "1.0"
-tower-http = { version = "0.5", features = ["trace"] }
+thiserror = "2.0"
+tower-http = { version = "0.6", features = ["trace"] }
 tokio = { version = "1", features = ["full"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["fmt", "env-filter"] }

nakago_axum/src/auth/claims.rs

@@ -1,6 +1,5 @@
 use std::{any::Any, marker::PhantomData};
 
-use async_trait::async_trait;
 use axum::{
     extract::FromRequestParts,
     http::{request::Parts, HeaderValue},
@@ -31,7 +30,6 @@ pub struct Token<PrivateClaims: Default = Empty> {
 
 /// Implement the Axum FromRequestParts trait, allowing the `Subject` to be used as an Axum
 /// extractor.
-#[async_trait]
 impl<PrivateClaims> FromRequestParts<State> for Token<PrivateClaims>
 where
     PrivateClaims: Default + Clone + Serialize + for<'de> Deserialize<'de> + Send + Sync + Any,
@@ -73,7 +71,6 @@ pub struct Subject<PrivateClaims = Empty> {
 
 /// Implement the Axum FromRequestParts trait, allowing the `Subject` to be used as an Axum
 /// extractor.
-#[async_trait]
 impl<PrivateClaims: Any> FromRequestParts<State> for Subject<PrivateClaims> {
     type Rejection = Error;