Update: dependencies (#206)

# Goal The goal of this PR is update all dependencies
ProjectLibertyLabs · Aug 7, 2024 · 44096e0 · 44096e0
1 parent 625e9e4
commit 44096e0
Show file tree

Hide file tree

Showing 14 changed files with 333 additions and 213 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ UNAME := $(shell uname)
 
 PROTOC := protoc
  ifeq ($(UNAME), Darwin)
-	PROTOC = /opt/homebrew/opt/protobuf@21/bin/protoc
+	PROTOC = /opt/homebrew/opt/protobuf@27/bin/protoc
 endif
 
 CBINDGEN=${HOME}/.cargo/bin/cbindgen
@@ -159,9 +159,7 @@ install-protobuf-codegen:
 ifeq ($(UNAME), Darwin)
 install-protos: install-protobuf-codegen
 	@echo "Installing protobuf package..."
-	# Latest version of protobuf (@23) has flagged Rust codegen as experimental;
-	# we'll stick with an earlier version (@21) until that's resolved.
-	@brew install protobuf@21
+	@brew install protobuf@27
 endif
 ifeq ($(UNAME), Linux)
 install-protos: install-protobuf-codegen

diff --git a/bridge/common/Cargo.toml b/bridge/common/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "dsnp-graph-sdk-common"
-version = "1.1.3"
+version = "1.1.4"
 edition = "2021"
 license = "Apache-2.0"
 publish = false
 
 [dependencies]
-dsnp-graph-core = { version = "1.1.3", path = "../../core" }
-dsnp-graph-config = { version = "1.1.3", path = "../../config" }
-libc = "0.2.153"
-protobuf = { version = "3.4.0", features = ["with-bytes"] }
+dsnp-graph-core = { version = "1.1.4", path = "../../core" }
+dsnp-graph-config = { version = "1.1.4", path = "../../config" }
+libc = "0.2.155"
+protobuf = { version = "3.5.0", features = ["with-bytes"] }
diff --git a/bridge/common/src/proto_types/input.rs b/bridge/common/src/proto_types/input.rs
@@ -1,5 +1,5 @@
-// This file is generated by rust-protobuf 3.4.0. Do not edit
-// .proto file is parsed by protoc --rust-out=...
+// This file is generated by rust-protobuf 3.5.0. Do not edit
+// .proto file is parsed by protoc --rust_out=...
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -23,7 +23,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_4_0;
+const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_5_0;
 
 // @@protoc_insertion_point(message:KeyData)
 #[derive(PartialEq,Clone,Default,Debug)]

diff --git a/bridge/common/src/proto_types/output.rs b/bridge/common/src/proto_types/output.rs
@@ -1,5 +1,5 @@
-// This file is generated by rust-protobuf 3.4.0. Do not edit
-// .proto file is parsed by protoc --rust-out=...
+// This file is generated by rust-protobuf 3.5.0. Do not edit
+// .proto file is parsed by protoc --rust_out=...
 // @generated
 
 // https://github.com/rust-lang/rust-clippy/issues/702
@@ -23,7 +23,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_4_0;
+const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_5_0;
 
 // @@protoc_insertion_point(message:SchemaConfig)
 #[derive(PartialEq,Clone,Default,Debug)]
@@ -222,7 +222,7 @@ impl Config {
             |m: &Config| { &m.max_key_page_size_bytes },
             |m: &mut Config| { &mut m.max_key_page_size_bytes },
         ));
-        fields.push(::protobuf::reflect::rt::v2::make_map_simpler_accessor::<_, _, _>(
+        fields.push(::protobuf::reflect::rt::v2::make_map_simpler_accessor_new::<_, _>(
             "schema_map",
             |m: &Config| { &m.schema_map },
             |m: &mut Config| { &mut m.schema_map },
@@ -322,9 +322,7 @@ impl ::protobuf::Message for Config {
             entry_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len;
             my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(entry_size) + entry_size
         };
-        for value in &self.dsnp_versions {
-            my_size += ::protobuf::rt::int32_size(6, value.value());
-        };
+        my_size += ::protobuf::rt::vec_packed_enum_or_unknown_size(6, &self.dsnp_versions);
         if self.graph_public_key_schema_id != 0 {
             my_size += ::protobuf::rt::uint32_size(7, self.graph_public_key_schema_id);
         }
@@ -356,9 +354,7 @@ impl ::protobuf::Message for Config {
             os.write_uint32(1, *k)?;
             ::protobuf::rt::write_message_field_with_cached_size(2, v, os)?;
         };
-        for v in &self.dsnp_versions {
-            os.write_enum(6, ::protobuf::EnumOrUnknown::value(v))?;
-        };
+        os.write_repeated_packed_enum_or_unknown(6, &self.dsnp_versions)?;
         if self.graph_public_key_schema_id != 0 {
             os.write_uint32(7, self.graph_public_key_schema_id)?;
         }
@@ -1886,18 +1882,14 @@ impl ::protobuf::Message for DsnpUsers {
     #[allow(unused_variables)]
     fn compute_size(&self) -> u64 {
         let mut my_size = 0;
-        for value in &self.user {
-            my_size += ::protobuf::rt::uint64_size(1, *value);
-        };
+        my_size += ::protobuf::rt::vec_packed_uint64_size(1, &self.user);
         my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields());
         self.special_fields.cached_size().set(my_size as u32);
         my_size
     }
 
     fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> {
-        for v in &self.user {
-            os.write_uint64(1, *v)?;
-        };
+        os.write_repeated_packed_uint64(1, &self.user)?;
         os.write_unknown_fields(self.special_fields.unknown_fields())?;
         ::std::result::Result::Ok(())
     }

diff --git a/bridge/ffi/Cargo.toml b/bridge/ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dsnp-graph-sdk-ffi"
-version = "1.1.3"
+version = "1.1.4"
 edition = "2021"
 license = "Apache-2.0"
 publish = false
@@ -10,8 +10,8 @@ name = "dsnp_graph_sdk_ffi"
 crate-type = ["staticlib"]
 
 [dependencies]
-dsnp-graph-core = { version = "1.1.3", path = "../../core" }
-dsnp-graph-config = { version = "1.1.3", path = "../../config" }
-libc = "0.2.153"
-lazy_static = "1.4.0"
-anyhow = "1.0.80"
+dsnp-graph-core = { version = "1.1.4", path = "../../core" }
+dsnp-graph-config = { version = "1.1.4", path = "../../config" }
+libc = "0.2.155"
+lazy_static = "1.5.0"
+anyhow = "1.0.86"
diff --git a/bridge/jni/Cargo.toml b/bridge/jni/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dsnp-graph-sdk-jni"
-version = "1.1.3"
+version = "1.1.4"
 edition = "2021"
 license = "Apache-2.0"
 publish = false
@@ -10,11 +10,11 @@ name = "dsnp_graph_sdk_jni"
 crate-type = ["cdylib"]
 
 [dependencies]
-dsnp-graph-core = { version = "1.1.3", path = "../../core" }
-dsnp-graph-config = { version = "1.1.3", path = "../../config" }
-dsnp-graph-sdk-common = { version = "1.1.3", path = "../common" }
+dsnp-graph-core = { version = "1.1.4", path = "../../core" }
+dsnp-graph-config = { version = "1.1.4", path = "../../config" }
+dsnp-graph-sdk-common = { version = "1.1.4", path = "../common" }
 jni = "0.21.1"
 cfg-if = "1.0.0"
-log = { version = "^0.4.21", features = ["std", "max_level_debug", "release_max_level_debug"] }
+log = { version = "^0.4.22", features = ["std", "max_level_debug", "release_max_level_debug"] }
 log-panics = { version = "^2.1.0", features = ["with-backtrace"]}
-protobuf = { version = "3.4.0", features = ["with-bytes"] }
+protobuf = { version = "3.5.0", features = ["with-bytes"] }
diff --git a/bridge/node/Cargo.toml b/bridge/node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dsnp-graph-sdk-node"
-version = "1.1.3"
+version = "1.1.4"
 edition = "2021"
 license = "Apache-2.0"
 publish = false
@@ -11,9 +11,9 @@ name = "dsnp_graph_sdk_node"
 crate-type = ["cdylib"]
 
 [dependencies]
-dsnp-graph-core = { version = "1.1.3", path = "../../core" }
-dsnp-graph-config = { version = "1.1.3", path = "../../config" }
+dsnp-graph-core = { version = "1.1.4", path = "../../core" }
+dsnp-graph-config = { version = "1.1.4", path = "../../config" }
 neon = { version = "1.0.0", default-features = false, features = ["napi-6"] }
-serde = { version = "1.0.197", features = ["derive"] }
-serde_json = "1.0.114"
+serde = { version = "1.0.204", features = ["derive"] }
+serde_json = "1.0.122"
 once_cell = "1.19.0"
diff --git a/bridge/node/package-lock.json b/bridge/node/package-lock.json
diff --git a/bridge/node/package.json b/bridge/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dsnp/graph-sdk",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "author": "Amplica Labs",
   "license": "Apache-2.0",
   "description": "dsnp-graph-sdk-node",

diff --git a/config/Cargo.toml b/config/Cargo.toml
@@ -5,27 +5,27 @@ homepage = "https://spec.dsnp.org"
 license = "Apache-2.0"
 publish = false
 repository = "https://github.com/libertyDSNP/graph-sdk/"
-version = "1.1.3"
+version = "1.1.4"
 
 [lib]
 name = "dsnp_graph_config"
 path = "src/lib.rs"
 doctest = false
 
 [dependencies]
-anyhow = "1.0.80"
-apache-avro = { version = "0.16.0", features = ["snappy"] }
-lazy_static = "1.4.0"
-log = { version = "^0.4.21", features = ["std", "max_level_debug", "release_max_level_debug"] }
-serde = { version = "1.0.197", features = ["derive"] }
-serde_json = "1.0.114"
-serde_with = "3.6.1"
-thiserror = "1.0.57"
+anyhow = "1.0.86"
+apache-avro = { version = "0.17.0", features = ["snappy"] }
+lazy_static = "1.5.0"
+log = { version = "^0.4.22", features = ["std", "max_level_debug", "release_max_level_debug"] }
+serde = { version = "1.0.204", features = ["derive"] }
+serde_json = "1.0.122"
+serde_with = "3.9.0"
+thiserror = "1.0.63"
 
 [dev-dependencies]
 pretty_assertions = "1.4.0"
-test-log = "^0.2.15"
-env_logger = "^0.11.2"
+test-log = "^0.2.16"
+env_logger = "^0.11.5"
 
 [features]
 calculate-page-capacity = []