Skip to content

Bump tonic version from 0.13.0 to 0.14.0 #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
teodordelibasic-db wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Bump tonic version from 0.13.0 to 0.14.0 #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions examples/proto/batch/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ publish = false

[dependencies]
databricks-zerobus-ingest-sdk = { path = "../../../sdk" }
tonic-build = "0.13.1"
prost = "0.13.3"
prost-build = "0.12"
prost-reflect = "0.14.2"
tonic-prost-build = "0.14"
prost = "0.14"
prost-reflect = "0.16"
tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
tokio-stream = "0.1.16"
tonic = { version = "0.12.3", features = ["tls"] }
tonic = "0.14"
tracing = "0.1.41"
chrono = "0.4"
9 changes: 4 additions & 5 deletions examples/proto/single/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ publish = false

[dependencies]
databricks-zerobus-ingest-sdk = { path = "../../../sdk" }
tonic-build = "0.13.1"
prost = "0.13.3"
prost-build = "0.12"
prost-reflect = "0.14.2"
tonic-prost-build = "0.14"
prost = "0.14"
prost-reflect = "0.16"
tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
tokio-stream = "0.1.16"
tonic = { version = "0.12.3", features = ["tls"] }
tonic = "0.14"
tracing = "0.1.41"
chrono = "0.4"
4 changes: 2 additions & 2 deletions ffi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ databricks-zerobus-ingest-sdk = { path = "../sdk" }
# FFI helpers
tokio = { version = "1.42", features = ["rt", "rt-multi-thread"] }
once_cell = "1.19"
prost = "0.13.3"
prost-types = "0.13.3"
prost = "0.14"
prost-types = "0.14"
async-trait = "0.1"
libc = "0.2"

Expand Down
10 changes: 5 additions & 5 deletions jni/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ name = "zerobus_jni"
databricks-zerobus-ingest-sdk = { path = "../sdk", features = ["arrow-flight"] }
jni = "0.21"
tokio = { version = "1.42", features = ["rt-multi-thread", "sync"] }
prost = "0.13"
prost-types = "0.13"
prost = "0.14"
prost-types = "0.14"
thiserror = "1.0"
tracing = "0.1"

# Arrow dependencies (re-exported from SDK)
arrow-array = "56.2.0"
arrow-schema = "56.2.0"
arrow-ipc = { version = "56.2.0", features = ["lz4", "zstd"] }
arrow-array = "57"
arrow-schema = "57"
arrow-ipc = { version = "57", features = ["lz4", "zstd"] }

[features]
default = []
17 changes: 9 additions & 8 deletions sdk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ documentation = "https://docs.rs/databricks-zerobus-ingest-sdk"

[dependencies]
async-trait = "0.1"
prost = "0.13.3"
prost-types = "0.13.3"
prost = "0.14"
prost-types = "0.14"
reqwest = { version = "0.12", features = ["json", "rustls-tls"], default-features = false }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
Expand All @@ -24,19 +24,20 @@ tokio = { version = "1.42.0", features = ["macros", "rt-multi-thread", "fs", "sy
tokio-retry = "0.3"
tokio-stream = "0.1.16"
tokio-util = { version = "0.7.17", features = ["rt"] }
tonic = { version = "0.13", features = ["tls-native-roots", "transport"] }
tonic = { version = "0.14", features = ["tls-native-roots", "transport"] }
tonic-prost = "0.14"
tracing = "0.1.41"
smallvec = "1.15.1"

# Arrow Flight dependencies
arrow-flight = { version = "56.2.0", default-features = false, optional = true }
arrow-array = { version = "56.2.0", default-features = false, optional = true }
arrow-schema = { version = "56.2.0", default-features = false, optional = true }
arrow-ipc = { version = "56.2.0", default-features = false, optional = true, features = ["lz4","zstd"] }
arrow-flight = { version = "57", default-features = false, optional = true }
arrow-array = { version = "57", default-features = false, optional = true }
arrow-schema = { version = "57", default-features = false, optional = true }
arrow-ipc = { version = "57", default-features = false, optional = true, features = ["lz4","zstd"] }
futures = { version = "0.3", optional = true }

[build-dependencies]
tonic-build = "0.13"
tonic-prost-build = "0.14"
protoc-bin-vendored = "3.0.0"

[features]
Expand Down
2 changes: 1 addition & 1 deletion sdk/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
fn main() {
std::env::set_var("PROTOC", protoc_bin_vendored::protoc_bin_path().unwrap());
tonic_build::compile_protos("zerobus_service.proto")
tonic_prost_build::compile_protos("zerobus_service.proto")
.unwrap_or_else(|e| panic!("Failed to compile protos {:?}", e));
}
17 changes: 9 additions & 8 deletions tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,25 @@ path = "src/rust_tests.rs"

[dependencies]
async-trait = "0.1"
prost = "0.13.3"
prost-reflect = "0.14"
prost-types = "0.13.3"
prost = "0.14"
prost-reflect = "0.16"
prost-types = "0.14"
tokio = { version = "1.42.0", features = ["macros", "rt-multi-thread", "sync", "time"] }
tokio-stream = { version = "0.1.16", features = ["net"] }
tonic = { version = "0.13", features = ["tls-native-roots", "transport"] }
tonic = { version = "0.14", features = ["tls-native-roots", "transport"] }
tonic-prost = "0.14"
tracing = "0.1.41"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
databricks-zerobus-ingest-sdk = { path = "../sdk", features = ["testing", "arrow-flight"] }

# Arrow Flight test dependencies
arrow-flight = { version = "56.2.0", default-features = false }
arrow-array = { version = "56.2.0", default-features = false }
arrow-schema = { version = "56.2.0", default-features = false }
arrow-flight = { version = "57", default-features = false }
arrow-array = { version = "57", default-features = false }
arrow-schema = { version = "57", default-features = false }
futures = "0.3"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"

[build-dependencies]
tonic-build = "0.13"
tonic-prost-build = "0.14"
protoc-bin-vendored = "3.0.0"
2 changes: 1 addition & 1 deletion tests/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
fn main() -> Result<(), Box<dyn std::error::Error>> {
tonic_build::configure()
tonic_prost_build::configure()
.build_server(true)
.build_client(false)
.compile_protos(&["../sdk/zerobus_service.proto"], &["../sdk"])?;
Expand Down
7 changes: 4 additions & 3 deletions tools/generate_files/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ serde = { version = "1", features = ["derive"] }
serde_json = "1.0"
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
urlencoding = "2"
tonic-build = "0.12.3"
tonic-prost-build = "0.14"
tempfile = "3.21.0"
prost = "0.12"
tonic = "0.12"
prost = "0.14"
tonic = "0.14"
tonic-prost = "0.14"

[build-dependencies]
protoc-bin-vendored = "3"
2 changes: 1 addition & 1 deletion tools/generate_files/src/generate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ pub fn generate_rust_and_descriptor(
.context("bad filename")?;
let desc_file = output_dir.join(format!("{}.descriptor", file_name));

tonic_build::configure()
tonic_prost_build::configure()
.out_dir(output_dir)
.file_descriptor_set_path(&desc_file)
.compile_protos(
Expand Down
Loading