Skip to content

Commit

Permalink
chore: updated near-workspaces-rs (#1239)
Browse files Browse the repository at this point in the history
  • Loading branch information
akorchyn authored Aug 16, 2024
1 parent 4551e43 commit 0be2c71
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
2 changes: 1 addition & 1 deletion examples/adder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion examples/callback-results/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/cross-contract-calls/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion examples/factory-contract/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion examples/fungible-token/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/lockable-fungible-token/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/non-fungible-token/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions near-sdk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions near-sdk/compilation_tests/all.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down

0 comments on commit 0be2c71

Please sign in to comment.