Skip to content

Commit 44096e0

Browse files
aramikmaramikm
authored
Update: dependencies (#206)
# Goal The goal of this PR is update all dependencies
1 parent 625e9e4 commit 44096e0

File tree

14 files changed

+333
-213
lines changed

14 files changed

+333
-213
lines changed

‎Cargo.lock

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

‎Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ UNAME := $(shell uname)
77

88
PROTOC := protoc
99
ifeq ($(UNAME), Darwin)
10-
PROTOC = /opt/homebrew/opt/protobuf@21/bin/protoc
10+
PROTOC = /opt/homebrew/opt/protobuf@27/bin/protoc
1111
endif
1212

1313
CBINDGEN=${HOME}/.cargo/bin/cbindgen
@@ -159,9 +159,7 @@ install-protobuf-codegen:
159159
ifeq ($(UNAME), Darwin)
160160
install-protos: install-protobuf-codegen
161161
@echo "Installing protobuf package..."
162-
# Latest version of protobuf (@23) has flagged Rust codegen as experimental;
163-
# we'll stick with an earlier version (@21) until that's resolved.
164-
@brew install protobuf@21
162+
@brew install protobuf@27
165163
endif
166164
ifeq ($(UNAME), Linux)
167165
install-protos: install-protobuf-codegen

‎bridge/common/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[package]
22
name = "dsnp-graph-sdk-common"
3-
version = "1.1.3"
3+
version = "1.1.4"
44
edition = "2021"
55
license = "Apache-2.0"
66
publish = false
77

88
[dependencies]
9-
dsnp-graph-core = { version = "1.1.3", path = "../../core" }
10-
dsnp-graph-config = { version = "1.1.3", path = "../../config" }
11-
libc = "0.2.153"
12-
protobuf = { version = "3.4.0", features = ["with-bytes"] }
9+
dsnp-graph-core = { version = "1.1.4", path = "../../core" }
10+
dsnp-graph-config = { version = "1.1.4", path = "../../config" }
11+
libc = "0.2.155"
12+
protobuf = { version = "3.5.0", features = ["with-bytes"] }

‎bridge/common/src/proto_types/input.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// This file is generated by rust-protobuf 3.4.0. Do not edit
2-
// .proto file is parsed by protoc --rust-out=...
1+
// This file is generated by rust-protobuf 3.5.0. Do not edit
2+
// .proto file is parsed by protoc --rust_out=...
33
// @generated
44

55
// https://github.com/rust-lang/rust-clippy/issues/702
@@ -23,7 +23,7 @@
2323
2424
/// Generated files are compatible only with the same version
2525
/// of protobuf runtime.
26-
const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_4_0;
26+
const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_5_0;
2727

2828
// @@protoc_insertion_point(message:KeyData)
2929
#[derive(PartialEq,Clone,Default,Debug)]

‎bridge/common/src/proto_types/output.rs

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// This file is generated by rust-protobuf 3.4.0. Do not edit
2-
// .proto file is parsed by protoc --rust-out=...
1+
// This file is generated by rust-protobuf 3.5.0. Do not edit
2+
// .proto file is parsed by protoc --rust_out=...
33
// @generated
44

55
// https://github.com/rust-lang/rust-clippy/issues/702
@@ -23,7 +23,7 @@
2323
2424
/// Generated files are compatible only with the same version
2525
/// of protobuf runtime.
26-
const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_4_0;
26+
const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_5_0;
2727

2828
// @@protoc_insertion_point(message:SchemaConfig)
2929
#[derive(PartialEq,Clone,Default,Debug)]
@@ -222,7 +222,7 @@ impl Config {
222222
|m: &Config| { &m.max_key_page_size_bytes },
223223
|m: &mut Config| { &mut m.max_key_page_size_bytes },
224224
));
225-
fields.push(::protobuf::reflect::rt::v2::make_map_simpler_accessor::<_, _, _>(
225+
fields.push(::protobuf::reflect::rt::v2::make_map_simpler_accessor_new::<_, _>(
226226
"schema_map",
227227
|m: &Config| { &m.schema_map },
228228
|m: &mut Config| { &mut m.schema_map },
@@ -322,9 +322,7 @@ impl ::protobuf::Message for Config {
322322
entry_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len;
323323
my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(entry_size) + entry_size
324324
};
325-
for value in &self.dsnp_versions {
326-
my_size += ::protobuf::rt::int32_size(6, value.value());
327-
};
325+
my_size += ::protobuf::rt::vec_packed_enum_or_unknown_size(6, &self.dsnp_versions);
328326
if self.graph_public_key_schema_id != 0 {
329327
my_size += ::protobuf::rt::uint32_size(7, self.graph_public_key_schema_id);
330328
}
@@ -356,9 +354,7 @@ impl ::protobuf::Message for Config {
356354
os.write_uint32(1, *k)?;
357355
::protobuf::rt::write_message_field_with_cached_size(2, v, os)?;
358356
};
359-
for v in &self.dsnp_versions {
360-
os.write_enum(6, ::protobuf::EnumOrUnknown::value(v))?;
361-
};
357+
os.write_repeated_packed_enum_or_unknown(6, &self.dsnp_versions)?;
362358
if self.graph_public_key_schema_id != 0 {
363359
os.write_uint32(7, self.graph_public_key_schema_id)?;
364360
}
@@ -1886,18 +1882,14 @@ impl ::protobuf::Message for DsnpUsers {
18861882
#[allow(unused_variables)]
18871883
fn compute_size(&self) -> u64 {
18881884
let mut my_size = 0;
1889-
for value in &self.user {
1890-
my_size += ::protobuf::rt::uint64_size(1, *value);
1891-
};
1885+
my_size += ::protobuf::rt::vec_packed_uint64_size(1, &self.user);
18921886
my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields());
18931887
self.special_fields.cached_size().set(my_size as u32);
18941888
my_size
18951889
}
18961890

18971891
fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> {
1898-
for v in &self.user {
1899-
os.write_uint64(1, *v)?;
1900-
};
1892+
os.write_repeated_packed_uint64(1, &self.user)?;
19011893
os.write_unknown_fields(self.special_fields.unknown_fields())?;
19021894
::std::result::Result::Ok(())
19031895
}

‎bridge/ffi/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "dsnp-graph-sdk-ffi"
3-
version = "1.1.3"
3+
version = "1.1.4"
44
edition = "2021"
55
license = "Apache-2.0"
66
publish = false
@@ -10,8 +10,8 @@ name = "dsnp_graph_sdk_ffi"
1010
crate-type = ["staticlib"]
1111

1212
[dependencies]
13-
dsnp-graph-core = { version = "1.1.3", path = "../../core" }
14-
dsnp-graph-config = { version = "1.1.3", path = "../../config" }
15-
libc = "0.2.153"
16-
lazy_static = "1.4.0"
17-
anyhow = "1.0.80"
13+
dsnp-graph-core = { version = "1.1.4", path = "../../core" }
14+
dsnp-graph-config = { version = "1.1.4", path = "../../config" }
15+
libc = "0.2.155"
16+
lazy_static = "1.5.0"
17+
anyhow = "1.0.86"

‎bridge/jni/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "dsnp-graph-sdk-jni"
3-
version = "1.1.3"
3+
version = "1.1.4"
44
edition = "2021"
55
license = "Apache-2.0"
66
publish = false
@@ -10,11 +10,11 @@ name = "dsnp_graph_sdk_jni"
1010
crate-type = ["cdylib"]
1111

1212
[dependencies]
13-
dsnp-graph-core = { version = "1.1.3", path = "../../core" }
14-
dsnp-graph-config = { version = "1.1.3", path = "../../config" }
15-
dsnp-graph-sdk-common = { version = "1.1.3", path = "../common" }
13+
dsnp-graph-core = { version = "1.1.4", path = "../../core" }
14+
dsnp-graph-config = { version = "1.1.4", path = "../../config" }
15+
dsnp-graph-sdk-common = { version = "1.1.4", path = "../common" }
1616
jni = "0.21.1"
1717
cfg-if = "1.0.0"
18-
log = { version = "^0.4.21", features = ["std", "max_level_debug", "release_max_level_debug"] }
18+
log = { version = "^0.4.22", features = ["std", "max_level_debug", "release_max_level_debug"] }
1919
log-panics = { version = "^2.1.0", features = ["with-backtrace"]}
20-
protobuf = { version = "3.4.0", features = ["with-bytes"] }
20+
protobuf = { version = "3.5.0", features = ["with-bytes"] }

‎bridge/node/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "dsnp-graph-sdk-node"
3-
version = "1.1.3"
3+
version = "1.1.4"
44
edition = "2021"
55
license = "Apache-2.0"
66
publish = false
@@ -11,9 +11,9 @@ name = "dsnp_graph_sdk_node"
1111
crate-type = ["cdylib"]
1212

1313
[dependencies]
14-
dsnp-graph-core = { version = "1.1.3", path = "../../core" }
15-
dsnp-graph-config = { version = "1.1.3", path = "../../config" }
14+
dsnp-graph-core = { version = "1.1.4", path = "../../core" }
15+
dsnp-graph-config = { version = "1.1.4", path = "../../config" }
1616
neon = { version = "1.0.0", default-features = false, features = ["napi-6"] }
17-
serde = { version = "1.0.197", features = ["derive"] }
18-
serde_json = "1.0.114"
17+
serde = { version = "1.0.204", features = ["derive"] }
18+
serde_json = "1.0.122"
1919
once_cell = "1.19.0"

‎bridge/node/package-lock.json

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

‎bridge/node/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@dsnp/graph-sdk",
3-
"version": "1.1.3",
3+
"version": "1.1.4",
44
"author": "Amplica Labs",
55
"license": "Apache-2.0",
66
"description": "dsnp-graph-sdk-node",

‎config/Cargo.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,27 @@ homepage = "https://spec.dsnp.org"
55
license = "Apache-2.0"
66
publish = false
77
repository = "https://github.com/libertyDSNP/graph-sdk/"
8-
version = "1.1.3"
8+
version = "1.1.4"
99

1010
[lib]
1111
name = "dsnp_graph_config"
1212
path = "src/lib.rs"
1313
doctest = false
1414

1515
[dependencies]
16-
anyhow = "1.0.80"
17-
apache-avro = { version = "0.16.0", features = ["snappy"] }
18-
lazy_static = "1.4.0"
19-
log = { version = "^0.4.21", features = ["std", "max_level_debug", "release_max_level_debug"] }
20-
serde = { version = "1.0.197", features = ["derive"] }
21-
serde_json = "1.0.114"
22-
serde_with = "3.6.1"
23-
thiserror = "1.0.57"
16+
anyhow = "1.0.86"
17+
apache-avro = { version = "0.17.0", features = ["snappy"] }
18+
lazy_static = "1.5.0"
19+
log = { version = "^0.4.22", features = ["std", "max_level_debug", "release_max_level_debug"] }
20+
serde = { version = "1.0.204", features = ["derive"] }
21+
serde_json = "1.0.122"
22+
serde_with = "3.9.0"
23+
thiserror = "1.0.63"
2424

2525
[dev-dependencies]
2626
pretty_assertions = "1.4.0"
27-
test-log = "^0.2.15"
28-
env_logger = "^0.11.2"
27+
test-log = "^0.2.16"
28+
env_logger = "^0.11.5"
2929

3030
[features]
3131
calculate-page-capacity = []

0 commit comments

Comments
 (0)