-
Notifications
You must be signed in to change notification settings - Fork 2
build: Consolidate important dependencies in monorepo Cargo.toml
#38
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
mk-rw
wants to merge
3
commits into
main
Choose a base branch
from
feature/workspace-update
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+111
−71
Draft
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,61 +1,41 @@ | ||
| [workspace] | ||
| resolver = "2" | ||
|
|
||
| members = ["boards/*", "common/*", "apps/sergw"] | ||
| members = ["apps/sergw", "boards/*", "common/*"] | ||
|
|
||
| # Specify which members to build by default. Some libraries, such as messages, contain dev-dependencies that will give | ||
| # compile errors if built directly. | ||
| default-members = ["boards/*"] | ||
|
|
||
| [workspace.dependencies.chrono] | ||
| git = "https://github.com/uorocketry/chrono" | ||
| default-features = false | ||
|
|
||
| [workspace.dependencies.cortex-m] | ||
| version = "0.7.6" | ||
| features = ["critical-section-single-core"] | ||
|
|
||
| [workspace.dependencies.prost] | ||
| version = "0.14.1" | ||
| features = ["derive"] | ||
| default-features = false | ||
|
|
||
| [workspace.dependencies.cortex-m-rt] | ||
| version = "0.7.1" | ||
|
|
||
| [workspace.dependencies.defmt] | ||
| version = "0.3.2" | ||
|
|
||
| [workspace.dependencies.defmt-rtt] | ||
| version = "0.4" | ||
|
|
||
| [workspace.dependencies.embedded-alloc] | ||
| version = "0.6.0" | ||
|
|
||
| [workspace.dependencies.enum_dispatch] | ||
| version = "0.3.11" | ||
|
|
||
| [workspace.dependencies.heapless] | ||
| version = "0.9.1" | ||
|
|
||
| [workspace.dependencies.messages] | ||
| path = "./common/messages" | ||
|
|
||
| [workspace.dependencies.nb] | ||
| version = "1.1.0" | ||
|
|
||
| [workspace.dependencies.panic-probe] | ||
| version = "0.3" | ||
| features = ["print-defmt"] | ||
|
|
||
| [workspace.dependencies.serde] | ||
| version = "1.0.150" | ||
| default-features = false | ||
| features = ["derive"] | ||
|
|
||
| [workspace.dependencies.serde-csv-core] | ||
| version = "0.3.2" | ||
| features = ["defmt"] | ||
|
|
||
| [workspace.dependencies.smlang] | ||
| version = "0.8.0" | ||
| # Here we put together any dependencies that are used basically everywhere, and allow for more consistency between packages, and a smoother dependency upgrade experience | ||
| # Only minimal feature flags are enabled here, due to the additive nature of inheriting workspace dependencies (can only add feature flags when inheriting, not remove any) | ||
| # NOTE: defmt compatibility feature flags are enabled when available here, unsure how desirable this is | ||
| [workspace.dependencies] | ||
| chrono = { git = "https://github.com/uorocketry/chrono", default-features = false } | ||
| cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] } | ||
| cortex-m-rt = "0.7.1" | ||
| critical-section = "1.1" | ||
| csv = { path = './common/csv' } | ||
| defmt = "0.3.2" | ||
| defmt-rtt = "0.4" | ||
| embassy-embedded-hal = { version = "0.3.0", features = ["defmt"] } | ||
| embassy-executor = { version = "0.7.0", features = ["defmt"] } | ||
| embassy-futures = { version = "0.1.0", features = ["defmt"] } | ||
mk-rw marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| embassy-net = { version = "0.7.0", features = ["defmt"] } | ||
| embassy-stm32 = { version = "0.2.0", features = ["defmt"] } | ||
| embassy-sync = { version = "0.6.2", features = ["defmt"] } | ||
| embassy-time = { version = "0.4.0", features = [ | ||
| "defmt", | ||
| "defmt-timestamp-uptime", | ||
| ] } | ||
| embassy-usb = { version = "0.4.0", features = ["defmt"] } | ||
| embedded-alloc = "0.6.0" | ||
| enum_dispatch = "0.3.11" | ||
| heapless = "0.9.1" | ||
| messages = { path = "./common/messages" } | ||
| nb = "1.1.0" | ||
| panic-probe = { version = "0.3", features = ["print-defmt"] } | ||
| prost = { version = "0.14.1", default-features = false, features = ["derive"] } | ||
| serde = { version = "1.0.150", features = ["derive"], default-features = false } | ||
| serde-csv-core = { version = "0.3.2", features = ["defmt"] } | ||
| smlang = "0.8.0" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Inconsistent quote style: the path for
csvuses single quotes ('./common/csv') while the path formessageson line 35 uses double quotes ("./common/messages"). For consistency within the workspace dependencies, both should use the same quote style. Recommend using double quotes for both.