From 6be8cde5ba5649ab6ae7e4c2c6b7db65332f6606 Mon Sep 17 00:00:00 2001 From: Viraj Bhartiya Date: Fri, 22 Nov 2024 09:55:08 +0530 Subject: [PATCH] refactor: Update cargo_near_build import in files --- examples/factory-contract/high-level/Cargo.toml | 3 +++ examples/factory-contract/high-level/build.rs | 11 +++++------ examples/factory-contract/low-level/Cargo.toml | 3 +++ examples/factory-contract/low-level/build.rs | 11 +++++------ 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/examples/factory-contract/high-level/Cargo.toml b/examples/factory-contract/high-level/Cargo.toml index 3225e6ce5..843b9ef86 100644 --- a/examples/factory-contract/high-level/Cargo.toml +++ b/examples/factory-contract/high-level/Cargo.toml @@ -12,3 +12,6 @@ near-sdk = { path = "../../../near-sdk" } [dev-dependencies] near-sdk = { path = "../../../near-sdk", features = ["unit-testing"] } + +[build-dependencies] +near-workspaces = { version = "0.15", features = ["unstable"] } diff --git a/examples/factory-contract/high-level/build.rs b/examples/factory-contract/high-level/build.rs index 0ed8feee2..9aabd7a17 100644 --- a/examples/factory-contract/high-level/build.rs +++ b/examples/factory-contract/high-level/build.rs @@ -1,5 +1,4 @@ use std::str::FromStr; - use near_workspaces::cargo_near_build; fn main() -> Result<(), Box> { @@ -9,9 +8,9 @@ fn main() -> Result<(), Box> { let nep330_contract_path = "examples/status-message"; let manifest = - camino::Utf8PathBuf::from_str(workdir).expect("pathbuf from str").join("Cargo.toml"); + cargo_near_build::camino::Utf8PathBuf::from_str(workdir).expect("pathbuf from str").join("Cargo.toml"); - let build_opts = BuildOpts::builder() + let build_opts = cargo_near_build::BuildOpts::builder() .manifest_path(manifest) .no_locked(true) .override_nep330_contract_path(nep330_contract_path) @@ -19,8 +18,8 @@ fn main() -> Result<(), Box> { .override_cargo_target_dir("../target/build-rs-status-message-for-high-level-factory") .build(); - let build_script_opts = extended::BuildScriptOpts::builder() - .rerun_if_changed_list(bon::vec![workdir, "Cargo.toml", "../Cargo.lock"]) + let build_script_opts = cargo_near_build::extended::BuildScriptOpts::builder() + .rerun_if_changed_list(vec![workdir, "Cargo.toml", "../Cargo.lock"]) .build_skipped_when_env_is(vec![ // shorter build for `cargo check` ("PROFILE", "debug"), @@ -30,7 +29,7 @@ fn main() -> Result<(), Box> { .result_env_key("BUILD_RS_SUB_BUILD_STATUS-MESSAGE") .build(); - let extended_opts = extended::BuildOptsExtended::builder() + let extended_opts = cargo_near_build::extended::BuildOptsExtended::builder() .build_opts(build_opts) .build_script_opts(build_script_opts) .build(); diff --git a/examples/factory-contract/low-level/Cargo.toml b/examples/factory-contract/low-level/Cargo.toml index 2807fb8c2..06411ef90 100644 --- a/examples/factory-contract/low-level/Cargo.toml +++ b/examples/factory-contract/low-level/Cargo.toml @@ -12,3 +12,6 @@ near-sdk = { path = "../../../near-sdk" } [dev-dependencies] near-sdk = { path = "../../../near-sdk", features = ["unit-testing"] } + +[build-dependencies] +near-workspaces = { version = "0.15", features = ["unstable"] } diff --git a/examples/factory-contract/low-level/build.rs b/examples/factory-contract/low-level/build.rs index 5364f9fac..b63bde38c 100644 --- a/examples/factory-contract/low-level/build.rs +++ b/examples/factory-contract/low-level/build.rs @@ -1,7 +1,6 @@ +use near_workspaces::cargo_near_build::*; use std::str::FromStr; -use near_workspaces::cargo_near_build; - fn main() -> Result<(), Box> { // directory of target `status-message` sub-contract's crate let workdir = "../../status-message"; @@ -11,7 +10,7 @@ fn main() -> Result<(), Box> { let manifest = camino::Utf8PathBuf::from_str(workdir).expect("pathbuf from str").join("Cargo.toml"); - let build_opts = BuildOpts::builder() + let build_opts = cargo_near_build::BuildOpts::builder() .manifest_path(manifest) .no_locked(true) .override_nep330_contract_path(nep330_contract_path) @@ -19,8 +18,8 @@ fn main() -> Result<(), Box> { .override_cargo_target_dir("../target/build-rs-status-message-for-low-level-factory") .build(); - let build_script_opts = extended::BuildScriptOpts::builder() - .rerun_if_changed_list(bon::vec![workdir, "Cargo.toml", "../Cargo.lock"]) + let build_script_opts = cargo_near_build::extended::BuildScriptOpts::builder() + .rerun_if_changed_list(vec![workdir, "Cargo.toml", "../Cargo.lock"]) .build_skipped_when_env_is(vec![ // shorter build for `cargo check` ("PROFILE", "debug"), @@ -30,7 +29,7 @@ fn main() -> Result<(), Box> { .result_env_key("BUILD_RS_SUB_BUILD_STATUS-MESSAGE") .build(); - let extended_opts = extended::BuildOptsExtended::builder() + let extended_opts = cargo_near_build::extended::BuildOptsExtended::builder() .build_opts(build_opts) .build_script_opts(build_script_opts) .build();