Support axum 0.7

axum/starwars/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 async-graphql = { path = "../../.." }
 async-graphql-axum = { path = "../../../integrations/axum" }
-tokio = { version = "1.8", features = ["macros", "rt-multi-thread"] }
+tokio = { version = "1.34.0", features = ["macros", "rt-multi-thread"] }
 starwars = { path = "../../models/starwars" }
-hyper = "0.14"
-axum = { version = "0.6.0", features = ["headers"] }
+hyper = "1.0.1"
+axum = { version = "0.7.1" }

axum/starwars/src/main.rs

@@ -3,8 +3,9 @@ use async_graphql_axum::GraphQL;
 use axum::{
     response::{self, IntoResponse},
     routing::get,
-    Router, Server,
+    Router,
 };
+use tokio::net::TcpListener;
 use starwars::{QueryRoot, StarWars};
 
 async fn graphiql() -> impl IntoResponse {
@@ -21,8 +22,8 @@ async fn main() {
 
     println!("GraphiQL IDE: http://localhost:8000");
 
-    Server::bind(&"127.0.0.1:8000".parse().unwrap())
-        .serve(app.into_make_service())
+    let listener = TcpListener::bind("127.0.0.1:8000").await.unwrap();
+    axum::serve(listener, app.into_make_service())
         .await
         .unwrap();
 }

axum/subscription/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 async-graphql = { path = "../../.." }
 async-graphql-axum = { path = "../../../integrations/axum" }
-tokio = { version = "1.8", features = ["macros", "rt-multi-thread"] }
+tokio = { version = "1.34.0", features = ["macros", "rt-multi-thread"] }
 books = { path = "../../models/books" }
-hyper = "0.14"
-axum = { version = "0.6.0", features = ["ws", "headers"] }
+hyper = "1.0.1"
+axum = { version = "0.7.1", features = ["ws"] }

axum/subscription/src/main.rs

@@ -3,8 +3,9 @@ use async_graphql_axum::{GraphQL, GraphQLSubscription};
 use axum::{
     response::{self, IntoResponse},
     routing::get,
-    Router, Server,
+    Router
 };
+use tokio::net::TcpListener;
 use books::{MutationRoot, QueryRoot, Storage, SubscriptionRoot};
 
 async fn graphiql() -> impl IntoResponse {
@@ -31,8 +32,8 @@ async fn main() {
 
     println!("GraphiQL IDE: http://localhost:8000");
 
-    Server::bind(&"127.0.0.1:8000".parse().unwrap())
-        .serve(app.into_make_service())
+    let listener = TcpListener::bind("127.0.0.1:8000").await.unwrap();
+    axum::serve(listener, app.into_make_service())
         .await
         .unwrap();
 }

axum/token-from-header/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 async-graphql = { path = "../../.." }
 async-graphql-axum = { path = "../../../integrations/axum" }
-tokio = { version = "1.8", features = ["macros", "rt-multi-thread"] }
+tokio = { version = "1.34.0", features = ["macros", "rt-multi-thread"] }
 token = { path = "../../models/token" }
-hyper = "0.14"
-axum = { version = "0.6.0", features = ["ws", "headers"] }
+hyper = "1.0.1"
+axum = { version = "0.7.1", features = ["ws"] }

axum/token-from-header/src/main.rs

@@ -8,8 +8,9 @@ use axum::{
     http::header::HeaderMap,
     response::{Html, IntoResponse, Response},
     routing::get,
-    Router, Server,
+    Router,
 };
+use tokio::net::TcpListener;
 use token::{on_connection_init, QueryRoot, SubscriptionRoot, Token, TokenSchema};
 
 async fn graphql_playground() -> impl IntoResponse {
@@ -61,8 +62,8 @@ async fn main() {
 
     println!("Playground: http://localhost:8000");
 
-    Server::bind(&"127.0.0.1:8000".parse().unwrap())
-        .serve(app.into_make_service())
+    let listener = TcpListener::bind("127.0.0.1:8000").await.unwrap();
+    axum::serve(listener, app.into_make_service())
         .await
         .unwrap();
 }

axum/upload/Cargo.toml

@@ -7,8 +7,8 @@ edition = "2021"
 [dependencies]
 async-graphql = { path = "../../.." }
 async-graphql-axum = { path = "../../../integrations/axum" }
-axum = "0.6.0"
+axum = "0.7.1"
 files = { path = "../../models/files" }
-tokio = { version = "1.8", features = ["macros", "rt-multi-thread"] }
-hyper = "0.14"
-tower-http = { version = "0.2.1", features = ["cors"] }
+tokio = { version = "1.34.0", features = ["macros", "rt-multi-thread"] }
+hyper = "1.0.1"
+tower-http = { version = "0.5.0", features = ["cors"] }

axum/upload/src/main.rs

@@ -6,8 +6,9 @@ use axum::{
     Router,
 };
 use files::{MutationRoot, QueryRoot, Storage};
-use hyper::{Method, Server};
-use tower_http::cors::{CorsLayer, Origin};
+use hyper::Method;
+use tower_http::cors::{CorsLayer, AllowOrigin};
+use tokio::net::TcpListener;
 
 async fn graphiql() -> impl IntoResponse {
     Html(GraphiQLSource::build().endpoint("/").finish())
@@ -25,12 +26,12 @@ async fn main() {
         .route("/", get(graphiql).post_service(GraphQL::new(schema)))
         .layer(
             CorsLayer::new()
-                .allow_origin(Origin::predicate(|_, _| true))
+                .allow_origin(AllowOrigin::predicate(|_, _| true))
                 .allow_methods(vec![Method::GET, Method::POST]),
         );
 
-    Server::bind(&"127.0.0.1:8000".parse().unwrap())
-        .serve(app.into_make_service())
+    let listener = TcpListener::bind("127.0.0.1:8000").await.unwrap();
+    axum::serve(listener, app.into_make_service())
         .await
         .unwrap();
 }