Merge pull request #47 from blockscout/lok52/bump-tonic

chore: bump tonic and prost

Author: lok52

Cargo.toml

@@ -9,17 +9,17 @@ members = [
 ]
 
 [workspace.package]
-version = "0.2.3"
+version = "0.3.0"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/blockscout/actix-prost"
 exclude = ["tests"]
 
 [workspace.dependencies]
-actix-prost = { version = "0.2.3", path = "actix-prost" }
-actix-prost-build = { version = "0.2.3", path = "actix-prost-build" }
-actix-prost-macros = { version = "0.2.3", path = "actix-prost-macros" }
-convert-trait = { version = "0.2.3", path = "actix-prost-convert-trait", package = "actix-prost-convert-trait" }
+actix-prost = { version = "0.3.0", path = "actix-prost" }
+actix-prost-build = { version = "0.3.0", path = "actix-prost-build" }
+actix-prost-macros = { version = "0.3.0", path = "actix-prost-macros" }
+convert-trait = { version = "0.3.0", path = "actix-prost-convert-trait", package = "actix-prost-convert-trait" }
 
 actix-http = { version = "3" }
 actix-web = { version = "4" }
@@ -32,9 +32,9 @@ http = { version = "1.2" }
 pretty_assertions = { version = "1.4" }
 prettyplease = { version = "0.2" }
 proc-macro2 = { version = "1.0" }
-prost = { version = "0.13" }
-prost-build = { version = "0.13" }
-prost-reflect = { version = "0.14.4" }
+prost = { version = "0.14" }
+prost-build = { version = "0.14" }
+prost-reflect = { version = "0.16" }
 quote = { version = "1.0" }
 reqwest = { version = "0.12" }
 serde = { version = "1" }
@@ -44,8 +44,9 @@ serde_yaml = { version = "0.9" }
 syn = { version = "2.0" }
 thiserror = { version = "2.0" }
 tokio = { version = "1" }
-tonic = { version = "0.12" }
-tonic-build = { version = "0.12" }
+tonic = { version = "0.14" }
+tonic-prost = { version = "0.14" }
+tonic-prost-build = { version = "0.14" }
 url = { version = "2" }
 chrono = { version = "0.4", features = ["serde"] }
 uuid = { version = "1.0"}

actix-prost-convert-trait/src/datetime.rs

@@ -78,7 +78,6 @@ impl TryConvert<String> for NaiveDateTime {
     }
 }
 
-
 // implemented via Debug according to the implementation of the serde module
 // https://github.com/chronotope/chrono/blob/e632ffd3b89d3cfaa96776f2368ee4c21a972766/src/naive/datetime/serde.rs#L6-L26
 // https://docs.rs/chrono/latest/chrono/naive/struct.NaiveDateTime.html#impl-Debug-for-NaiveDateTime
@@ -213,7 +212,9 @@ mod tests {
         let string = String::try_convert(datetime).unwrap();
         assert_eq!(string, "2021-01-01T00:00:00.123456789+00:00");
 
-        let datetime = "2021-01-01T00:00:00.123456789".parse::<NaiveDateTime>().unwrap();
+        let datetime = "2021-01-01T00:00:00.123456789"
+            .parse::<NaiveDateTime>()
+            .unwrap();
         let string = String::try_convert(datetime).unwrap();
         assert_eq!(string, "2021-01-01T00:00:00.123456789");
     }

tests/Cargo.toml

@@ -22,6 +22,7 @@ serde_json = { workspace = true }
 serde_with = { workspace = true, features = [ "base64" ] }
 tokio = { workspace = true, features = [ "rt-multi-thread", "macros" ] }
 tonic = { workspace = true }
+tonic-prost = { workspace = true }
 chrono = { workspace = true, features = ["serde"] }
 uuid = { workspace = true, features = ["serde"] }
 rust_decimal = { workspace = true, features = ["serde"] }
@@ -30,7 +31,7 @@ rust_decimal = { workspace = true, features = ["serde"] }
 [build-dependencies]
 actix-prost-build = { workspace = true, features = [ "conversions" ] }
 prost-build = { workspace = true }
-tonic-build = { workspace = true }
+tonic-prost-build = { workspace = true }
 
 [dev-dependencies]
 pretty_assertions = { workspace = true }

tests/build.rs

@@ -51,7 +51,7 @@ fn compile(
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let gens = Box::new(GeneratorList::new(vec![
-        tonic_build::configure().service_generator(),
+        tonic_prost_build::configure().service_generator(),
         Box::new(ActixGenerator::new("proto/http_api.yaml").unwrap()),
     ]));
     compile(