Skip to content

Commit d206393

Browse files
dependabot[bot]lutter
authored andcommitted
build(deps): Bump tonic and prost related packages to 0.14
In particular, the packages are prost, prost-types, tonic, tonic-prost, and tonic-prost-build. Unfortunately, this also requires updating arrow to 57.x It doesn't seem possible to update any of these packages individually, they are all tightly dependent on each other, and attempts at individual updates cause compilation errors.
1 parent 8227d8b commit d206393

File tree

14 files changed

+563
-604
lines changed

14 files changed

+563
-604
lines changed

Cargo.lock

Lines changed: 132 additions & 204 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ graphman-store = { path = "./core/graphman_store" }
6969
graphql-tools = "0.5.0"
7070
itertools = "0.14.0"
7171
lazy_static = "1.5.0"
72-
prost = "0.13"
73-
prost-types = "0.13"
72+
prost = "0.14"
73+
prost-types = "0.14"
7474
redis = { version = "1.0.2", features = [
7575
"aio",
7676
"connection-manager",
@@ -94,8 +94,9 @@ tokio = { version = "1.49.0", features = ["full"] }
9494
tokio-stream = { version = "0.1.18", features = ["sync"] }
9595
tokio-retry = "0.3.0"
9696

97-
tonic = { version = "0.12.3", features = ["tls-roots", "gzip"] }
98-
tonic-build = { version = "0.12.3", features = ["prost"] }
97+
tonic = { version = "0.14", features = ["tls-native-roots", "gzip"] }
98+
tonic-prost = "0.14"
99+
tonic-prost-build = "0.14"
99100
tower-http = { version = "0.6.8", features = ["cors"] }
100101
tower = { version = "0.5.1", features = ["full"] }
101102
wasmparser = "0.118.1"
@@ -105,8 +106,8 @@ prometheus = "0.14.0"
105106

106107
# Dependencies related to Amp subgraphs
107108
ahash = "0.8.11"
108-
arrow = { version = "=55.0.0" }
109-
arrow-flight = { version = "=55.0.0", features = ["flight-sql-experimental"] }
109+
arrow = { version = "=57.0.0" }
110+
arrow-flight = { version = "=57.0.0", features = ["flight-sql-experimental"] }
110111
futures = "0.3.31"
111112
half = "2.7.1"
112113
indoc = "2.0.7"

chain/ethereum/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ graph-runtime-derive = { path = "../../runtime/derive" }
2929
base64 = "0"
3030

3131
[build-dependencies]
32-
tonic-build = { workspace = true }
32+
tonic-prost-build = { workspace = true }
3333

3434
[lints]
3535
workspace = true

chain/ethereum/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
fn main() {
22
println!("cargo:rerun-if-changed=proto");
33

4-
tonic_build::configure()
4+
tonic_prost_build::configure()
55
.out_dir("src/protobuf")
66
.protoc_arg("--experimental_allow_proto3_optional")
77
.compile_protos(&["proto/ethereum.proto"], &["proto"])

chain/ethereum/src/protobuf/sf.ethereum.r#type.v2.rs

Lines changed: 113 additions & 105 deletions
Large diffs are not rendered by default.

chain/near/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version.workspace = true
44
edition.workspace = true
55

66
[build-dependencies]
7-
tonic-build = { workspace = true }
7+
tonic-prost-build = { workspace = true }
88

99
[dependencies]
1010
async-trait = { workspace = true }

chain/near/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
fn main() {
22
println!("cargo:rerun-if-changed=proto");
3-
tonic_build::configure()
3+
tonic_prost_build::configure()
44
.out_dir("src/protobuf")
55
.extern_path(".sf.near.codec.v1", "crate::codec::pbcodec")
66
.compile_protos(&["proto/near.proto"], &["proto"])

graph/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ url = "2.5.8"
7373
prometheus = "0.14.0"
7474
priority-queue = "2.7.0"
7575
tonic = { workspace = true }
76+
tonic-prost = { workspace = true }
7677
prost = { workspace = true }
7778
prost-types = { workspace = true }
7879

@@ -105,7 +106,7 @@ hex-literal = "1.1"
105106
wiremock = "0.6.5"
106107

107108
[build-dependencies]
108-
tonic-build = { workspace = true }
109+
tonic-prost-build = { workspace = true }
109110

110111
[lints]
111112
workspace = true

graph/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
fn main() {
22
println!("cargo:rerun-if-changed=proto");
3-
tonic_build::configure()
3+
tonic_prost_build::configure()
44
.out_dir("src/firehose")
55
.compile_protos(
66
&[

graph/src/amp/schema/generator/entity.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,9 @@ fn arrow_data_type_to_value_type(
161161
Struct(_) => return type_not_supported(),
162162
Union(_, _) => return type_not_supported(),
163163
Dictionary(_, _) => return type_not_supported(),
164-
Decimal128(_, _) => ValueType::BigDecimal,
165-
Decimal256(_, _) => ValueType::BigDecimal,
164+
Decimal32(_, _) | Decimal64(_, _) | Decimal128(_, _) | Decimal256(_, _) => {
165+
ValueType::BigDecimal
166+
}
166167
Map(_, _) => return type_not_supported(),
167168
RunEndEncoded(_, _) => return type_not_supported(),
168169
};

0 commit comments

Comments
 (0)