From 477c028518f9e643bc9145fa015179ea234d90b0 Mon Sep 17 00:00:00 2001 From: Frederik Terstappen Date: Sat, 30 Nov 2024 09:55:01 +0100 Subject: [PATCH 1/2] Update sea-orm-rocket dependencies --- sea-orm-rocket/codegen/Cargo.toml | 6 +++--- sea-orm-rocket/lib/Cargo.toml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sea-orm-rocket/codegen/Cargo.toml b/sea-orm-rocket/codegen/Cargo.toml index 838f973ef..78435b093 100644 --- a/sea-orm-rocket/codegen/Cargo.toml +++ b/sea-orm-rocket/codegen/Cargo.toml @@ -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" diff --git a/sea-orm-rocket/lib/Cargo.toml b/sea-orm-rocket/lib/Cargo.toml index b906ae1a0..95e4d7391 100644 --- a/sea-orm-rocket/lib/Cargo.toml +++ b/sea-orm-rocket/lib/Cargo.toml @@ -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"] From 06faee442bfe3654ed42da561d87fde0a94be016 Mon Sep 17 00:00:00 2001 From: Frederik Terstappen Date: Sat, 30 Nov 2024 10:57:07 +0100 Subject: [PATCH 2/2] Update rocket example dependencies --- examples/rocket_example/api/Cargo.toml | 6 +++--- examples/rocket_example/entity/Cargo.toml | 2 +- examples/rocket_example/migration/Cargo.toml | 2 +- examples/rocket_example/service/Cargo.toml | 2 +- examples/rocket_okapi_example/api/Cargo.toml | 14 +++++++++----- examples/rocket_okapi_example/dto/Cargo.toml | 4 ++-- examples/rocket_okapi_example/entity/Cargo.toml | 4 ++-- examples/rocket_okapi_example/migration/Cargo.toml | 2 +- examples/rocket_okapi_example/service/Cargo.toml | 6 +++--- 9 files changed, 23 insertions(+), 19 deletions(-) diff --git a/examples/rocket_example/api/Cargo.toml b/examples/rocket_example/api/Cargo.toml index 1b7587742..793cfbf0e 100644 --- a/examples/rocket_example/api/Cargo.toml +++ b/examples/rocket_example/api/Cargo.toml @@ -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 diff --git a/examples/rocket_example/entity/Cargo.toml b/examples/rocket_example/entity/Cargo.toml index 4f16a2817..2ab1116ee 100644 --- a/examples/rocket_example/entity/Cargo.toml +++ b/examples/rocket_example/entity/Cargo.toml @@ -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 diff --git a/examples/rocket_example/migration/Cargo.toml b/examples/rocket_example/migration/Cargo.toml index 411e6bd83..a70232b3d 100644 --- a/examples/rocket_example/migration/Cargo.toml +++ b/examples/rocket_example/migration/Cargo.toml @@ -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] diff --git a/examples/rocket_example/service/Cargo.toml b/examples/rocket_example/service/Cargo.toml index 0b8566b26..5cac76e3e 100644 --- a/examples/rocket_example/service/Cargo.toml +++ b/examples/rocket_example/service/Cargo.toml @@ -19,7 +19,7 @@ features = [ ] [dev-dependencies] -tokio = "1.20.0" +tokio = "1.41" [features] mock = ["sea-orm/mock"] diff --git a/examples/rocket_okapi_example/api/Cargo.toml b/examples/rocket_okapi_example/api/Cargo.toml index 877b6569a..5592b2b35 100644 --- a/examples/rocket_okapi_example/api/Cargo.toml +++ b/examples/rocket_okapi_example/api/Cargo.toml @@ -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" } diff --git a/examples/rocket_okapi_example/dto/Cargo.toml b/examples/rocket_okapi_example/dto/Cargo.toml index 078592ccd..524ac2eb2 100644 --- a/examples/rocket_okapi_example/dto/Cargo.toml +++ b/examples/rocket_okapi_example/dto/Cargo.toml @@ -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" diff --git a/examples/rocket_okapi_example/entity/Cargo.toml b/examples/rocket_okapi_example/entity/Cargo.toml index f10f11a78..727fcc830 100644 --- a/examples/rocket_okapi_example/entity/Cargo.toml +++ b/examples/rocket_okapi_example/entity/Cargo.toml @@ -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" diff --git a/examples/rocket_okapi_example/migration/Cargo.toml b/examples/rocket_okapi_example/migration/Cargo.toml index 411e6bd83..a70232b3d 100644 --- a/examples/rocket_okapi_example/migration/Cargo.toml +++ b/examples/rocket_okapi_example/migration/Cargo.toml @@ -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] diff --git a/examples/rocket_okapi_example/service/Cargo.toml b/examples/rocket_okapi_example/service/Cargo.toml index 2a6231acd..ed41736a3 100644 --- a/examples/rocket_okapi_example/service/Cargo.toml +++ b/examples/rocket_okapi_example/service/Cargo.toml @@ -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"]