Skip to content

Update sea orm rocket #2431

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
tyt2y3 merged 2 commits into from
Dec 24, 2024
Merged

Update sea orm rocket #2431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
477c028
Update sea-orm-rocket dependencies
Nov 30, 2024
06faee4
Update rocket example dependencies
Nov 30, 2024
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
6 changes: 3 additions & 3 deletions examples/rocket_example/api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ async-trait = { version = "0.1" }
rocket-example-service = { path = "../service" }
futures = { version = "0.3" }
futures-util = { version = "0.3" }
rocket = { version = "0.5.0", features = ["json"] }
rocket_dyn_templates = { version = "0.1.0-rc.1", features = ["tera"] }
rocket = { version = "0.5", features = ["json"] }
rocket_dyn_templates = { version = "0.2", features = ["tera"] }
serde_json = { version = "1" }
entity = { path = "../entity" }
migration = { path = "../migration" }
tokio = "1.29.0"
tokio = "1.41"

[dependencies.sea-orm-rocket]
path = "../../../sea-orm-rocket/lib" # remove this line in your own project and uncomment the following line
Expand Down
2 changes: 1 addition & 1 deletion examples/rocket_example/entity/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name = "entity"
path = "src/lib.rs"

[dependencies]
rocket = { version = "0.5.0", features = ["json"] }
rocket = { version = "0.5", features = ["json"] }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
Expand Down
2 changes: 1 addition & 1 deletion examples/rocket_example/migration/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name = "migration"
path = "src/lib.rs"

[dependencies]
rocket = { version = "0.5.0" }
rocket = { version = "0.5" }
async-std = { version = "1", features = ["attributes", "tokio1"] }

[dependencies.sea-orm-migration]
Expand Down
2 changes: 1 addition & 1 deletion examples/rocket_example/service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ features = [
]

[dev-dependencies]
tokio = "1.20.0"
tokio = "1.41"

[features]
mock = ["sea-orm/mock"]
Expand Down
14 changes: 9 additions & 5 deletions examples/rocket_okapi_example/api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,18 @@ async-trait = { version = "0.1" }
rocket-okapi-example-service = { path = "../service" }
futures = { version = "0.3" }
futures-util = { version = "0.3" }
rocket = { version = "0.5.0", features = ["json"] }
rocket_cors = "0.6.0"
rocket_dyn_templates = { version = "0.1.0-rc.1", features = ["tera"] }
rocket_okapi = { version = "0.8.0", features = ["swagger", "rapidoc", "rocket_db_pools"] }
rocket = { version = "0.5", features = ["json"] }
rocket_cors = "0.6"
rocket_dyn_templates = { version = "0.2", features = ["tera"] }
rocket_okapi = { version = "0.9", features = [
"swagger",
"rapidoc",
"rocket_db_pools",
] }
serde_json = { version = "1" }
entity = { path = "../entity" }
migration = { path = "../migration" }
tokio = "1.20.0"
tokio = "1.41"
serde = "1.0"
dto = { path = "../dto" }

Expand Down
4 changes: 2 additions & 2 deletions examples/rocket_okapi_example/dto/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ name = "dto"
path = "src/lib.rs"

[dependencies]
rocket = { version = "0.5.0", features = ["json"] }
rocket = { version = "0.5", features = ["json"] }

[dependencies.entity]
path = "../entity"

[dependencies.rocket_okapi]
version = "0.8.0"
version = "0.9"
4 changes: 2 additions & 2 deletions examples/rocket_okapi_example/entity/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ name = "entity"
path = "src/lib.rs"

[dependencies]
rocket = { version = "0.5.0", features = ["json"] }
rocket = { version = "0.5", features = ["json"] }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "~1.1.3" # sea-orm version

[dependencies.rocket_okapi]
version = "0.8.0"
version = "0.9"
2 changes: 1 addition & 1 deletion examples/rocket_okapi_example/migration/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name = "migration"
path = "src/lib.rs"

[dependencies]
rocket = { version = "0.5.0" }
rocket = { version = "0.5" }
async-std = { version = "1", features = ["attributes", "tokio1"] }

[dependencies.sea-orm-migration]
Expand Down
6 changes: 3 additions & 3 deletions examples/rocket_okapi_example/service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ path = "../../../" # remove this line in your own project
version = "~1.1.3" # sea-orm version
features = [
"runtime-tokio-native-tls",
# "sqlx-postgres",
# "sqlx-mysql",
# "sqlx-postgres",
# "sqlx-mysql",
"sqlx-sqlite",
]

[dev-dependencies]
tokio = "1.20.0"
tokio = "1.41"

[features]
mock = ["sea-orm/mock"]
Expand Down
6 changes: 3 additions & 3 deletions sea-orm-rocket/codegen/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ edition = "2021"
proc-macro = true

[dependencies]
devise = "0.3"
devise = "0.4"
quote = "1"

[dev-dependencies]
rocket = { version = "0.5.0", default-features = false }
trybuild = "1.0"
rocket = { version = "0.5", default-features = false }
trybuild = "1"
version_check = "0.9"
8 changes: 4 additions & 4 deletions sea-orm-rocket/lib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ edition = "2021"
all-features = true

[dependencies.rocket]
version = "0.5.0"
version = "0.5"
default-features = false

[dependencies.sea-orm-rocket-codegen]
path = "../codegen"
version = "0.5.1"
version = "0.5"

[dependencies.rocket_okapi]
version = "0.8.0"
version = "0.9"
default-features = false
optional = true

[dev-dependencies.rocket]
version = "0.5.0"
version = "0.5"
default-features = false
features = ["json"]
Loading