From 0be2c7109bff71d0fac7b37b1463b980b4462568 Mon Sep 17 00:00:00 2001 From: Artur Yurii Korchynskyi <42449190+akorchyn@users.noreply.github.com> Date: Sat, 17 Aug 2024 00:08:27 +0300 Subject: [PATCH] chore: updated near-workspaces-rs (#1239) --- .github/workflows/test.yml | 4 ++-- examples/adder/Cargo.toml | 2 +- examples/callback-results/Cargo.toml | 2 +- examples/cross-contract-calls/Cargo.toml | 2 +- examples/factory-contract/Cargo.toml | 2 +- examples/fungible-token/Cargo.toml | 2 +- examples/lockable-fungible-token/Cargo.toml | 2 +- examples/non-fungible-token/Cargo.toml | 2 +- near-sdk/Cargo.toml | 6 +++--- near-sdk/compilation_tests/all.rs | 5 +++-- 10 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3ebafe3c7..7690fad84 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,11 +14,11 @@ jobs: matrix: platform: - os: ubuntu-latest - rs: 1.76.0 + rs: 1.78 - os: ubuntu-latest rs: stable - os: macos-latest - rs: 1.76.0 + rs: 1.78 - os: macos-latest rs: stable features: ['', '--features unstable,legacy,__abi-generate'] diff --git a/examples/adder/Cargo.toml b/examples/adder/Cargo.toml index bec5bafb9..89067b819 100644 --- a/examples/adder/Cargo.toml +++ b/examples/adder/Cargo.toml @@ -11,7 +11,7 @@ crate-type = ["cdylib"] near-sdk = { path = "../../near-sdk" } [dev-dependencies] -near-workspaces = "0.11.1" +near-workspaces = "0.12" tokio = { version = "1.14", features = ["full"] } anyhow = "1.0" near-abi = "0.4.0" diff --git a/examples/callback-results/Cargo.toml b/examples/callback-results/Cargo.toml index 52fafda73..204eaad4a 100644 --- a/examples/callback-results/Cargo.toml +++ b/examples/callback-results/Cargo.toml @@ -11,7 +11,7 @@ crate-type = ["cdylib"] near-sdk = { path = "../../near-sdk" } [dev-dependencies] -near-workspaces = "0.11.1" +near-workspaces = "0.12" tokio = { version = "1.14", features = ["full"] } anyhow = "1.0" near-sdk = { path = "../../near-sdk", features = ["unit-testing"] } diff --git a/examples/cross-contract-calls/Cargo.toml b/examples/cross-contract-calls/Cargo.toml index 118779daf..b02c26103 100644 --- a/examples/cross-contract-calls/Cargo.toml +++ b/examples/cross-contract-calls/Cargo.toml @@ -9,7 +9,7 @@ anyhow = "1.0" near-sdk = { path = "../../near-sdk", features = ["default", "unit-testing"] } test-case = "2.0" tokio = { version = "1.14", features = ["full"] } -near-workspaces = "0.11.1" +near-workspaces = "0.12" cross-contract-high-level = { path = "./high-level" } cross-contract-low-level = { path = "./low-level" } diff --git a/examples/factory-contract/Cargo.toml b/examples/factory-contract/Cargo.toml index 7fca0329d..4ba91fe3d 100644 --- a/examples/factory-contract/Cargo.toml +++ b/examples/factory-contract/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" anyhow = "1.0" test-case = "2.0" tokio = { version = "1.14", features = ["full"] } -near-workspaces = "0.11.1" +near-workspaces = "0.12" near-sdk = { path = "../../near-sdk", features = ["unit-testing"] } [profile.release] diff --git a/examples/fungible-token/Cargo.toml b/examples/fungible-token/Cargo.toml index b2a546724..f48f872be 100644 --- a/examples/fungible-token/Cargo.toml +++ b/examples/fungible-token/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" anyhow = "1.0" near-sdk = { path = "../../near-sdk", features = ["unit-testing"] } tokio = { version = "1.14", features = ["full"] } -near-workspaces = "0.11.1" +near-workspaces = "0.12" [profile.release] codegen-units = 1 diff --git a/examples/lockable-fungible-token/Cargo.toml b/examples/lockable-fungible-token/Cargo.toml index 01f9982e9..8a808e3bf 100644 --- a/examples/lockable-fungible-token/Cargo.toml +++ b/examples/lockable-fungible-token/Cargo.toml @@ -14,7 +14,7 @@ near-sdk = { path = "../../near-sdk", features = ["legacy"] } anyhow = "1.0" tokio = { version = "1.14", features = ["full"] } near-sdk = { path = "../../near-sdk", features = ["unit-testing"] } -near-workspaces = "0.11.1" +near-workspaces = "0.12" [profile.release] codegen-units = 1 diff --git a/examples/non-fungible-token/Cargo.toml b/examples/non-fungible-token/Cargo.toml index dcdeee7d9..fe4d40a0a 100644 --- a/examples/non-fungible-token/Cargo.toml +++ b/examples/non-fungible-token/Cargo.toml @@ -9,7 +9,7 @@ anyhow = "1.0" near-contract-standards = { path = "../../near-contract-standards" } near-sdk = { path = "../../near-sdk", features = ["unit-testing"] } tokio = { version = "1.14", features = ["full"] } -near-workspaces = "0.11.1" +near-workspaces = "0.12" [profile.release] codegen-units = 1 diff --git a/near-sdk/Cargo.toml b/near-sdk/Cargo.toml index b7edcceb9..0d51d20ea 100644 --- a/near-sdk/Cargo.toml +++ b/near-sdk/Cargo.toml @@ -31,8 +31,8 @@ bs58 = "0.5" once_cell = { version = "1.17", default-features = false } near-account-id = { version = "1.0.0", features = ["serde", "borsh"] } -near-gas = { version = "0.2.3", features = ["serde", "borsh"] } -near-token = { version = "0.2.1", features = ["serde", "borsh"] } +near-gas = { version = "0.3", features = ["serde", "borsh"] } +near-token = { version = "0.3", features = ["serde", "borsh"] } [target.'cfg(target_arch = "wasm32")'.dependencies] wee_alloc = { version = "0.4.5", default-features = false, optional = true } @@ -63,7 +63,7 @@ rand_chacha = "0.3.1" near-rng = "0.1.1" near-abi = { version = "0.4.0", features = ["__chunked-entries"] } symbolic-debuginfo = "12" -near-workspaces = { version = "0.11.1", features = ["unstable"] } +near-workspaces = { version = "0.12", features = ["unstable"] } anyhow = "1.0" tokio = { version = "1", features = ["full"] } strum = "0.25.0" diff --git a/near-sdk/compilation_tests/all.rs b/near-sdk/compilation_tests/all.rs index 611cc0734..9a8007083 100644 --- a/near-sdk/compilation_tests/all.rs +++ b/near-sdk/compilation_tests/all.rs @@ -23,8 +23,9 @@ fn compilation_tests() { t.pass("compilation_tests/function_error.rs"); t.pass("compilation_tests/enum_near_bindgen.rs"); t.pass("compilation_tests/schema_derive.rs"); - if rustversion::cfg!(since(1.78)) && std::env::consts::OS == "linux" { - // The compilation error output has slightly changed in 1.7x and between platforms, + + if rustversion::cfg!(since(1.80)) && std::env::consts::OS == "linux" { + // The compilation error output has slightly changed in 1.7x and 1.8x and between platforms, // so we snapshoted this single version t.compile_fail("compilation_tests/schema_derive_invalids.rs"); }