Skip to content

Commit

Permalink
Merge branch 'main' into use-custom-account-interface
Browse files Browse the repository at this point in the history
  • Loading branch information
leighmcculloch authored Apr 8, 2024
2 parents be31eba + c80bebf commit 48fdfb3
Show file tree
Hide file tree
Showing 33 changed files with 82 additions and 158 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
branches: [main, dev]
pull_request:

env:
MINIMUM_RUST_VERSION: 1.74.0

jobs:

complete:
Expand Down Expand Up @@ -75,9 +78,8 @@ jobs:
- name: Use the minimum supported Rust version
if: matrix.rust == 'msrv'
run: |
msrv="$(cargo metadata --format-version 1 --no-deps | jq -r '.packages | map(.rust_version) | map(values) | min')"
rustup override set $msrv
rustup component add clippy --toolchain $msrv
rustup override set $MINIMUM_RUST_VERSION
rustup component add clippy --toolchain $MINIMUM_RUST_VERSION
- name: Error on warnings and clippy checks
# Only error on warnings and checks for the msrv, because new versions of
# Rust will frequently add new warnings and checks.
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ target/
/.sccache/
.DS_Store
.soroban
test_snapshots
5 changes: 1 addition & 4 deletions account/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
[package]
name = "soroban-account-contract"
version = "0.0.0"
authors = ["Stellar Development Foundation <[email protected]>"]
license = "Apache-2.0"
edition = "2021"
rust-version = "1.74.0"
publish = false

[lib]
Expand All @@ -14,7 +11,7 @@ doctest = false
[dependencies]
soroban-sdk = { version = "20.3.1" }

[dev_dependencies]
[dev-dependencies]
soroban-sdk = { version = "20.3.1", features = ["testutils"] }
ed25519-dalek = { version = "1.0.1" }
rand = { version = "0.7.3" }
Expand Down
5 changes: 1 addition & 4 deletions alloc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
[package]
name = "soroban-alloc-contract"
version = "0.0.0"
authors = ["Stellar Development Foundation <[email protected]>"]
license = "Apache-2.0"
edition = "2021"
rust-version = "1.74.0"
publish = false

[lib]
Expand All @@ -14,7 +11,7 @@ doctest = false
[dependencies]
soroban-sdk = { version = "20.3.1", features = ["alloc"] }

[dev_dependencies]
[dev-dependencies]
soroban-sdk = { version = "20.3.1", features = ["testutils", "alloc"] }

[profile.release]
Expand Down
5 changes: 1 addition & 4 deletions atomic_multiswap/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
[package]
name = "soroban-atomic-multiswap-contract"
version = "0.0.0"
authors = ["Stellar Development Foundation <[email protected]>"]
license = "Apache-2.0"
edition = "2021"
rust-version = "1.74.0"
publish = false

[lib]
Expand All @@ -14,7 +11,7 @@ doctest = false
[dependencies]
soroban-sdk = { version = "20.3.1" }

[dev_dependencies]
[dev-dependencies]
soroban-sdk = { version = "20.3.1", features = ["testutils"] }
assert_unordered = "0.3.5"

Expand Down
5 changes: 1 addition & 4 deletions atomic_swap/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
[package]
name = "soroban-atomic-swap-contract"
version = "0.0.0"
authors = ["Stellar Development Foundation <[email protected]>"]
license = "Apache-2.0"
edition = "2021"
rust-version = "1.74.0"
publish = false

[lib]
Expand All @@ -14,7 +11,7 @@ doctest = false
[dependencies]
soroban-sdk = { version = "20.3.1" }

[dev_dependencies]
[dev-dependencies]
soroban-sdk = { version = "20.3.1", features = ["testutils"] }

[profile.release]
Expand Down
3 changes: 1 addition & 2 deletions auth/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
name = "soroban-auth-contract"
version = "0.0.0"
edition = "2021"
rust-version = "1.74.0"
publish = false

[lib]
Expand All @@ -11,7 +10,7 @@ crate-type = ["cdylib"]
[dependencies]
soroban-sdk = { version = "20.3.1" }

[dev_dependencies]
[dev-dependencies]
soroban-sdk = { version = "20.3.1", features = ["testutils"] }

[profile.release]
Expand Down
48 changes: 24 additions & 24 deletions cross_contract/contract_a/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions cross_contract/contract_a/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
[package]
name = "soroban-cross-contract-a-contract"
version = "0.0.0"
authors = ["Stellar Development Foundation <[email protected]>"]
license = "Apache-2.0"
edition = "2021"
rust-version = "1.74.0"
publish = false

[lib]
Expand All @@ -14,7 +11,7 @@ doctest = false
[dependencies]
soroban-sdk = { version = "20.3.1" }

[dev_dependencies]
[dev-dependencies]
soroban-sdk = { version = "20.3.1", features = ["testutils"] }

[profile.release]
Expand Down
Loading

0 comments on commit 48fdfb3

Please sign in to comment.