feat(aide, axum-jsonschema, aide-axum-sqlx-tx): axum 0.7 support

Author: tamasfe

Cargo.toml

@@ -1,2 +1,3 @@
 [workspace]
 members = ["crates/*", "examples/*"]
+resolver = "2"

crates/aide-axum-sqlx-tx/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aide-axum-sqlx-tx"
-version = "0.12.0"
+version = "0.13.0"
 edition = "2021"
 resolver = "2"
 authors = ["Wicpar"]
@@ -13,7 +13,7 @@ readme = "README.md"
 [dependencies]
 sqlx-06 = { package = "axum-sqlx-tx", version = "0.5.0", optional = true }
 sqlx-07 = { package = "axum-sqlx-tx", version = "0.6.0", optional = true }
-aide = { version = "0.12.0", path = "../aide" }
+aide = { version = "0.13.0", path = "../aide" }
 
 [dev-dependencies]
 sqlx = { version = "^0.7", features = ["postgres"] }

crates/aide/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aide"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["tamasfe"]
 edition = "2021"
 keywords = ["generate", "api", "openapi", "documentation", "specification"]
@@ -10,8 +10,8 @@ description = "A code-first API documentation library"
 readme = "README.md"
 
 [dependencies]
-indexmap = { version = "1", features = ["serde"] }
-schemars = { version = "0.8", features = ["impl_json_schema", "indexmap"] }
+indexmap = { version = "2.1", features = ["serde"] }
+schemars = { version = "0.8.16", features = ["impl_json_schema", "indexmap2"] }
 serde = "1"
 serde_json = "1"
 thiserror = "1"
@@ -20,26 +20,26 @@ aide-macros = { version = "0.7.0", path = "../aide-macros", optional = true }
 derive_more = "0.99.17"
 
 bytes = { version = "1", optional = true }
-http = { version = "0.2", optional = true }
+http = { version = "1.0.0", optional = true }
 
-axum = { version = "0.6.0", optional = true }
-axum-extra = { version = "0.7.3", optional = true }
+axum = { version = "0.7.1", optional = true }
+axum-extra = { version = "0.9.0", optional = true }
 tower-layer = { version = "0.3", optional = true }
 tower-service = { version = "0.3", optional = true }
 cfg-if = "1.0.0"
 
 
 # custom axum extractors
 serde_qs = { version = "0.12.0", optional = true }
-jwt-authorizer = { version = "0.10", default-features = false, optional = true }
+jwt-authorizer = { version = "0.13", default-features = false, optional = true }
 
 [features]
 macros = ["dep:aide-macros"]
 redoc = []
 skip_serializing_defaults = []
 
 axum = ["dep:axum", "bytes", "http", "dep:tower-layer", "dep:tower-service", "serde_qs?/axum"]
-axum-headers = ["axum/headers"]
+# axum-headers = ["axum/headers"]
 axum-ws = ["axum/ws"]
 axum-multipart = ["axum/multipart"]
 axum-extra = ["axum", "dep:axum-extra"]

crates/aide/src/axum/inputs.rs

@@ -6,9 +6,12 @@ use crate::{
     },
     operation::{add_parameters, set_body},
 };
-use axum::extract::{
-    BodyStream, ConnectInfo, Extension, Form, Host, Json, MatchedPath, OriginalUri, Path, Query,
-    RawBody, RawQuery, State,
+use axum::{
+    body::Body,
+    extract::{
+        ConnectInfo, Extension, Form, Host, Json, MatchedPath, OriginalUri, Path, Query, RawQuery,
+        State,
+    },
 };
 use indexmap::IndexMap;
 use schemars::{
@@ -24,11 +27,10 @@ use crate::{
 
 impl<T> OperationInput for Extension<T> {}
 impl<T> OperationInput for State<T> {}
-impl OperationInput for BodyStream {}
 impl<T> OperationInput for ConnectInfo<T> {}
 impl OperationInput for MatchedPath {}
 impl OperationInput for OriginalUri {}
-impl OperationInput for RawBody {}
+impl OperationInput for Body {}
 impl OperationInput for RawQuery {}
 impl OperationInput for Host {}