From 119a2b2d1b1e9808ee47b89aa9bfdcd99bd265f7 Mon Sep 17 00:00:00 2001 From: Arseny Mitin Date: Tue, 1 Oct 2024 18:13:45 +0400 Subject: [PATCH 1/4] fix: remove the limit on minor version from near-sdk dependency --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 747d1cb..004cd26 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ keywords = ["near", "smart contract", "plugin"] [workspace.dependencies] bitflags = "1.3" -near-sdk = ">=5.2, <5.4" +near-sdk = ">=5.2" near-plugins = { path = "near-plugins" } near-plugins-derive = { path = "near-plugins-derive" } serde = "1" From bfd6e399f7ddb74342b7547768b1f032b22534c8 Mon Sep 17 00:00:00 2001 From: Arseny Mitin Date: Tue, 1 Oct 2024 19:20:37 +0400 Subject: [PATCH 2/4] fix: bump MSRV to use inline-const in near-sdk 5.5 --- .github/workflows/test.yml | 2 +- Cargo.toml | 2 +- .../tests/contracts/access_controllable/rust-toolchain | 2 +- near-plugins-derive/tests/contracts/ownable/rust-toolchain | 2 +- near-plugins-derive/tests/contracts/pausable/rust-toolchain | 2 +- near-plugins-derive/tests/contracts/upgradable/rust-toolchain | 2 +- near-plugins-derive/tests/contracts/upgradable_2/rust-toolchain | 2 +- .../tests/contracts/upgradable_state_migration/rust-toolchain | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 12545de..2956f3b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ on: env: RUST_BACKTRACE: full - MSRV: 1.76.0 + MSRV: 1.79.0 jobs: tests: diff --git a/Cargo.toml b/Cargo.toml index 004cd26..22abfd1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ authors = ["Aurora Labs "] # An update of the MSRV requires updating: # - `rust-toolchain` files in `near-plugins-derive/tests/contracts/**` # - the toolchain installed in CI via the `toolchain` parameter of `actions-rs/toolchain@v1` -rust-version = "1.76.0" +rust-version = "1.79.0" description = "Ergonomic plugin system to extend NEAR contracts." license = "CC0-1.0" readme = "README.md" diff --git a/near-plugins-derive/tests/contracts/access_controllable/rust-toolchain b/near-plugins-derive/tests/contracts/access_controllable/rust-toolchain index f8c0574..ad58735 100644 --- a/near-plugins-derive/tests/contracts/access_controllable/rust-toolchain +++ b/near-plugins-derive/tests/contracts/access_controllable/rust-toolchain @@ -1,4 +1,4 @@ [toolchain] -channel = "1.76.0" +channel = "1.79.0" components = ["clippy", "rustfmt"] targets = [ "wasm32-unknown-unknown" ] diff --git a/near-plugins-derive/tests/contracts/ownable/rust-toolchain b/near-plugins-derive/tests/contracts/ownable/rust-toolchain index f8c0574..ad58735 100644 --- a/near-plugins-derive/tests/contracts/ownable/rust-toolchain +++ b/near-plugins-derive/tests/contracts/ownable/rust-toolchain @@ -1,4 +1,4 @@ [toolchain] -channel = "1.76.0" +channel = "1.79.0" components = ["clippy", "rustfmt"] targets = [ "wasm32-unknown-unknown" ] diff --git a/near-plugins-derive/tests/contracts/pausable/rust-toolchain b/near-plugins-derive/tests/contracts/pausable/rust-toolchain index f8c0574..ad58735 100644 --- a/near-plugins-derive/tests/contracts/pausable/rust-toolchain +++ b/near-plugins-derive/tests/contracts/pausable/rust-toolchain @@ -1,4 +1,4 @@ [toolchain] -channel = "1.76.0" +channel = "1.79.0" components = ["clippy", "rustfmt"] targets = [ "wasm32-unknown-unknown" ] diff --git a/near-plugins-derive/tests/contracts/upgradable/rust-toolchain b/near-plugins-derive/tests/contracts/upgradable/rust-toolchain index f8c0574..ad58735 100644 --- a/near-plugins-derive/tests/contracts/upgradable/rust-toolchain +++ b/near-plugins-derive/tests/contracts/upgradable/rust-toolchain @@ -1,4 +1,4 @@ [toolchain] -channel = "1.76.0" +channel = "1.79.0" components = ["clippy", "rustfmt"] targets = [ "wasm32-unknown-unknown" ] diff --git a/near-plugins-derive/tests/contracts/upgradable_2/rust-toolchain b/near-plugins-derive/tests/contracts/upgradable_2/rust-toolchain index f8c0574..ad58735 100644 --- a/near-plugins-derive/tests/contracts/upgradable_2/rust-toolchain +++ b/near-plugins-derive/tests/contracts/upgradable_2/rust-toolchain @@ -1,4 +1,4 @@ [toolchain] -channel = "1.76.0" +channel = "1.79.0" components = ["clippy", "rustfmt"] targets = [ "wasm32-unknown-unknown" ] diff --git a/near-plugins-derive/tests/contracts/upgradable_state_migration/rust-toolchain b/near-plugins-derive/tests/contracts/upgradable_state_migration/rust-toolchain index f8c0574..ad58735 100644 --- a/near-plugins-derive/tests/contracts/upgradable_state_migration/rust-toolchain +++ b/near-plugins-derive/tests/contracts/upgradable_state_migration/rust-toolchain @@ -1,4 +1,4 @@ [toolchain] -channel = "1.76.0" +channel = "1.79.0" components = ["clippy", "rustfmt"] targets = [ "wasm32-unknown-unknown" ] From 4a0646f5ff9c7ff9c76f23ca2af82fbaa3fb50da Mon Sep 17 00:00:00 2001 From: Arseny Mitin Date: Tue, 1 Oct 2024 19:46:44 +0400 Subject: [PATCH 3/4] fix(tests): bump near-workspaces version --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 22abfd1..b69904b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,13 +23,13 @@ keywords = ["near", "smart contract", "plugin"] [workspace.dependencies] bitflags = "1.3" -near-sdk = ">=5.2" +near-sdk = ">=5.4" near-plugins = { path = "near-plugins" } near-plugins-derive = { path = "near-plugins-derive" } serde = "1" anyhow = "1.0" tokio = { version = "1", features = ["full"] } -near-workspaces = "0.11" +near-workspaces = "0.14" toml = "0.8" darling = "0.13.1" proc-macro2 = "1.0" From 30fe699d144df013395dbe3af44751e5f393399a Mon Sep 17 00:00:00 2001 From: Arseny Mitin Date: Tue, 1 Oct 2024 19:54:11 +0400 Subject: [PATCH 4/4] fix: do not impose near-sdk version requirement on crate itself --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index b69904b..588f7ac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ keywords = ["near", "smart contract", "plugin"] [workspace.dependencies] bitflags = "1.3" -near-sdk = ">=5.4" +near-sdk = ">=5.2" near-plugins = { path = "near-plugins" } near-plugins-derive = { path = "near-plugins-derive" } serde = "1"