From 7ebb53cb687905bb15afad4b516e6f4d000d9de9 Mon Sep 17 00:00:00 2001 From: Tin Rabzelj Date: Mon, 22 Jul 2024 17:49:31 +0200 Subject: [PATCH] Upgrade deps --- Cargo.toml | 16 ++++++++-------- bomboni_common/Cargo.toml | 20 ++++++++++---------- bomboni_core/Cargo.toml | 6 +++--- bomboni_fs/Cargo.toml | 2 +- bomboni_prost/Cargo.toml | 12 ++++++------ bomboni_prost/src/context.rs | 3 +-- bomboni_prost/src/lib.rs | 1 - bomboni_proto/Cargo.toml | 22 +++++++++++----------- bomboni_proto/build.rs | 10 ---------- bomboni_request/Cargo.toml | 30 +++++++++++++++--------------- bomboni_request_derive/Cargo.toml | 10 +++++----- bomboni_template/Cargo.toml | 14 +++++++------- bomboni_wasm/Cargo.toml | 12 ++++++------ bomboni_wasm_core/Cargo.toml | 10 +++++----- bomboni_wasm_derive/Cargo.toml | 12 ++++++------ 15 files changed, 84 insertions(+), 96 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4e5de5c..406083e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bomboni" -version = "0.1.56" +version = "0.1.57" authors = ["Tin Rabzelj "] description = "Utility Library for Rust" repository = "https://github.com/tinrab/bomboni" @@ -51,11 +51,11 @@ fs = ["dep:bomboni_fs"] postgres = ["bomboni_common/postgres", "bomboni_request/postgres"] [dependencies] -bomboni_common = { path = "bomboni_common", version = "0.1.56" } +bomboni_common = { path = "bomboni_common", version = "0.1.57" } -bomboni_prost = { path = "bomboni_prost", version = "0.1.56", default-features = false, optional = true } -bomboni_proto = { path = "bomboni_proto", version = "0.1.56", default-features = false, optional = true } -bomboni_request = { path = "bomboni_request", version = "0.1.56", default-features = false, optional = true } -bomboni_template = { path = "bomboni_template", version = "0.1.56", default-features = false, optional = true } -bomboni_wasm = { path = "bomboni_wasm", version = "0.1.56", default-features = false, optional = true } -bomboni_fs = { path = "bomboni_fs", version = "0.1.56", default-features = false, optional = true } +bomboni_prost = { path = "bomboni_prost", version = "0.1.57", default-features = false, optional = true } +bomboni_proto = { path = "bomboni_proto", version = "0.1.57", default-features = false, optional = true } +bomboni_request = { path = "bomboni_request", version = "0.1.57", default-features = false, optional = true } +bomboni_template = { path = "bomboni_template", version = "0.1.57", default-features = false, optional = true } +bomboni_wasm = { path = "bomboni_wasm", version = "0.1.57", default-features = false, optional = true } +bomboni_fs = { path = "bomboni_fs", version = "0.1.57", default-features = false, optional = true } diff --git a/bomboni_common/Cargo.toml b/bomboni_common/Cargo.toml index 6d81950..beb140d 100644 --- a/bomboni_common/Cargo.toml +++ b/bomboni_common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bomboni_common" -version = "0.1.56" +version = "0.1.57" authors = ["Tin Rabzelj "] description = "Common things for Bomboni library." repository = "https://github.com/tinrab/bomboni" @@ -27,26 +27,26 @@ js = [] postgres = ["dep:postgres-types", "dep:bytes"] [dependencies] -bomboni_wasm = { path = "../bomboni_wasm", version = "0.1.56", features = [ +bomboni_wasm = { path = "../bomboni_wasm", version = "0.1.57", features = [ "derive", ], optional = true } -thiserror = "1.0.61" -regex = "1.10.4" +thiserror = "1.0.63" +regex = "1.10.5" time = { version = "0.3.36", features = ["formatting", "parsing"] } -tokio = { version = "1.37.0", features = ["time", "sync"], optional = true } -serde = { version = "1.0.202", features = ["derive"], optional = true } +tokio = { version = "1.38.1", features = ["time", "sync"], optional = true } +serde = { version = "1.0.204", features = ["derive"], optional = true } chrono = { version = "0.4.38", optional = true } -postgres-types = { version = "0.2.6", features = [ +postgres-types = { version = "0.2.7", features = [ "with-time-0_3", ], optional = true } -bytes = { version = "1.6.0", optional = true } +bytes = { version = "1.6.1", optional = true } [target.'cfg(all(target_family = "wasm", not(any(target_os = "emscripten", target_os = "wasi"))))'.dependencies] wasm-bindgen = { version = "0.2.92", optional = true } js-sys = { version = "0.3.69", optional = true } [dev-dependencies] -serde_json = "1.0.117" -tokio = { version = "1.37.0", features = ["rt-multi-thread", "macros"] } +serde_json = "1.0.120" +tokio = { version = "1.38.1", features = ["rt-multi-thread", "macros"] } diff --git a/bomboni_core/Cargo.toml b/bomboni_core/Cargo.toml index bbff24a..681ee02 100644 --- a/bomboni_core/Cargo.toml +++ b/bomboni_core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bomboni_core" -version = "0.1.56" +version = "0.1.57" authors = ["Tin Rabzelj "] description = "Internal part of Bomboni library." repository = "https://github.com/tinrab/bomboni" @@ -15,6 +15,6 @@ path = "src/lib.rs" [dependencies] convert_case = "0.6.0" -proc-macro2 = "1.0.83" -syn = { version = "2.0.66", features = ["full"] } +proc-macro2 = "1.0.86" +syn = { version = "2.0.72", features = ["full"] } quote = "1.0.36" diff --git a/bomboni_fs/Cargo.toml b/bomboni_fs/Cargo.toml index d72112c..e92c11e 100644 --- a/bomboni_fs/Cargo.toml +++ b/bomboni_fs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bomboni_fs" -version = "0.1.56" +version = "0.1.57" authors = ["Tin Rabzelj "] description = "Utilites for working with the file system. Part of Bomboni library." repository = "https://github.com/tinrab/bomboni" diff --git a/bomboni_prost/Cargo.toml b/bomboni_prost/Cargo.toml index 5facd29..c44d6b4 100644 --- a/bomboni_prost/Cargo.toml +++ b/bomboni_prost/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bomboni_prost" -version = "0.1.56" +version = "0.1.57" authors = ["Tin Rabzelj "] description = "Utilities for working with prost. Part of Bomboni library." repository = "https://github.com/tinrab/bomboni" @@ -14,11 +14,11 @@ name = "bomboni_prost" path = "src/lib.rs" [dependencies] -bomboni_core = { path = "../bomboni_core", version = "0.1.56" } +bomboni_core = { path = "../bomboni_core", version = "0.1.57" } -prost = "0.12.6" -prost-types = "0.12.6" -proc-macro2 = "1.0.83" -syn = { version = "2.0.66", features = ["full"] } +prost = "0.13.1" +prost-types = "0.13.1" +proc-macro2 = "1.0.86" +syn = { version = "2.0.72", features = ["full"] } quote = "1.0.36" prettyplease = "0.2.20" diff --git a/bomboni_prost/src/context.rs b/bomboni_prost/src/context.rs index b2e3272..c5569c9 100644 --- a/bomboni_prost/src/context.rs +++ b/bomboni_prost/src/context.rs @@ -1,11 +1,10 @@ use crate::config::CompileConfig; use bomboni_core::string::{str_to_case, Case}; -use prost_types::{DescriptorProto, FileDescriptorSet, OneofDescriptorProto}; +use prost_types::{DescriptorProto, OneofDescriptorProto}; use syn::{parse_quote, ExprPath, PathSegment}; pub struct Context<'a> { pub config: &'a CompileConfig, - pub descriptor: &'a FileDescriptorSet, pub package_name: String, pub path: Vec, } diff --git a/bomboni_prost/src/lib.rs b/bomboni_prost/src/lib.rs index 259ce03..c5e9320 100644 --- a/bomboni_prost/src/lib.rs +++ b/bomboni_prost/src/lib.rs @@ -48,7 +48,6 @@ pub fn compile(config: CompileConfig) -> Result<(), Box> { let context = Context { config: &config, - descriptor: &descriptor, package_name: package_name.clone(), path: Vec::default(), }; diff --git a/bomboni_proto/Cargo.toml b/bomboni_proto/Cargo.toml index a5bfa0a..26447bf 100644 --- a/bomboni_proto/Cargo.toml +++ b/bomboni_proto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bomboni_proto" -version = "0.1.56" +version = "0.1.57" authors = ["Tin Rabzelj "] description = "Utilities for working with Protobuf/gRPC. Part of Bomboni library." repository = "https://github.com/tinrab/bomboni" @@ -30,29 +30,29 @@ js = ["bomboni_common/js"] [dependencies] bomboni_common = { path = "../bomboni_common", features = [ "serde", -], version = "0.1.56" } +], version = "0.1.57" } -thiserror = "1.0.61" +thiserror = "1.0.63" time = { version = "0.3.36", features = ["serde", "formatting", "parsing"] } -prost = "0.12.6" -serde = { version = "1.0.202", features = ["derive"] } -serde_json = "1.0.117" +prost = "0.13.1" +serde = { version = "1.0.204", features = ["derive"] } +serde_json = "1.0.120" pot = "3.0.0" -tonic = { version = "0.11.0", optional = true } +tonic = { version = "0.12.1", optional = true } http = { version = "1.1.0", optional = true } chrono = { version = "0.4.38", optional = true } [target.'cfg(all(target_family = "wasm", not(any(target_os = "emscripten", target_os = "wasi"))))'.dependencies] -bomboni_wasm = { path = "../bomboni_wasm", version = "0.1.56", optional = true } +bomboni_wasm = { path = "../bomboni_wasm", version = "0.1.57", optional = true } wasm-bindgen = { version = "0.2.92", optional = true } js-sys = { version = "0.3.69", optional = true } serde-wasm-bindgen = { version = "0.6.5", optional = true } [dev-dependencies] -serde_json = "1.0.117" +serde_json = "1.0.120" [build-dependencies] -bomboni_prost = { path = "../bomboni_prost", version = "0.1.56" } -prost-build = "0.12.6" +bomboni_prost = { path = "../bomboni_prost", version = "0.1.57" } +prost-build = "0.13.1" diff --git a/bomboni_proto/build.rs b/bomboni_proto/build.rs index 5f2f92f..92c4f29 100644 --- a/bomboni_proto/build.rs +++ b/bomboni_proto/build.rs @@ -68,7 +68,6 @@ fn main() -> Result<(), Box> { .btree_map(["."]); build_serde(&mut config); - build_copy_derive(&mut config); if std::env::var("CARGO_CFG_TARGET_FAMILY") == Ok("wasm".into()) && cfg!(feature = "wasm") { build_wasm(&mut config); } @@ -131,15 +130,6 @@ fn build_serde(config: &mut Config) { ); } -fn build_copy_derive(config: &mut Config) { - for message_name in ["Timestamp", "Empty", "Duration"] { - config.message_attribute( - format!(".google.protobuf.{message_name}"), - r"#[derive(Copy)]", - ); - } -} - fn build_wasm(config: &mut Config) { let error_details = [ "Status", diff --git a/bomboni_request/Cargo.toml b/bomboni_request/Cargo.toml index e48a134..0094423 100644 --- a/bomboni_request/Cargo.toml +++ b/bomboni_request/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bomboni_request" -version = "0.1.56" +version = "0.1.57" authors = ["Tin Rabzelj "] description = "Utilities for working with API requests. Part of Bomboni library." repository = "https://github.com/tinrab/bomboni" @@ -29,36 +29,36 @@ wasm = [ postgres = ["dep:postgres-types", "dep:bytes"] [dependencies] -bomboni_common = { path = "../bomboni_common", version = "0.1.56" } -bomboni_proto = { path = "../bomboni_proto", version = "0.1.56" } -bomboni_request_derive = { path = "../bomboni_request_derive", version = "0.1.56" } -bomboni_wasm = { path = "../bomboni_wasm", version = "0.1.56", features = [ +bomboni_common = { path = "../bomboni_common", version = "0.1.57" } +bomboni_proto = { path = "../bomboni_proto", version = "0.1.57" } +bomboni_request_derive = { path = "../bomboni_request_derive", version = "0.1.57" } +bomboni_wasm = { path = "../bomboni_wasm", version = "0.1.57", features = [ "derive", ], optional = true } -thiserror = "1.0.61" +thiserror = "1.0.63" itertools = "0.13.0" -prost = "0.12.6" -pest = "2.7.10" -pest_derive = "2.7.10" +prost = "0.13.1" +pest = "2.7.11" +pest_derive = "2.7.11" base64ct = { version = "1.6.0", features = ["alloc"] } aes-gcm = { version = "0.10.3", features = ["alloc"] } blake2 = "0.10.6" rsa = "0.9.6" rand = "0.8.5" -regex = "1.10.4" -serde = { version = "1.0.202", features = ["derive"] } +regex = "1.10.5" +serde = { version = "1.0.204", features = ["derive"] } -tonic = { version = "0.11.0", optional = true } +tonic = { version = "0.12.1", optional = true } getrandom = { version = "0.2.15", features = ["js"], optional = true } -postgres-types = { version = "0.2.6", features = [ +postgres-types = { version = "0.2.7", features = [ "with-time-0_3", ], optional = true } -bytes = { version = "1.6.0", optional = true } +bytes = { version = "1.6.1", optional = true } [target.'cfg(all(target_family = "wasm", not(any(target_os = "emscripten", target_os = "wasi"))))'.dependencies] wasm-bindgen = { version = "0.2.92", optional = true } js-sys = { version = "0.3.69", optional = true } [dev-dependencies] -serde_json = "1.0.117" +serde_json = "1.0.120" diff --git a/bomboni_request_derive/Cargo.toml b/bomboni_request_derive/Cargo.toml index 19bd4dd..86d2547 100644 --- a/bomboni_request_derive/Cargo.toml +++ b/bomboni_request_derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bomboni_request_derive" -version = "0.1.56" +version = "0.1.57" authors = ["Tin Rabzelj "] description = "Internal request derive macros for Bomboni library." repository = "https://github.com/tinrab/bomboni" @@ -15,9 +15,9 @@ path = "src/lib.rs" proc-macro = true [dependencies] -bomboni_core = { path = "../bomboni_core", version = "0.1.56" } +bomboni_core = { path = "../bomboni_core", version = "0.1.57" } -proc-macro2 = { version = "1.0.83", features = ["proc-macro"] } -syn = "2.0.66" +proc-macro2 = { version = "1.0.86", features = ["proc-macro"] } +syn = "2.0.72" quote = "1.0.36" -darling = "0.20.9" +darling = "0.20.10" diff --git a/bomboni_template/Cargo.toml b/bomboni_template/Cargo.toml index 5d326c2..7c88938 100644 --- a/bomboni_template/Cargo.toml +++ b/bomboni_template/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bomboni_template" -version = "0.1.56" +version = "0.1.57" authors = ["Tin Rabzelj "] description = "Utilities for working Handlebars templates. Part of Bomboni library." repository = "https://github.com/tinrab/bomboni" @@ -18,11 +18,11 @@ default = ["testing"] testing = [] [dependencies] -bomboni_common = { path = "../bomboni_common", version = "0.1.56" } -bomboni_proto = { version = "0.1.56", path = "../bomboni_proto" } +bomboni_common = { path = "../bomboni_common", version = "0.1.57" } +bomboni_proto = { version = "0.1.57", path = "../bomboni_proto" } -thiserror = "1.0.61" -handlebars = "5.1.2" -serde = { version = "1.0.202", features = ["derive"] } -serde_json = "1.0.117" +thiserror = "1.0.63" +handlebars = "6.0.0" +serde = { version = "1.0.204", features = ["derive"] } +serde_json = "1.0.120" convert_case = "0.6.0" diff --git a/bomboni_wasm/Cargo.toml b/bomboni_wasm/Cargo.toml index 24cbfd3..62aeac9 100644 --- a/bomboni_wasm/Cargo.toml +++ b/bomboni_wasm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bomboni_wasm" -version = "0.1.56" +version = "0.1.57" authors = ["Tin Rabzelj "] description = "Utilities for working with WASM. Part of Bomboni library." repository = "https://github.com/tinrab/bomboni" @@ -18,14 +18,14 @@ derive = ["dep:bomboni_wasm_derive"] js = ["bomboni_wasm_core/js"] [dependencies] -bomboni_wasm_core = { path = "../bomboni_wasm_core", version = "0.1.56" } -bomboni_wasm_derive = { path = "../bomboni_wasm_derive", version = "0.1.56", optional = true } +bomboni_wasm_core = { path = "../bomboni_wasm_core", version = "0.1.57" } +bomboni_wasm_derive = { path = "../bomboni_wasm_derive", version = "0.1.57", optional = true } -serde = "1.0.202" +serde = "1.0.204" wasm-bindgen = "0.2.92" js-sys = "0.3.69" serde-wasm-bindgen = "0.6.5" [dev-dependencies] -serde = { version = "1.0.202", features = ["derive"] } -serde_json = "1.0.117" +serde = { version = "1.0.204", features = ["derive"] } +serde_json = "1.0.120" diff --git a/bomboni_wasm_core/Cargo.toml b/bomboni_wasm_core/Cargo.toml index 9824be9..54e267f 100644 --- a/bomboni_wasm_core/Cargo.toml +++ b/bomboni_wasm_core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bomboni_wasm_core" -version = "0.1.56" +version = "0.1.57" authors = ["Tin Rabzelj "] description = "Internal WASM part of Bomboni library." repository = "https://github.com/tinrab/bomboni" @@ -17,11 +17,11 @@ path = "src/lib.rs" js = [] [dependencies] -bomboni_core = { path = "../bomboni_core", version = "0.1.56" } +bomboni_core = { path = "../bomboni_core", version = "0.1.57" } -proc-macro2 = { version = "1.0.83", features = ["proc-macro"] } -syn = "2.0.66" +proc-macro2 = { version = "1.0.86", features = ["proc-macro"] } +syn = "2.0.72" quote = "1.0.36" -darling = "0.20.9" +darling = "0.20.10" serde_derive_internals = "0.29.1" convert_case = "0.6.0" diff --git a/bomboni_wasm_derive/Cargo.toml b/bomboni_wasm_derive/Cargo.toml index 9846cf6..aa00418 100644 --- a/bomboni_wasm_derive/Cargo.toml +++ b/bomboni_wasm_derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bomboni_wasm_derive" -version = "0.1.56" +version = "0.1.57" authors = ["Tin Rabzelj "] description = "Internal WASM derive macros for Bomboni library." repository = "https://github.com/tinrab/bomboni" @@ -15,11 +15,11 @@ path = "src/lib.rs" proc-macro = true [dependencies] -bomboni_core = { path = "../bomboni_core", version = "0.1.56" } -bomboni_wasm_core = { path = "../bomboni_wasm_core", version = "0.1.56" } +bomboni_core = { path = "../bomboni_core", version = "0.1.57" } +bomboni_wasm_core = { path = "../bomboni_wasm_core", version = "0.1.57" } -proc-macro2 = { version = "1.0.83", features = ["proc-macro"] } -syn = "2.0.66" +proc-macro2 = { version = "1.0.86", features = ["proc-macro"] } +syn = "2.0.72" quote = "1.0.36" -darling = "0.20.9" +darling = "0.20.10" serde_derive_internals = "0.29.1"