chore: update axum examples to axum 0.7

shuttle-hq · Jan 3, 2024 · 46dd853 · 46dd853
1 parent e3bec67
commit 46dd853
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 29 deletions.
diff --git a/axum/hello-world/Cargo.toml b/axum/hello-world/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-axum = "0.6.20"
+axum = "0.7.3"
 shuttle-axum = "0.35.0"
 shuttle-runtime = "0.35.0"
 tokio = "1.28.2"

diff --git a/axum/jwt-authentication/Cargo.toml b/axum/jwt-authentication/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-axum = { version = "0.6.18", features = ["headers"] }
+axum = { version = "0.7.3", features = ["headers"] }
 jsonwebtoken = "8.3.0"
 once_cell = "1.18.0"
 serde = { version = "1.0.188", features = ["derive"] }

diff --git a/axum/metadata/Cargo.toml b/axum/metadata/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-axum = "0.6.18"
+axum = "0.7.3"
 shuttle-axum = "0.35.0"
 shuttle-runtime = "0.35.0"
 shuttle-metadata = "0.35.0"

diff --git a/axum/postgres/Cargo.toml b/axum/postgres/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-axum = "0.6.18"
+axum = "0.7.3"
 serde = { version = "1.0.188", features = ["derive"] }
 shuttle-axum = "0.35.0"
 shuttle-runtime = "0.35.0"

diff --git a/axum/static-files/Cargo.toml b/axum/static-files/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 publish = false
 
 [dependencies]
-axum = "0.6.18"
+axum = "0.7.3"
 shuttle-axum = "0.35.0"
 shuttle-runtime = "0.35.0"
 tokio = "1.28.2"
-tower-http = { version = "0.4.0", features = ["fs"] }
+tower-http = { version = "0.5.0", features = ["fs"] }
diff --git a/axum/static-next-server/Cargo.toml b/axum/static-next-server/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 publish = false
 
 [dependencies]
-axum = "0.6.10"
-axum-extra = { version = "0.4.2", features = ["spa"] }
+axum = "0.7.3"
 shuttle-axum = "0.35.0"
 shuttle-runtime = "0.35.0"
 tokio = "1.26.0"
+tower-http = { version = "0.5.0", features = ["fs"] }
diff --git a/axum/static-next-server/src/main.rs b/axum/static-next-server/src/main.rs
@@ -1,12 +1,12 @@
-use std::path::PathBuf;
-
 use axum::Router;
-use axum_extra::routing::SpaRouter;
+use tower_http::services::{ServeDir, ServeFile};
 
 #[shuttle_runtime::main]
 async fn axum() -> shuttle_axum::ShuttleAxum {
-    let router =
-        Router::new().merge(SpaRouter::new("/", PathBuf::from("static")).index_file("index.html"));
+    let router = Router::new().nest_service(
+        "/",
+        ServeDir::new("static").not_found_service(ServeFile::new("static/index.html")),
+    );
 
     Ok(router.into())
 }
diff --git a/axum/turso/Cargo.toml b/axum/turso/Cargo.toml
@@ -4,11 +4,11 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-axum = { version = "0.6.18" }
-shuttle-axum = { version = "0.35.0" }
-shuttle-runtime = { version = "0.35.0" }
-shuttle-turso = { version = "0.35.0" }
+axum = "0.7.3"
+shuttle-axum = "0.35.0"
+shuttle-runtime = "0.35.0"
+shuttle-turso = "0.35.0"
 libsql-client = "0.31.0"
-tokio = { version = "1.26.0" }
+tokio = "1.26.0"
 serde = { version = "1.0.164", features = ["derive"] }
 serde_json = "1.0.99"
diff --git a/axum/websocket/Cargo.toml b/axum/websocket/Cargo.toml
@@ -4,14 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-axum = { version = "0.6.18", features = ["ws"] }
+axum = { version = "0.7.3", features = ["ws"] }
 chrono = { version = "0.4.26", features = ["serde"] }
 futures = "0.3.28"
-hyper = { version = "0.14.26", features = ["client", "http2"] }
-hyper-tls = "0.5.0"
+reqwest = "0.11.23"
 serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
 shuttle-axum = "0.35.0"
 shuttle-runtime = "0.35.0"
 tokio = "1.28.2"
-tower-http = { version = "0.4.0", features = ["fs"] }
+tower-http = { version = "0.5.0", features = ["fs"] }
diff --git a/axum/websocket/src/main.rs b/axum/websocket/src/main.rs
@@ -11,8 +11,6 @@ use axum::{
 };
 use chrono::{DateTime, Utc};
 use futures::{SinkExt, StreamExt};
-use hyper::{Client, Uri};
-use hyper_tls::HttpsConnector;
 use serde::Serialize;
 use shuttle_axum::ShuttleAxum;
 use tokio::{
@@ -50,12 +48,9 @@ async fn axum() -> ShuttleAxum {
     let state_send = state.clone();
     tokio::spawn(async move {
         let duration = Duration::from_secs(PAUSE_SECS);
-        let https = HttpsConnector::new();
-        let client = Client::builder().build::<_, hyper::Body>(https);
-        let uri: Uri = STATUS_URI.parse().unwrap();
 
         loop {
-            let is_up = client.get(uri.clone()).await;
+            let is_up = reqwest::get(STATUS_URI).await;
             let is_up = is_up.is_ok();
 
             let response = Response {

diff --git a/axum/with-state/Cargo.toml b/axum/with-state/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-axum = "0.6.10"
+axum = "0.7.3"
 shuttle-axum = "0.35.0"
 shuttle-runtime = "0.35.0"
 tokio = "1.26.0"