Skip to content

Commit

Permalink
update near-sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
miraclx committed Aug 26, 2022
1 parent d9e61c7 commit d67ccc9
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 35 deletions.
1 change: 1 addition & 0 deletions integration-tests/templates/_Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ edition = "2021"
crate-type = ["cdylib"]

[dependencies]
near-sdk = { version = "4.1.0-pre.2", features = ["abi"] }
serde = { version = "1", features = ["derive"] }
schemars = "0.8"

Expand Down
5 changes: 1 addition & 4 deletions integration-tests/templates/_Cargo_no_abi_feature.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,10 @@ edition = "2021"
crate-type = ["cdylib"]

[dependencies]
near-sdk = { version = "4.1.0-pre.2" }
serde = { version = "1", features = ["derive"] }
schemars = "0.8"

[dependencies.near-sdk]
git = "https://github.com/near/near-sdk-rs.git"
rev = "13fbfc9930fb0ee162dd9c726ce02e15219c956d"

[workspace]
members = []

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ serde = { version = "1", features = ["derive"] }
schemars = "0.8"

[dependencies.near-sdk]
git = "https://github.com/near/near-sdk-rs.git"
rev = "13fbfc9930fb0ee162dd9c726ce02e15219c956d"
version = "4.1.0-pre.2"
features = ["abi"]

[workspace]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,10 @@ edition = "2021"
crate-type = ["cdylib"]

[dependencies]
near-sdk = { version = "4.1.0-pre.2", features = ["abi", "unstable"] }
serde = { version = "1", features = ["derive"] }
schemars = "0.8"

[dependencies.near-sdk]
git = "https://github.com/near/near-sdk-rs.git"
rev = "13fbfc9930fb0ee162dd9c726ce02e15219c956d"
features = ["abi", "unstable"]

[workspace]
members = []

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,10 @@ edition = "2021"
crate-type = ["cdylib"]

[dependencies]
near-sdk = { version = "4.1.0-pre.2", default-features = false, features = ["abi"] }
serde = { version = "1", features = ["derive"] }
schemars = "0.8"

[dependencies.near-sdk]
git = "https://github.com/near/near-sdk-rs.git"
rev = "13fbfc9930fb0ee162dd9c726ce02e15219c956d"
default-features = false
features = ["abi"]

[workspace]
members = []

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ serde = { version = "1", features = ["derive"] }
schemars = "0.8"

[patch.crates-io]
near-sdk = { git = "https://github.com/near/near-sdk-rs.git", rev = "13fbfc9930fb0ee162dd9c726ce02e15219c956d" }
near-sdk = { git = "https://github.com/near/near-sdk-rs.git", rev = "83cb1c40403e4156bd6d1d258237bbdf03326afc" }

[workspace]
members = []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,11 @@ crate-type = ["cdylib"]
serde = { version = "1", features = ["derive"] }
schemars = "0.8"

[target.'cfg(windows)'.dependencies.near-sdk]
git = "https://github.com/near/near-sdk-rs.git"
rev = "13fbfc9930fb0ee162dd9c726ce02e15219c956d"
features = ["abi"]
[target.'cfg(windows)'.dependencies]
near-sdk = { version = "4.1.0-pre.2", features = ["abi"] }

[target.'cfg(unix)'.dependencies.near-sdk]
git = "https://github.com/near/near-sdk-rs.git"
rev = "13fbfc9930fb0ee162dd9c726ce02e15219c956d"
features = ["abi"]
[target.'cfg(unix)'.dependencies]
near-sdk = { version = "4.1.0-pre.2", features = ["abi"] }

[workspace]
members = []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,10 @@ edition = "2021"
crate-type = ["cdylib"]

[dependencies]
near = { version = "4.1.0-pre.2", package = "near-sdk", features = ["abi"] }
serde = { version = "1", features = ["derive"] }
schemars = "0.8"

[dependencies.near]
package = "near-sdk"
git = "https://github.com/near/near-sdk-rs.git"
rev = "13fbfc9930fb0ee162dd9c726ce02e15219c956d"
features = ["abi"]

[workspace]
members = []

Expand Down
6 changes: 3 additions & 3 deletions integration-tests/tests/cargo/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fn clone_git_repo(version: &str) -> anyhow::Result<TempDir> {
#[test]
#[named]
fn test_dependency_local_path() -> anyhow::Result<()> {
let near_sdk_dir = clone_git_repo("13fbfc9930fb0ee162dd9c726ce02e15219c956d")?;
let near_sdk_dir = clone_git_repo("83cb1c40403e4156bd6d1d258237bbdf03326afc")?;
let near_sdk_dep_path = near_sdk_dir.path().join("near-sdk");

// near-sdk = { path = "::path::", features = ["abi"] }
Expand All @@ -40,7 +40,7 @@ fn test_dependency_local_path() -> anyhow::Result<()> {
#[test]
#[named]
fn test_dependency_local_path_with_version() -> anyhow::Result<()> {
let near_sdk_dir = clone_git_repo("13fbfc9930fb0ee162dd9c726ce02e15219c956d")?;
let near_sdk_dir = clone_git_repo("83cb1c40403e4156bd6d1d258237bbdf03326afc")?;
let near_sdk_dep_path = near_sdk_dir.path().join("near-sdk");

// near-sdk = { path = "::path::", version = "4.1.0-pre.1", features = ["abi"] }
Expand Down Expand Up @@ -172,7 +172,7 @@ fn test_dependency_patch() -> anyhow::Result<()> {
// near-sdk = { version = "4.1.0-pre.1", features = ["abi"] }
//
// [patch.crates-io]
// near-sdk = { git = "https://github.com/near/near-sdk-rs.git", rev = "13fbfc9930fb0ee162dd9c726ce02e15219c956d" }
// near-sdk = { git = "https://github.com/near/near-sdk-rs.git", rev = "83cb1c40403e4156bd6d1d258237bbdf03326afc" }
let abi_root = generate_abi_fn! {
with Cargo "/templates/sdk-dependency/_Cargo_patch.toml";

Expand Down

0 comments on commit d67ccc9

Please sign in to comment.