Skip to content

Commit

Permalink
Merge branch 'main' into 425
Browse files Browse the repository at this point in the history
  • Loading branch information
thexiay authored Jul 5, 2024
2 parents 00cad7b + c3b5364 commit 727ae49
Show file tree
Hide file tree
Showing 16 changed files with 1,682 additions and 1,012 deletions.
14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
[workspace]
resolver = "2"
members = [
"crates/catalog/*",
"crates/examples",
"crates/iceberg",
"crates/integrations/*",
"crates/test_utils",
"crates/catalog/*",
"crates/examples",
"crates/iceberg",
"crates/integrations/*",
"crates/test_utils",
]

[workspace.package]
Expand Down Expand Up @@ -72,7 +72,7 @@ parquet = "52"
pilota = "0.11.2"
pretty_assertions = "1.4.0"
port_scanner = "0.1.5"
reqwest = { version = "^0.12", features = ["json"] }
reqwest = { version = "^0.12", default-features = false, features = ["json"] }
rust_decimal = "1.31.0"
serde = { version = "^1.0", features = ["rc"] }
serde_bytes = "0.11.8"
Expand All @@ -81,7 +81,7 @@ serde_json = "^1.0"
serde_repr = "0.1.16"
serde_with = "3.4.0"
tempfile = "3.8"
tokio = { version = "1", features = ["macros"] }
tokio = { version = "1", default-features = false }
tokio-shared-rt = "0.1.0"
typed-builder = "^0.18"
url = "2"
Expand Down
2 changes: 2 additions & 0 deletions crates/catalog/rest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,15 @@ keywords = ["iceberg", "rest", "catalog"]
# async-trait = { workspace = true }
async-trait = { workspace = true }
chrono = { workspace = true }
http = "1.1.0"
iceberg = { workspace = true }
itertools = { workspace = true }
log = "0.4.20"
reqwest = { workspace = true }
serde = { workspace = true }
serde_derive = { workspace = true }
serde_json = { workspace = true }
tokio = { workspace = true, features = ["sync"] }
typed-builder = { workspace = true }
urlencoding = { workspace = true }
uuid = { workspace = true, features = ["v4"] }
Expand Down
Loading

0 comments on commit 727ae49

Please sign in to comment.