Skip to content

Commit 0a72dcd

Browse files
authored
build: Bump rust edition and dependency versions in prost_build/somm_proto (#337)
1 parent d5e530a commit 0a72dcd

File tree

15 files changed

+3274
-1536
lines changed

15 files changed

+3274
-1536
lines changed

prost_build/Cargo.lock

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

prost_build/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[package]
2-
name = "somme_prost_build"
3-
version = "5.0.0"
2+
name = "somm_prost_build"
3+
version = "9.0.0"
44
authors = ["PeggyJV","Justin Kilpatrick <[email protected]>"]
5-
edition = "2018"
5+
edition = "2021"
66

77

88
[dependencies]
9-
prost = "0.7"
10-
tonic = "0.4"
11-
prost-build = "0.7"
9+
prost = "0.13"
10+
tonic = "0.12"
11+
prost-build = "0.13"
1212
tempdir = "0.3"
1313
walkdir = "2"
14-
tonic-build = "0.4"
14+
tonic-build = "0.12"
1515
regex = "1.5"

prost_build/src/main.rs

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,30 @@ fn compile_protos(out_dir: &Path, tmp_dir: &Path) {
100100
let mut config = prost_build::Config::default();
101101
config.out_dir(tmp_dir);
102102
config
103-
.type_attribute("ScheduledCorkProposal", "#[derive(serde::Deserialize, serde::Serialize)]")
104-
.type_attribute("AxelarScheduledCorkProposal", "#[derive(serde::Deserialize, serde::Serialize)]")
105-
.type_attribute("AddPublisherProposal", "#[derive(serde::Deserialize, serde::Serialize)]")
106-
.type_attribute("AddManagedCellarIDsProposalWithDeposit", "#[derive(serde::Deserialize, serde::Serialize)]")
107-
.type_attribute("AddAxelarManagedCellarIDsProposalWithDeposit", "#[derive(serde::Deserialize, serde::Serialize)]")
108-
.type_attribute("axelar_cork::CellarIdSet", "#[derive(serde::Deserialize, serde::Serialize)]")
103+
.type_attribute(
104+
"ScheduledCorkProposal",
105+
"#[derive(serde::Deserialize, serde::Serialize)]",
106+
)
107+
.type_attribute(
108+
"AxelarScheduledCorkProposal",
109+
"#[derive(serde::Deserialize, serde::Serialize)]",
110+
)
111+
.type_attribute(
112+
"AddPublisherProposal",
113+
"#[derive(serde::Deserialize, serde::Serialize)]",
114+
)
115+
.type_attribute(
116+
"AddManagedCellarIDsProposalWithDeposit",
117+
"#[derive(serde::Deserialize, serde::Serialize)]",
118+
)
119+
.type_attribute(
120+
"AddAxelarManagedCellarIDsProposalWithDeposit",
121+
"#[derive(serde::Deserialize, serde::Serialize)]",
122+
)
123+
.type_attribute(
124+
"axelar_cork::CellarIdSet",
125+
"#[derive(serde::Deserialize, serde::Serialize)]",
126+
)
109127
.compile_protos(&protos, &proto_include_paths)
110128
.unwrap();
111129

@@ -114,9 +132,8 @@ fn compile_protos(out_dir: &Path, tmp_dir: &Path) {
114132
tonic_build::configure()
115133
.build_client(true)
116134
.build_server(false)
117-
.format(true)
118135
.out_dir(tmp_dir)
119-
.compile_with_config(config, &protos, &proto_include_paths)
136+
.compile_protos_with_config(config, &protos, &proto_include_paths)
120137
.unwrap();
121138

122139
copy_generated_files(tmp_dir, out_dir);

0 commit comments

Comments
 (0)