Skip to content

Commit

Permalink
Merge branch 'master' into chore
Browse files Browse the repository at this point in the history
  • Loading branch information
jondot authored Jul 14, 2024
2 parents 6ed9520 + e8518fc commit 4e99ff9
Show file tree
Hide file tree
Showing 10 changed files with 70 additions and 66 deletions.
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ clap = { version = "4.4.7", features = ["derive"], optional = true }
colored = "2"


sea-orm = { version = "1.0.0-rc.4", features = [
sea-orm = { version = "1.0.0-rc.7", features = [
"sqlx-postgres", # `DATABASE_DRIVER` feature
"sqlx-sqlite",
"runtime-tokio-rustls",
Expand All @@ -61,7 +61,7 @@ serde_json = "1"
serde_yaml = "0.9"
serde_variant = "0.1.2"

# worker fwk
# worker fwk
rusty-sidekiq = { version = "0.8.2", default-features = false }
async-trait = { workspace = true }
bb8 = "0.8.1"
Expand Down Expand Up @@ -104,7 +104,7 @@ bytes = "1.1"

axum-test = { version = "14.3.0", optional = true }

# gen
# gen
rrgen = "0.5.3"
chrono = "0.4.31"
cargo_metadata = "0.18.1"
Expand Down Expand Up @@ -141,7 +141,7 @@ tower-http = { version = "0.5.0", features = [

[dependencies.sea-orm-migration]
optional = true
version = "1.0.0-rc.4"
version = "1.0.0-rc.7"
features = [
# Enable at least one `ASYNC_RUNTIME` and `DATABASE_DRIVER` feature if you want to run migration via CLI.
# View the list of supported features at https://www.sea-ql.org/SeaORM/docs/install-and-config/database-and-async-runtime.
Expand Down
40 changes: 20 additions & 20 deletions examples/demo/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/demo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ async-trait = "0.1.74"
tracing = "0.1.40"
chrono = "0.4"
validator = { version = "0.16" }
sea-orm = { version = "1.0.0-rc.4", features = [
sea-orm = { version = "1.0.0-rc.7", features = [
"sqlx-sqlite",
"sqlx-postgres",
"runtime-tokio-rustls",
Expand Down
2 changes: 1 addition & 1 deletion examples/demo/migration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ async-std = { version = "1", features = ["attributes", "tokio1"] }
loco-rs = { version = "*", path = "../../../" }

[dependencies.sea-orm-migration]
version = "1.0.0-rc.4"
version = "1.0.0-rc.7"
features = [
# Enable at least one `ASYNC_RUNTIME` and `DATABASE_DRIVER` feature if you want to run migration via CLI.
# View the list of supported features at https://www.sea-ql.org/SeaORM/docs/install-and-config/database-and-async-runtime.
Expand Down
38 changes: 20 additions & 18 deletions starters/rest-api/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion starters/rest-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ async-trait = "0.1.74"
tracing = "0.1.40"
chrono = "0.4"
validator = { version = "0.16" }
sea-orm = { version = "1.0.0-rc.4", features = [
sea-orm = { version = "1.0.0-rc.7", features = [
"sqlx-sqlite",
"sqlx-postgres",
"runtime-tokio-rustls",
Expand Down
2 changes: 1 addition & 1 deletion starters/rest-api/migration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ async-std = { version = "1", features = ["attributes", "tokio1"] }
loco-rs = { version = "0.6.1" }

[dependencies.sea-orm-migration]
version = "1.0.0-rc.4"
version = "1.0.0-rc.7"
features = [
# Enable at least one `ASYNC_RUNTIME` and `DATABASE_DRIVER` feature if you want to run migration via CLI.
# View the list of supported features at https://www.sea-ql.org/SeaORM/docs/install-and-config/database-and-async-runtime.
Expand Down
Loading

0 comments on commit 4e99ff9

Please sign in to comment.