Skip to content

chore: merge develop into main for v0.51.0 #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 10, 2025
Merged

chore: merge develop into main for v0.51.0 #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
329476d
feat: rewrite url shortener with pg opendal
jonaro00 Jan 8, 2025
76a329c
fix: feature name
jonaro00 Jan 8, 2025
68cc8ca
feat: use axum 0.7/0.8 feature flags (#200)
jonaro00 Jan 9, 2025
9408571
url shortener use serde json operator
jonaro00 Jan 9, 2025
d1a69ab
chore: bump salvo examples
jonaro00 Jan 9, 2025
734deae
fix: bump opendal-memory example
jonaro00 Jan 9, 2025
6fece5f
chore: v0.51.0
jonaro00 Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions actix-web/clerk/backend/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ clerk-rs = "0.2.3"
openssl-sys = { version = "0.9.9", features = ["vendored"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
shuttle-actix-web = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-actix-web = "0.51.0"
shuttle-runtime = "0.51.0"
4 changes: 2 additions & 2 deletions actix-web/cookie-authentication/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ edition = "2021"
actix-identity = "0.7.1"
actix-session = { version = "0.9.0", features = ["cookie-session"] }
actix-web = "4.3.1"
shuttle-actix-web = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-actix-web = "0.51.0"
shuttle-runtime = "0.51.0"
tokio = "1.26.0"
4 changes: 2 additions & 2 deletions actix-web/hello-world/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ edition = "2021"

[dependencies]
actix-web = "4.3.1"
shuttle-actix-web = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-actix-web = "0.51.0"
shuttle-runtime = "0.51.0"
tokio = "1.26.0"
6 changes: 3 additions & 3 deletions actix-web/postgres/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ edition = "2021"

[dependencies]
actix-web = "4.3.1"
shuttle-actix-web = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-actix-web = "0.51.0"
shuttle-runtime = "0.51.0"
serde = "1.0.148"
shuttle-shared-db = { version = "0.50.0", features = ["postgres", "sqlx"] }
shuttle-shared-db = { version = "0.51.0", features = ["postgres", "sqlx"] }
sqlx = "0.8.2"
tokio = "1.26.0"
4 changes: 2 additions & 2 deletions actix-web/static-files/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ edition = "2021"
[dependencies]
actix-files = "0.6.2"
actix-web = "4.3.1"
shuttle-actix-web = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-actix-web = "0.51.0"
shuttle-runtime = "0.51.0"
tokio = "1.26.0"
4 changes: 2 additions & 2 deletions actix-web/websocket-actorless/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ futures = "0.3"
reqwest = "0.11"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
shuttle-actix-web = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-actix-web = "0.51.0"
shuttle-runtime = "0.51.0"
tokio = { version = "1", features = ["rt-multi-thread", "sync"] }
tracing = "0.1"
6 changes: 3 additions & 3 deletions axum/hello-world/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"

[dependencies]
axum = "0.7.4"
shuttle-axum = "0.50.0"
shuttle-runtime = "0.50.0"
axum = "0.8.1"
shuttle-axum = "0.51.0"
shuttle-runtime = "0.51.0"
tokio = "1.28.2"
6 changes: 3 additions & 3 deletions axum/htmx-crud/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ askama_axum = "0.4.0"
axum = "0.7.4"
serde = { version = "1.0.189", features = ["derive"] }
serde_json = "1.0.107"
shuttle-axum = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-shared-db = { version = "0.50.0", features = ["postgres", "sqlx"] }
shuttle-axum = { version = "0.51.0", default-features = false, features = ["axum-0-7"] }
shuttle-runtime = "0.51.0"
shuttle-shared-db = { version = "0.51.0", features = ["postgres", "sqlx"] }
sqlx = "0.8.2"
tokio = "1.28.2"
tokio-stream = { version = "0.1.14", features = ["sync"] }
4 changes: 2 additions & 2 deletions axum/jwt-authentication/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jsonwebtoken = "8.3.0"
once_cell = "1.18.0"
serde = { version = "1.0.188", features = ["derive"] }
serde_json = "1.0.107"
shuttle-axum = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-axum = { version = "0.51.0", default-features = false, features = ["axum-0-7"] }
shuttle-runtime = "0.51.0"
tokio = "1.28.2"
tracing-subscriber = "0.3.17"
4 changes: 2 additions & 2 deletions axum/metadata/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ edition = "2021"

[dependencies]
axum = "0.7.3"
shuttle-axum = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-axum = { version = "0.51.0", default-features = false, features = ["axum-0-7"] }
shuttle-runtime = "0.51.0"
tokio = "1.28.2"
6 changes: 3 additions & 3 deletions axum/oauth2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ chrono = { version = "0.4.35", features = ["clock"] }
oauth2 = "4.4.1"
reqwest = { version = "0.11.18", features = ["json"] }
serde = { version = "1.0.183", features = ["derive"] }
shuttle-axum = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-shared-db = { version = "0.50.0", features = ["postgres", "sqlx"] }
shuttle-axum = { version = "0.51.0", default-features = false, features = ["axum-0-7"] }
shuttle-runtime = "0.51.0"
shuttle-shared-db = { version = "0.51.0", features = ["postgres", "sqlx"] }
sqlx = { version = "0.8.2", features = ["macros", "chrono"] }
thiserror = "1.0.57"
time = "0.3.25"
Expand Down
8 changes: 4 additions & 4 deletions axum/openai/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ sqlx = { version = "0.8.2", features = [
] }
tokio = { version = "1.28.2", features = ["macros", "rt-multi-thread"] }
tower-http = { version = "0.6.2", features = ["cors", "fs"] }
shuttle-runtime = "0.50.0"
shuttle-axum = "0.50.0"
shuttle-shared-db = { version = "0.50.0", features = ["postgres"] }
shuttle-openai = "0.50.0"
shuttle-runtime = "0.51.0"
shuttle-axum = { version = "0.51.0", default-features = false, features = ["axum-0-7"] }
shuttle-shared-db = { version = "0.51.0", features = ["postgres"] }
shuttle-openai = "0.51.0"
6 changes: 3 additions & 3 deletions axum/postgres/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ edition = "2021"
[dependencies]
axum = "0.7.3"
serde = { version = "1.0.188", features = ["derive"] }
shuttle-axum = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-shared-db = { version = "0.50.0", features = ["postgres", "sqlx"] }
shuttle-axum = { version = "0.51.0", default-features = false, features = ["axum-0-7"] }
shuttle-runtime = "0.51.0"
shuttle-shared-db = { version = "0.51.0", features = ["postgres", "sqlx"] }
sqlx = "0.8.2"
tokio = "1.28.2"
6 changes: 3 additions & 3 deletions axum/qdrant/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
[dependencies]
axum = "0.7.3"
qdrant-client = "1.10.1"
shuttle-axum = "0.50.0"
shuttle-qdrant = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-axum = { version = "0.51.0", default-features = false, features = ["axum-0-7"] }
shuttle-qdrant = "0.51.0"
shuttle-runtime = "0.51.0"
tokio = "1.26.0"
4 changes: 2 additions & 2 deletions axum/static-files/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish = false

[dependencies]
axum = "0.7.3"
shuttle-axum = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-axum = { version = "0.51.0", default-features = false, features = ["axum-0-7"] }
shuttle-runtime = "0.51.0"
tokio = "1.28.2"
tower-http = { version = "0.5.0", features = ["fs"] }
6 changes: 3 additions & 3 deletions axum/turso/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ edition = "2021"

[dependencies]
axum = "0.7.3"
shuttle-axum = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-turso = "0.50.0"
shuttle-axum = { version = "0.51.0", default-features = false, features = ["axum-0-7"] }
shuttle-runtime = "0.51.0"
shuttle-turso = "0.51.0"
libsql = "0.6.0"
tokio = "1.26.0"
serde = { version = "1.0.164", features = ["derive"] }
Expand Down
4 changes: 2 additions & 2 deletions axum/websocket/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ futures = "0.3.28"
reqwest = "0.11.23"
serde = { version = "1.0.163", features = ["derive"] }
serde_json = "1.0.96"
shuttle-axum = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-axum = { version = "0.51.0", default-features = false, features = ["axum-0-7"] }
shuttle-runtime = "0.51.0"
tokio = "1.28.2"
tower-http = { version = "0.5.0", features = ["fs"] }
4 changes: 2 additions & 2 deletions bevy/hello-world/server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2021"

[dependencies]
axum = "0.7.4"
shuttle-axum = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-axum = { version = "0.51.0", default-features = false, features = ["axum-0-7"] }
shuttle-runtime = "0.51.0"
tokio = "1.28.2"
tower-http = { version = "0.5.0", features = ["fs"] }
6 changes: 3 additions & 3 deletions custom-resource/pdo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2021"
async-trait = "0.1.56"
axum = "0.7.3"
serde = { version = "1", features = ["derive"] }
shuttle-service = "0.50.0"
shuttle-axum = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-service = "0.51.0"
shuttle-axum = { version = "0.51.0", default-features = false, features = ["axum-0-7"] }
shuttle-runtime = "0.51.0"
tokio = "1.28.2"
2 changes: 1 addition & 1 deletion custom-service/none/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ edition = "2021"
publish = false

[dependencies]
shuttle-runtime = "0.50.0"
shuttle-runtime = "0.51.0"
tokio = "1"
4 changes: 2 additions & 2 deletions custom-service/request-scheduler/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ chrono = "0.4.24"
cron = "0.12.0"
reqwest = "0.11.17"
serde = "1.0.163"
shuttle-persist = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-persist = "0.51.0"
shuttle-runtime = "0.51.0"
tokio = "1.28.0"
tracing = "0.1.37"
6 changes: 3 additions & 3 deletions fullstack-templates/saas/backend/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ lettre = "0.11.4"
rand = "0.8.5"
reqwest = "0.11.16"
serde = { version = "1.0.160", features = ["derive"] }
shuttle-axum = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-shared-db = { version = "0.50.0", features = ["postgres", "sqlx"] }
shuttle-axum = { version = "0.51.0", default-features = false, features = ["axum-0-7"] }
shuttle-runtime = "0.51.0"
shuttle-shared-db = { version = "0.51.0", features = ["postgres", "sqlx"] }
sqlx = { version = "0.8.2", features = ["time"] }
time = { version = "0.3.20", features = ["serde"] }
tokio = "1.27.0"
Expand Down
4 changes: 2 additions & 2 deletions loco/hello-world/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ edition = "2021"
async-trait = "0.1.74"
axum = "0.7.1"
loco-rs = { version = "0.9.0", default-features = false, features = ["cli"] }
shuttle-axum = "0.50.0"
shuttle-runtime = { version = "0.50.0", default-features = false }
shuttle-axum = { version = "0.51.0", default-features = false, features = ["axum-0-7"] }
shuttle-runtime = { version = "0.51.0", default-features = false }
serde = "*"
serde_json = "*"
tokio = "1.33.0"
Expand Down
4 changes: 2 additions & 2 deletions other/feature-flags/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ publish = false

[dependencies]
axum = "0.7.3"
shuttle-axum = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-axum = { version = "0.51.0", default-features = false, features = ["axum-0-7"] }
shuttle-runtime = "0.51.0"

[features]
# Shuttle will disable default features and enable the feature "shuttle" if it exists.
Expand Down
4 changes: 2 additions & 2 deletions other/standalone-binary/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ path = "src/bin/standalone.rs"
[dependencies]
axum = "0.7.3"
dotenvy = "0.15.7"
shuttle-axum = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-axum = { version = "0.51.0", default-features = false, features = ["axum-0-7"] }
shuttle-runtime = "0.51.0"
tokio = "1.28.2"
4 changes: 2 additions & 2 deletions poem/hello-world/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ edition = "2021"

[dependencies]
poem = "3.0.0"
shuttle-poem = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-poem = "0.51.0"
shuttle-runtime = "0.51.0"
tokio = "1.26.0"
4 changes: 2 additions & 2 deletions poise/hello-world/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ publish = false
[dependencies]
anyhow = "1.0.68"
poise = "0.6.1"
shuttle-runtime = "0.50.0"
shuttle-runtime = "0.51.0"
# Since poise is a serenity command framework, it can run on Shuttle with shuttle-serenity
shuttle-serenity = "0.50.0"
shuttle-serenity = "0.51.0"
tracing = "0.1.37"
tokio = "1.26.0"
4 changes: 2 additions & 2 deletions rocket/dyn-templates/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ edition = "2021"
[dependencies]
rocket = "0.5.0"
rocket_dyn_templates = { version = "0.1.0", features = ["handlebars"] }
shuttle-rocket = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-rocket = "0.51.0"
shuttle-runtime = "0.51.0"
tokio = "1.26.0"
4 changes: 2 additions & 2 deletions rocket/hello-world/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ edition = "2021"

[dependencies]
rocket = "0.5.0"
shuttle-rocket = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-rocket = "0.51.0"
shuttle-runtime = "0.51.0"
tokio = "1.26.0"
4 changes: 2 additions & 2 deletions rocket/jwt-authentication/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ jsonwebtoken = { version = "8.1.1", default-features = false }
lazy_static = "1.4.0"
rocket = { version = "0.5.0", features = ["json"] }
serde = { version = "1.0.148", features = ["derive"] }
shuttle-rocket = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-rocket = "0.51.0"
shuttle-runtime = "0.51.0"
tokio = "1.26.0"
10 changes: 5 additions & 5 deletions rocket/opendal-memory/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ version = "0.1.0"
edition = "2021"

[dependencies]
shuttle-runtime = "0.50.0"
shuttle-opendal = "0.50.0"
tokio = "1.26.0"
shuttle-rocket = "0.50.0"
opendal = "0.45"
opendal = "0.51"
rocket = { version = "0.5.0", features = ["json"] }
serde = { version = "1.0.148", features = ["derive"] }
shuttle-opendal = "0.51.0"
shuttle-rocket = "0.51.0"
shuttle-runtime = "0.51.0"
tokio = "1.26.0"
7 changes: 0 additions & 7 deletions rocket/opendal-memory/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
# OpenDAL Memory Storage

This example shows that how to connect to an in-memory storage using OpenDAL.

## Project structure

The project consists of the following files

- `Shuttle.toml` contains the name of the app
- `src/main.rs` is where all the magic happens - it creates a Shuttle service with two endpoints: one for adding new data and one for retrieving it back.
2 changes: 1 addition & 1 deletion rocket/opendal-memory/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ async fn retrieve(path: String, state: &State<MyState>) -> Result<String, BadReq
.read(&path)
.await
.map_err(|e| BadRequest(e.to_string()))?;
let data = String::from_utf8_lossy(&bs).to_string();
let data = String::from_utf8_lossy(&bs.to_vec()).to_string();
Ok(data)
}

Expand Down
6 changes: 3 additions & 3 deletions rocket/postgres/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ edition = "2021"
[dependencies]
rocket = { version = "0.5.0", features = ["json"] }
serde = "1.0.148"
shuttle-rocket = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-shared-db = { version = "0.50.0", features = ["postgres", "sqlx"] }
shuttle-rocket = "0.51.0"
shuttle-runtime = "0.51.0"
shuttle-shared-db = { version = "0.51.0", features = ["postgres", "sqlx"] }
sqlx = "0.8.2"
tokio = "1.26.0"
4 changes: 2 additions & 2 deletions rocket/secrets/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ edition = "2021"
[dependencies]
anyhow = "1.0.66"
rocket = "0.5.0"
shuttle-rocket = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-rocket = "0.51.0"
shuttle-runtime = "0.51.0"
tokio = "1.26.0"
4 changes: 2 additions & 2 deletions rocket/static-files/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ edition = "2021"

[dependencies]
rocket = "0.5.0"
shuttle-rocket = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-rocket = "0.51.0"
shuttle-runtime = "0.51.0"
tokio = "1.26.0"
10 changes: 5 additions & 5 deletions rocket/url-shortener/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ edition = "2021"

[dependencies]
nanoid = "0.4.0"
opendal = "0.51"
rocket = { version = "0.5.0", features = ["json"] }
serde = "1.0.148"
shuttle-rocket = "0.50.0"
shuttle-runtime = "0.50.0"
shuttle-shared-db = { version = "0.50.0", features = ["postgres", "sqlx"] }
sqlx = "0.8.2"
shuttle-rocket = "0.51.0"
shuttle-runtime = "0.51.0"
shuttle-shared-db = { version = "0.51.0", features = ["opendal-postgres"] }
tokio = "1.26.0"
url = "2.3.1"
url = "2.5.4"
Loading
Loading