diff --git a/.ghjk/lock.json b/.ghjk/lock.json index 98ab0e57f8..9881a3abc4 100644 --- a/.ghjk/lock.json +++ b/.ghjk/lock.json @@ -730,6 +730,41 @@ "buildDepConfigs": {}, "portRef": "pnpm_ghrel@0.1.0", "specifiedVersion": true + }, + "bciqn2ct4mwrwyise3qlnabpine33dzt3lvnrhrbnkw4pnyryfe5is5a": { + "version": "3.7.1", + "buildDepConfigs": { + "cargo_binstall_ghrel": { + "version": "v1.10.9", + "buildDepConfigs": {}, + "portRef": "cargo_binstall_ghrel@0.1.0", + "specifiedVersion": false + }, + "rust_rustup": { + "version": "1.80.1", + "buildDepConfigs": { + "rustup_rustlang": { + "version": "1.27.1", + "buildDepConfigs": { + "git_aa": { + "version": "2.34.1", + "buildDepConfigs": {}, + "portRef": "git_aa@0.1.0", + "specifiedVersion": false + } + }, + "portRef": "rustup_rustlang@0.1.0", + "specifiedVersion": false + } + }, + "portRef": "rust_rustup@0.1.0", + "profile": "minimal", + "specifiedVersion": true + } + }, + "portRef": "cargobi_cratesio@0.1.0", + "crateName": "protobuf-codegen", + "specifiedVersion": true } } }, @@ -853,7 +888,7 @@ }, "ghjkEnvProvInstSet_______task_env_gen-subs-protoc": { "installs": [ - "bciqm2rvnfe77sj6jekrm65oayuywt5lbrw33qezqjcg5rzaioc6uszy", + "bciqifvrtbr5a6nomogpnbn7jxwscqpepdgh67lrsjpkh6t2odnjrnma", "bciqfjvqemdy7d6axvwkywcm6v66wogddvk7k6e6rps4e6zidkjvm4fy", "bciqlubbahrp4pxohyffmn5yj52atjgmn5nxepmkdev6wtmvpbx7kr7y", "bciqminqcmgw3fbbhibwc7tf6mrupttheic7kpiykadbowqmnzhmzo5a" @@ -3049,8 +3084,8 @@ }, "packageName": "@bytecodealliance/jco" }, - "bciqm2rvnfe77sj6jekrm65oayuywt5lbrw33qezqjcg5rzaioc6uszy": { - "version": "3.5.1", + "bciqifvrtbr5a6nomogpnbn7jxwscqpepdgh67lrsjpkh6t2odnjrnma": { + "version": "3.7.1", "port": { "ty": "denoWorker@v1", "name": "cargobi_cratesio", diff --git a/Cargo.lock b/Cargo.lock index c0518f22cd..c2b08796db 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5710,7 +5710,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -9065,9 +9065,9 @@ dependencies = [ [[package]] name = "protobuf" -version = "3.6.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3018844a02746180074f621e847703737d27d89d7f0721a7a4da317f88b16385" +checksum = "a3a7c64d9bf75b1b8d981124c14c179074e8caa7dfe7b6a12e6222ddcd0c8f72" dependencies = [ "once_cell", "protobuf-support", @@ -9076,9 +9076,9 @@ dependencies = [ [[package]] name = "protobuf-json-mapping" -version = "3.6.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d77c15a1dfbe22d088e5d31acbd6cae25eb15bd707de9ef00c58b508f11c76a" +checksum = "9b445cf83c9303695e6c423d269759e139b6182d2f1171e18afda7078a764336" dependencies = [ "protobuf", "protobuf-support", @@ -9087,9 +9087,9 @@ dependencies = [ [[package]] name = "protobuf-support" -version = "3.6.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf96d872914fcda2b66d66ea3fff2be7c66865d31c7bb2790cff32c0e714880" +checksum = "b088fd20b938a875ea00843b6faf48579462630015c3788d397ad6a786663252" dependencies = [ "thiserror", ] @@ -10913,7 +10913,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" dependencies = [ - "dirs 4.0.0", + "dirs 5.0.1", ] [[package]] @@ -12927,7 +12927,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", - "rand 0.7.3", + "rand 0.8.5", "static_assertions", ] diff --git a/src/substantial/Cargo.toml b/src/substantial/Cargo.toml index 7c07b23cf0..0d16767032 100644 --- a/src/substantial/Cargo.toml +++ b/src/substantial/Cargo.toml @@ -10,6 +10,6 @@ serde.workspace = true serde_json.workspace = true uuid.workspace = true -protobuf = "3.6.0" +protobuf = "3.7.1" # pinned due to url redis = "=0.25.4" diff --git a/src/substantial/src/protocol/events.rs b/src/substantial/src/protocol/events.rs index 91408fe2dc..658b02f173 100644 --- a/src/substantial/src/protocol/events.rs +++ b/src/substantial/src/protocol/events.rs @@ -1,5 +1,5 @@ -// This file is generated by rust-protobuf 3.5.1. Do not edit -// .proto file is parsed by protoc --rust_out=... +// This file is generated by rust-protobuf 3.7.1. Do not edit +// .proto file is parsed by protoc --rs_out=... // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -22,7 +22,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_6_0; +const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_7_1; // @@protoc_insertion_point(message:substantial.protos.events.Start) #[derive(PartialEq,Clone,Default,Debug)] diff --git a/src/substantial/src/protocol/metadata.rs b/src/substantial/src/protocol/metadata.rs index 01c44cf9a0..0d1e585760 100644 --- a/src/substantial/src/protocol/metadata.rs +++ b/src/substantial/src/protocol/metadata.rs @@ -1,5 +1,5 @@ -// This file is generated by rust-protobuf 3.5.1. Do not edit -// .proto file is parsed by protoc --rust_out=... +// This file is generated by rust-protobuf 3.7.1. Do not edit +// .proto file is parsed by protoc --rs_out=... // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -22,7 +22,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_6_0; +const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_7_1; // @@protoc_insertion_point(message:substantial.protos.metadata.Info) #[derive(PartialEq,Clone,Default,Debug)] diff --git a/tools/tasks/gen.ts b/tools/tasks/gen.ts index bab72d4f4b..b7e7b9210c 100644 --- a/tools/tasks/gen.ts +++ b/tools/tasks/gen.ts @@ -19,7 +19,7 @@ export default { workingDir: "src/substantial", inherit: "_rust", installs: [ - ports.cargobi({ crateName: "protobuf-codegen", version: "3.5.1" }), + ports.cargobi({ crateName: "protobuf-codegen", version: "3.7.1" }), ], fn: ($) => { // https://github.com/protocolbuffers/protobuf/issues/13346 @@ -27,7 +27,8 @@ export default { "protocol/events.proto", "protocol/metadata.proto", ]; - return $`protoc --proto_path=. ${protoFiles} --rust_out=src/protocol --rust_opt=experimental-codegen=enabled,kernel=cpp`; + + return $`protoc --proto_path=. ${protoFiles} --rs_out=src/protocol`; }, }, } satisfies Record;