Skip to content

Commit

Permalink
Cleaning up dependency (#1300)
Browse files Browse the repository at this point in the history 
* Dependency version cleanup

* Update build tool

* Disable default features

* [cli] disable default features
  • Loading branch information
@billy1624
billy1624 authored Dec 16, 2022
1 parent 5b9c49a commit b2185af
Show file tree
Hide file tree
Showing 49 changed files with 138 additions and 143 deletions.
58 changes: 29 additions & 29 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,41 +24,41 @@ name = "sea_orm"
path = "src/lib.rs"

[dependencies]
async-stream = { version = "^0.3", default-features = false }
async-trait = { version = "^0.1", default-features = false }
chrono = { version = "^0.4.20", default-features = false, optional = true }
time = { version = "^0.3", default-features = false, optional = true }
futures = { version = "^0.3", default-features = false, features = ["std"] }
log = { version = "^0.4", default-features = false }
tracing = { version = "^0.1", default-features = false, features = ["attributes", "log"] }
rust_decimal = { version = "^1", default-features = false, optional = true }
bigdecimal = { version = "^0.3", default-features = false, optional = true }
sea-orm-macros = { version = "^0.10.3", path = "sea-orm-macros", default-features = false, optional = true }
sea-query = { version = "^0.27.2", features = ["thread-safe"] }
sea-query-binder = { version = "^0.2.2", default-features = false, optional = true }
sea-strum = { version = "^0.23", default-features = false, features = ["derive", "sea-orm"] }
serde = { version = "^1.0", default-features = false }
serde_json = { version = "^1.0", default-features = false, optional = true }
sqlx = { version = "^0.6", default-features = false, optional = true }
uuid = { version = "^1", default-features = false, optional = true }
async-stream = { version = "0.3", default-features = false }
async-trait = { version = "0.1", default-features = false }
chrono = { version = "0.4.20", default-features = false, optional = true }
time = { version = "0.3", default-features = false, optional = true }
futures = { version = "0.3", default-features = false, features = ["std"] }
log = { version = "0.4", default-features = false }
tracing = { version = "0.1", default-features = false, features = ["attributes", "log"] }
rust_decimal = { version = "1", default-features = false, optional = true }
bigdecimal = { version = "0.3", default-features = false, optional = true }
sea-orm-macros = { version = "0.10.3", path = "sea-orm-macros", default-features = false, optional = true }
sea-query = { version = "0.27.2", features = ["thread-safe"] }
sea-query-binder = { version = "0.2.2", default-features = false, optional = true }
sea-strum = { version = "0.23", default-features = false, features = ["derive", "sea-orm"] }
serde = { version = "1.0", default-features = false }
serde_json = { version = "1.0", default-features = false, optional = true }
sqlx = { version = "0.6", default-features = false, optional = true }
uuid = { version = "1", default-features = false, optional = true }
ouroboros = { version = "0.15", default-features = false }
url = { version = "^2.2", default-features = false }
thiserror = { version = "^1", default-features = false }
url = { version = "2.2", default-features = false }
thiserror = { version = "1", default-features = false }

[dev-dependencies]
smol = { version = "^1.2" }
smol-potat = { version = "^1.1" }
async-std = { version = "^1", features = ["attributes", "tokio1"] }
futures = { version = "^0.3" }
tokio = { version = "^1.6", features = ["full"] }
smol = { version = "1.2" }
smol-potat = { version = "1.1" }
async-std = { version = "1", features = ["attributes", "tokio1"] }
futures = { version = "0.3" }
tokio = { version = "1.6", features = ["full"] }
actix-rt = { version = "2.2.0" }
maplit = { version = "^1" }
rust_decimal_macros = { version = "^1" }
maplit = { version = "1" }
rust_decimal_macros = { version = "1" }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
sea-orm = { path = ".", features = ["mock", "debug-print", "tests-cfg", "postgres-array"] }
pretty_assertions = { version = "^0.7" }
time = { version = "^0.3", features = ["macros"] }
uuid = { version = "^1", features = ["v4"] }
pretty_assertions = { version = "0.7" }
time = { version = "0.3", features = ["macros"] }
uuid = { version = "1", features = ["v4"] }
once_cell = "1.8"

[features]
Expand Down
12 changes: 6 additions & 6 deletions build-tools/bump-version.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ sleep 1
# Bump `sea-orm-cli` version
cd sea-orm-cli
sed -i 's/^version.*$/version = "'$1'"/' Cargo.toml
sed -i 's/^sea-orm-codegen [^,]*,/sea-orm-codegen = { version = "\^'$1'",/' Cargo.toml
sed -i 's/^sea-orm-codegen [^,]*,/sea-orm-codegen = { version = "'$1'",/' Cargo.toml
git commit -am "sea-orm-cli $1"
cd ..
sleep 1
Expand All @@ -23,21 +23,21 @@ git commit -am "sea-orm-macros $1"
cd ..
sleep 1
sed -i 's/^version.*$/version = "'$1'"/' Cargo.toml
sed -i 's/^sea-orm-macros [^,]*,/sea-orm-macros = { version = "\^'$1'",/' Cargo.toml
sed -i 's/^sea-orm-macros [^,]*,/sea-orm-macros = { version = "'$1'",/' Cargo.toml
git commit -am "$1" # publish sea-orm
sleep 1

# Bump `sea-orm-migration` version
cd sea-orm-migration
sed -i 's/^version.*$/version = "'$1'"/' Cargo.toml
sed -i 's/^sea-orm-cli [^,]*,/sea-orm-cli = { version = "\^'$1'",/' Cargo.toml
sed -i 's/^sea-orm [^,]*,/sea-orm = { version = "\^'$1'",/' Cargo.toml
sed -i 's/^sea-orm-cli [^,]*,/sea-orm-cli = { version = "'$1'",/' Cargo.toml
sed -i 's/^sea-orm [^,]*,/sea-orm = { version = "'$1'",/' Cargo.toml
git commit -am "sea-orm-migration $1"
cd ..
sleep 1

# Bump examples' dependency version
cd examples
find . -depth -type f -name '*.toml' -exec sed -i 's/^version = "\^.*" # sea-orm version$/version = "\^'$1'" # sea-orm version/' {} \;
find . -depth -type f -name '*.toml' -exec sed -i 's/^version = "\^.*" # sea-orm-migration version$/version = "\^'$1'" # sea-orm-migration version/' {} \;
find . -depth -type f -name '*.toml' -exec sed -i 's/^version = ".*" # sea-orm version$/version = "'$1'" # sea-orm version/' {} \;
find . -depth -type f -name '*.toml' -exec sed -i 's/^version = ".*" # sea-orm-migration version$/version = "'$1'" # sea-orm-migration version/' {} \;
git commit -am "update examples"
4 changes: 2 additions & 2 deletions examples/actix3_example/api/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ actix-http = "2"
actix-web = "3"
actix-flash = "0.2"
actix-files = "0.5"
futures = { version = "^0.3" }
futures-util = { version = "^0.3" }
futures = { version = "0.3" }
futures-util = { version = "0.3" }
tera = "1.8.0"
dotenvy = "0.15"
listenfd = "0.3.3"
Expand Down
2 changes: 1 addition & 1 deletion examples/actix3_example/core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ entity = { path = "../entity" }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "^0.10.3" # sea-orm version
version = "0.10.3" # sea-orm version
features = [
"debug-print",
"runtime-async-std-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/actix3_example/entity/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ serde = { version = "1", features = ["derive"] }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "^0.10.3" # sea-orm version
version = "0.10.3" # sea-orm version
4 changes: 2 additions & 2 deletions examples/actix3_example/migration/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ name = "migration"
path = "src/lib.rs"

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

[dependencies.sea-orm-migration]
path = "../../../sea-orm-migration" # remove this line in your own project
version = "^0.10.3" # sea-orm-migration version
version = "0.10.3" # sea-orm-migration version
features = [
# Enable following runtime and db backend features if you want to run migration via CLI
# "runtime-async-std-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/actix_example/core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ entity = { path = "../entity" }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "^0.10.3" # sea-orm version
version = "0.10.3" # sea-orm version
features = [
"debug-print",
"runtime-async-std-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/actix_example/entity/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ serde = { version = "1", features = ["derive"] }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "^0.10.3" # sea-orm version
version = "0.10.3" # sea-orm version
4 changes: 2 additions & 2 deletions examples/actix_example/migration/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ name = "migration"
path = "src/lib.rs"

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

[dependencies.sea-orm-migration]
path = "../../../sea-orm-migration" # remove this line in your own project
version = "^0.10.3" # sea-orm-migration version
version = "0.10.3" # sea-orm-migration version
features = [
# Enable following runtime and db backend features if you want to run migration via CLI
# "runtime-actix-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/axum_example/core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ entity = { path = "../entity" }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "^0.10.3" # sea-orm version
version = "0.10.3" # sea-orm version
features = [
"debug-print",
"runtime-async-std-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/axum_example/entity/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ serde = { version = "1", features = ["derive"] }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "^0.10.3" # sea-orm version
version = "0.10.3" # sea-orm version
4 changes: 2 additions & 2 deletions examples/axum_example/migration/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ name = "migration"
path = "src/lib.rs"

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

[dependencies.sea-orm-migration]
path = "../../../sea-orm-migration" # remove this line in your own project
version = "^0.10.3" # sea-orm-migration version
version = "0.10.3" # sea-orm-migration version
features = [
# Enable following runtime and db backend features if you want to run migration via CLI
# "runtime-tokio-native-tls",
Expand Down
10 changes: 5 additions & 5 deletions examples/basic/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ edition = "2021"
publish = false

[dependencies]
async-std = { version = "^1.9", features = [ "attributes", "tokio1" ] }
async-std = { version = "1.9", features = [ "attributes", "tokio1" ] }
sea-orm = { path = "../../", features = [ "sqlx-all", "runtime-async-std-native-tls" ] }
serde_json = { version = "^1" }
futures = { version = "^0.3" }
async-stream = { version = "^0.3" }
futures-util = { version = "^0.3" }
serde_json = { version = "1" }
futures = { version = "0.3" }
async-stream = { version = "0.3" }
futures-util = { version = "0.3" }
4 changes: 2 additions & 2 deletions examples/graphql_example/api/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ publish = false
[dependencies]
graphql-example-core = { path = "../core" }
tokio = { version = "1.0", features = ["full"] }
axum = "^0.5.1"
axum = "0.5.1"
dotenvy = "0.15.0"
async-graphql-axum = "^4.0.6"
async-graphql-axum = "4.0.6"
entity = { path = "../entity" }
migration = { path = "../migration" }
2 changes: 1 addition & 1 deletion examples/graphql_example/core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ entity = { path = "../entity" }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "^0.10.3" # sea-orm version
version = "0.10.3" # sea-orm version
features = [
"debug-print",
"runtime-async-std-native-tls",
Expand Down
4 changes: 2 additions & 2 deletions examples/graphql_example/entity/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ path = "src/lib.rs"
serde = { version = "1", features = ["derive"] }

[dependencies.async-graphql]
version = "^4.0.6"
version = "4.0.6"

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "^0.10.3" # sea-orm version
version = "0.10.3" # sea-orm version
4 changes: 2 additions & 2 deletions examples/graphql_example/migration/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ path = "src/lib.rs"

[dependencies]
dotenvy = "0.15.0"
async-std = { version = "^1", features = ["attributes", "tokio1"] }
async-std = { version = "1", features = ["attributes", "tokio1"] }

[dependencies.sea-orm-migration]
path = "../../../sea-orm-migration" # remove this line in your own project
version = "^0.10.3" # sea-orm-migration version
version = "0.10.3" # sea-orm-migration version
features = [
# Enable following runtime and db backend features if you want to run migration via CLI
# "runtime-tokio-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/jsonrpsee_example/api/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish = false

[dependencies]
jsonrpsee-example-core = { path = "../core" }
jsonrpsee = { version = "^0.8.0", features = ["full"] }
jsonrpsee = { version = "0.8.0", features = ["full"] }
jsonrpsee-core = "0.9.0"
tokio = { version = "1.8.0", features = ["full"] }
serde = { version = "1", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/jsonrpsee_example/core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ entity = { path = "../entity" }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "^0.10.3" # sea-orm version
version = "0.10.3" # sea-orm version
features = [
"debug-print",
"runtime-tokio-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/jsonrpsee_example/entity/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ serde = { version = "1", features = ["derive"] }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "^0.10.3" # sea-orm version
version = "0.10.3" # sea-orm version
4 changes: 2 additions & 2 deletions examples/jsonrpsee_example/migration/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ name = "migration"
path = "src/lib.rs"

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

[dependencies.sea-orm-migration]
path = "../../../sea-orm-migration" # remove this line in your own project
version = "^0.10.3" # sea-orm-migration version
version = "0.10.3" # sea-orm-migration version
features = [
# Enable following runtime and db backend features if you want to run migration via CLI
# "runtime-tokio-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/poem_example/core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ entity = { path = "../entity" }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "^0.10.3" # sea-orm version
version = "0.10.3" # sea-orm version
features = [
"debug-print",
"runtime-async-std-native-tls",
Expand Down
2 changes: 1 addition & 1 deletion examples/poem_example/entity/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ serde = { version = "1", features = ["derive"] }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "^0.10.3" # sea-orm version
version = "0.10.3" # sea-orm version
4 changes: 2 additions & 2 deletions examples/poem_example/migration/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ name = "migration"
path = "src/lib.rs"

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

[dependencies.sea-orm-migration]
path = "../../../sea-orm-migration" # remove this line in your own project
version = "^0.10.3" # sea-orm-migration version
version = "0.10.3" # sea-orm-migration version
features = [
# Enable following runtime and db backend features if you want to run migration via CLI
# "runtime-tokio-native-tls",
Expand Down
8 changes: 4 additions & 4 deletions examples/rocket_example/api/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ edition = "2021"
publish = false

[dependencies]
async-stream = { version = "^0.3" }
async-stream = { version = "0.3" }
async-trait = { version = "0.1" }
rocket-example-core = { path = "../core" }
futures = { version = "^0.3" }
futures-util = { version = "^0.3" }
futures = { version = "0.3" }
futures-util = { version = "0.3" }
rocket = { version = "0.5.0-rc.1", features = [
"json",
] }
rocket_dyn_templates = { version = "0.1.0-rc.1", features = [
"tera",
] }
serde_json = { version = "^1" }
serde_json = { version = "1" }
entity = { path = "../entity" }
migration = { path = "../migration" }
tokio = "1.20.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/rocket_example/core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ entity = { path = "../entity" }

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "^0.10.3" # sea-orm version
version = "0.10.3" # sea-orm version
features = [
"runtime-tokio-native-tls",
"sqlx-postgres",
Expand Down
2 changes: 1 addition & 1 deletion examples/rocket_example/entity/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ rocket = { version = "0.5.0-rc.1", features = [

[dependencies.sea-orm]
path = "../../../" # remove this line in your own project
version = "^0.10.3" # sea-orm version
version = "0.10.3" # sea-orm version
4 changes: 2 additions & 2 deletions examples/rocket_example/migration/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ path = "src/lib.rs"

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

[dependencies.sea-orm-migration]
path = "../../../sea-orm-migration" # remove this line in your own project
version = "^0.10.3" # sea-orm-migration version
version = "0.10.3" # sea-orm-migration version
features = [
# Enable following runtime and db backend features if you want to run migration via CLI
# "runtime-tokio-native-tls",
Expand Down
Loading

0 comments on commit b2185af

Please sign in to comment.