From 575b1e7effae65bad30752f33cd034aeb537aa06 Mon Sep 17 00:00:00 2001 From: Ian McIntyre Date: Sun, 10 Nov 2024 14:28:55 -0500 Subject: [PATCH] Consolidate imxrt-rs dependencies into workspace I'm preparing breaking changes in upstream packages. This'll make it easier to update dependencies throughout the project. --- Cargo.toml | 22 +++++++++++++--------- teensy4-fcb/Cargo.toml | 3 +-- teensy4-pins/Cargo.toml | 3 +-- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 36f49dff..7b766cf7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,22 +38,18 @@ path = "teensy4-fcb" version = "0.4" [dependencies.imxrt-ral] -version = "0.5" -features = ["imxrt1062"] +workspace = true [dependencies.imxrt-hal] -version = "0.5.3" -features = ["imxrt1060"] +workspace = true [dependencies.imxrt-rt] -version = "0.1.4" +workspace = true optional = true -features = ["device"] [build-dependencies.imxrt-rt] -version = "0.1" +workspace = true optional = true -features = ["device"] [dependencies.teensy4-pins] version = "0.3.1" @@ -67,6 +63,14 @@ members = [ "tools", ] +[workspace.dependencies] +imxrt-boot-gen = { version = "0.3.0", features = ["imxrt1060"] } +imxrt-hal = { version = "0.5.3", features = ["imxrt1060"] } +imxrt-iomuxc = { version = "0.2.0", features = ["imxrt1060"] } +imxrt-log = { version = "0.1" } +imxrt-ral = { version = "0.5", features = ["imxrt1062"] } +imxrt-rt = { version = "0.1.4", features = ["device"] } + [features] rt = ["dep:imxrt-rt", "imxrt-ral/rt"] @@ -92,7 +96,7 @@ features = ["log"] defmt = "0.3" defmt-bbq = "0.1" embedded-hal = "0.2" -imxrt-log = { version = "0.1", default-features = false, features = ["usbd", "log"] } +imxrt-log = { workspace = true, default-features = false, features = ["usbd", "log"] } log = "0.4" nb = "1" rtic = { version = "2", features = ["thumbv7-backend"] } diff --git a/teensy4-fcb/Cargo.toml b/teensy4-fcb/Cargo.toml index 06bec4ff..fbfb75e8 100644 --- a/teensy4-fcb/Cargo.toml +++ b/teensy4-fcb/Cargo.toml @@ -14,8 +14,7 @@ categories.workspace = true keywords.workspace = true [dependencies.imxrt-boot-gen] -version = "0.3.0" -features = ["imxrt1060"] +workspace = true [package.metadata.docs.rs] default-target = "thumbv7em-none-eabihf" diff --git a/teensy4-pins/Cargo.toml b/teensy4-pins/Cargo.toml index 40009407..81f6264c 100644 --- a/teensy4-pins/Cargo.toml +++ b/teensy4-pins/Cargo.toml @@ -14,8 +14,7 @@ categories.workspace = true keywords.workspace = true [dependencies.imxrt-iomuxc] -version = "0.2.0" -features = ["imxrt1060"] +workspace = true [package.metadata.docs.rs] default-target = "thumbv7em-none-eabihf"