refactor: Update cargo_near_build import in files

near · Nov 22, 2024 · 6be8cde · 6be8cde
1 parent a343b68
commit 6be8cde
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git 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
@@ -1,5 +1,4 @@
 use std::str::FromStr;
-
 use near_workspaces::cargo_near_build;
 
 fn main() -> Result<(), Box<dyn std::error::Error + 'static>> {
@@ -9,18 +8,18 @@ fn main() -> Result<(), Box<dyn std::error::Error + 'static>> {
     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)
         // a distinct target is needed to avoid deadlock during build
         .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<dyn std::error::Error + 'static>> {
         .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
@@ -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
@@ -1,7 +1,6 @@
+use near_workspaces::cargo_near_build::*;
 use std::str::FromStr;
 
-use near_workspaces::cargo_near_build;
-
 fn main() -> Result<(), Box<dyn std::error::Error + 'static>> {
     // directory of target `status-message` sub-contract's crate
     let workdir = "../../status-message";
@@ -11,16 +10,16 @@ fn main() -> Result<(), Box<dyn std::error::Error + 'static>> {
     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)
         // a distinct target is needed to avoid deadlock during build
         .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<dyn std::error::Error + 'static>> {
         .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();