Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

Commit 8938033

Browse files
willhickeywillhickey
authored
Update solana dependency version to allow 2.0.0 (#6182)
* Update solana dependency version to allow 2.0.0 * Fix version number in solana-version.sh * Fix version numbers * Revert solana-version.sh with note * Revert Anchor version change * Relax dependency version upper bound to 2
1 parent d74ba01 commit 8938033

File tree

60 files changed

+190
-187
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+190
-187
lines changed

‎account-compression/programs/noop/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ cpi = ["no-entrypoint"]
1616
default = []
1717

1818
[dependencies]
19-
solana-program = "1.17.13"
19+
solana-program = ">=1.17.13,<=2"

‎associated-token-account/program-test/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ version = "0.0.1"
1111
test-sbf = []
1212

1313
[dev-dependencies]
14-
solana-program = "1.17.13"
15-
solana-program-test = "1.17.13"
16-
solana-sdk = "1.17.13"
14+
solana-program = ">=1.17.13,<=2"
15+
solana-program-test = ">=1.17.13,<=2"
16+
solana-sdk = ">=1.17.13,<=2"
1717
spl-associated-token-account = { version = "2", path = "../program", features = ["no-entrypoint"] }
1818
spl-token = { version = "4.0", path = "../../token/program", features = ["no-entrypoint"] }
1919
spl-token-2022 = { version = "1.0", path = "../../token/program-2022", features = ["no-entrypoint"] }

‎associated-token-account/program/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ assert_matches = "1.5.0"
1616
borsh = "0.10"
1717
num-derive = "0.4"
1818
num-traits = "0.2"
19-
solana-program = "1.17.13"
19+
solana-program = ">=1.17.13,<=2"
2020
spl-token = { version = "4.0", path = "../../token/program", features = ["no-entrypoint"] }
2121
spl-token-2022 = { version = "1.0", path = "../../token/program-2022", features = ["no-entrypoint"] }
2222
thiserror = "1.0"

‎binary-option/program/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ no-entrypoint = []
99
test-sbf = []
1010

1111
[dependencies]
12-
solana-program = "1.17.13"
12+
solana-program = ">=1.17.13,<=2"
1313
thiserror = "1.0"
1414
spl-token = {version = "4.0", path = "../../token/program", features = ["no-entrypoint"]}
1515
arrayref = "0.3.7"

‎binary-oracle-pair/program/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ test-sbf = []
1313
[dependencies]
1414
num-derive = "0.4"
1515
num-traits = "0.2"
16-
solana-program = "1.17.13"
16+
solana-program = ">=1.17.13,<=2"
1717
spl-token = { version = "4.0", path = "../../token/program", features = [ "no-entrypoint" ] }
1818
thiserror = "1.0"
1919
uint = "0.9"
2020
borsh = "0.10"
2121

2222
[dev-dependencies]
23-
solana-program-test = "1.17.13"
24-
solana-sdk = "1.17.13"
23+
solana-program-test = ">=1.17.13,<=2"
24+
solana-sdk = ">=1.17.13,<=2"
2525

2626
[lib]
2727
crate-type = ["cdylib", "lib"]

‎ci/solana-version.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
if [[ -n $SOLANA_VERSION ]]; then
1515
solana_version="$SOLANA_VERSION"
1616
else
17+
# This file is now out of sync with the versions in Cargo.toml.
18+
# https://github.com/solana-labs/solana-program-library/pull/6182
19+
# This will require some manual cleanup the next time the version is updated.
1720
solana_version=v1.17.13
1821
fi
1922

‎examples/rust/cross-program-invocation/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ no-entrypoint = []
1313
test-sbf = []
1414

1515
[dependencies]
16-
solana-program = "1.17.13"
16+
solana-program = ">=1.17.13,<=2"
1717

1818
[dev-dependencies]
19-
solana-program-test = "1.17.13"
20-
solana-sdk = "1.17.13"
19+
solana-program-test = ">=1.17.13,<=2"
20+
solana-sdk = ">=1.17.13,<=2"
2121

2222
[lib]
2323
crate-type = ["cdylib", "lib"]

‎examples/rust/custom-heap/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ no-entrypoint = []
1515
test-sbf = []
1616

1717
[dependencies]
18-
solana-program = "1.17.13"
18+
solana-program = ">=1.17.13,<=2"
1919

2020
[dev-dependencies]
21-
solana-program-test = "1.17.13"
22-
solana-sdk = "1.17.13"
21+
solana-program-test = ">=1.17.13,<=2"
22+
solana-sdk = ">=1.17.13,<=2"
2323

2424
[lib]
2525
crate-type = ["cdylib", "lib"]

‎examples/rust/logging/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ no-entrypoint = []
1313
test-sbf = []
1414

1515
[dependencies]
16-
solana-program = "1.17.13"
16+
solana-program = ">=1.17.13,<=2"
1717

1818
[dev-dependencies]
19-
solana-program-test = "1.17.13"
20-
solana-sdk = "1.17.13"
19+
solana-program-test = ">=1.17.13,<=2"
20+
solana-sdk = ">=1.17.13,<=2"
2121

2222
[lib]
2323
crate-type = ["cdylib", "lib"]

‎examples/rust/sysvar/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ no-entrypoint = []
1313
test-sbf = []
1414

1515
[dependencies]
16-
solana-program = "1.17.13"
16+
solana-program = ">=1.17.13,<=2"
1717

1818
[dev-dependencies]
19-
solana-program-test = "1.17.13"
20-
solana-sdk = "1.17.13"
19+
solana-program-test = ">=1.17.13,<=2"
20+
solana-sdk = ">=1.17.13,<=2"
2121

2222
[lib]
2323
crate-type = ["cdylib", "lib"]

0 commit comments

Comments
 (0)