Merge pull request 'small cleanup' (#161 ) from small-cargo-toml-cleaning into main

Reviewed-on: #161
small cleanup
2024-04-17 16:03:03 +02:00 · 2024-04-17 15:17:46 +02:00 · 2024-04-17 14:58:01 +02:00 · 2024-04-17 10:03:17 +02:00 · 2024-04-17 10:01:46 +02:00 · 2024-04-16 21:31:21 +02:00
7 changed files with 31 additions and 25 deletions
--- a/satrs-mib/CHANGELOG.md
+++ b/satrs-mib/CHANGELOG.md
@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

 # [unreleased]

+# [v0.1.2] 2024-04-17
+
+Allow `satrs-shared` from `v0.1.3` to `<v0.2`.
+
 # [v0.1.1] 2024-02-17

 - Bumped `spacepackets` to v0.10.0
--- a/satrs-mib/Cargo.toml
+++ b/satrs-mib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "satrs-mib"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 rust-version = "1.61"
 authors = ["Robin Mueller <muellerr@irs.uni-stuttgart.de>"]
@@ -23,7 +23,6 @@ version = "1"
 optional = true

 [dependencies.satrs-shared]
-path = "../satrs-shared"
 version = "0.1.3"
 features = ["serde"]

--- a/satrs-mib/codegen/Cargo.toml
+++ b/satrs-mib/codegen/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "satrs-mib-codegen"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 description = "satrs-mib proc macro implementation"
 homepage = "https://egit.irs.uni-stuttgart.de/rust/sat-rs"
@@ -28,8 +28,7 @@ features = ["full"]
 trybuild = { version = "1", features = ["diff"] }

 [dev-dependencies.satrs-shared]
-version = "0.1.3"
-path = "../../satrs-shared"
+version = ">=0.1.3, <0.2"

 [dev-dependencies.satrs-mib]
 path = ".."
--- a/satrs-shared/CHANGELOG.md
+++ b/satrs-shared/CHANGELOG.md
@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

 # [unreleased]

+# [v0.1.3] 2024-04-16
+
+Allow `spacepackets` range starting with v0.10 and v0.11.
+
 # [v0.1.2] 2024-02-17

 - Bumped `spacepackets` to v0.10.0 for `UnsignedEnum` trait change.
--- a/satrs-shared/Cargo.toml
+++ b/satrs-shared/Cargo.toml
@@ -18,7 +18,7 @@ default-features = false
 optional = true

 [dependencies.spacepackets]
-version = "0.11.0-rc.2"
+version = ">0.9, <=0.11"
 default-features = false

 [features]
--- a/satrs/CHANGELOG.md
+++ b/satrs/CHANGELOG.md
@@ -8,7 +8,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

 # [unreleased]

- `spacepackets` v0.11.0
+# [v0.2.0-rc.1] 2024-04-17
+
+- `spacepackets` v0.11

 ## Added

--- a/satrs/Cargo.toml
+++ b/satrs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "satrs"
-version = "0.2.0-rc.0"
+version = "0.2.0-rc.1"
 edition = "2021"
 rust-version = "1.61"
 authors = ["Robin Mueller <muellerr@irs.uni-stuttgart.de>"]
@@ -19,13 +19,26 @@ smallvec = "1"
 crc = "3"

 [dependencies.satrs-shared]
-version = "0.1.3"
-path = "../satrs-shared"
+version = ">=0.1.3, <0.2"

 [dependencies.num_enum]
 version = ">0.5, <=0.7"
 default-features = false

+[dependencies.spacepackets]
+version = "0.11"
+default-features = false
+
+[dependencies.cobs]
+git = "https://github.com/robamu/cobs.rs.git"
+version = "0.2.3"
+branch = "all_features"
+default-features = false
+
+[dependencies.num-traits]
+version = "0.2"
+default-features = false
+
 [dependencies.dyn-clone]
 version = "1"
 optional = true
@@ -38,10 +51,6 @@ optional = true
 version = "0.7"
 optional = true

-[dependencies.num-traits]
-version = "0.2"
-default-features = false
-
 [dependencies.downcast-rs]
 version = "1.2"
 default-features = false
@@ -75,17 +84,6 @@ version = "0.8"
 features = ["os-poll", "net"]
 optional = true

-[dependencies.spacepackets]
-# git = "https://egit.irs.uni-stuttgart.de/rust/spacepackets.git"
-version = "0.11.0-rc.2"
-default-features = false
-
-[dependencies.cobs]
-git = "https://github.com/robamu/cobs.rs.git"
-version = "0.2.3"
-branch = "all_features"
-default-features = false
-
 [dev-dependencies]
 serde = "1"
 zerocopy = "0.7"
Author	SHA1	Message	Date
Robin Müller	f6f7519625	Merge pull request 'small cleanup' (#161 ) from small-cargo-toml-cleaning into main All checks were successful Rust/sat-rs/pipeline/head This commit looks good Details Reviewed-on: #161	2024-04-17 16:03:03 +02:00
Robin Mueller	0f0fbc1a18	small cleanup All checks were successful Rust/sat-rs/pipeline/head This commit looks good Details	2024-04-17 15:17:46 +02:00
Robin Müller	6e55e2ac95	Merge pull request 'Prepare next releases' (#160 ) from prep-next-satrs-releases into main All checks were successful Rust/sat-rs/pipeline/head This commit looks good Details Reviewed-on: #160	2024-04-17 14:58:01 +02:00
Robin Mueller	2f96bfe992	changelog sat-rs All checks were successful Rust/sat-rs/pipeline/head This commit looks good Details	2024-04-17 10:03:17 +02:00
Robin Mueller	52aafb3aab	prep next releases All checks were successful Rust/sat-rs/pipeline/head This commit looks good Details	2024-04-17 10:01:46 +02:00
Robin Müller	6ce9cb5ead	Merge pull request 'use released satrs-shared' (#159 ) from use-released-satrs-shared into main All checks were successful Rust/sat-rs/pipeline/head This commit looks good Details Reviewed-on: #159	2024-04-16 21:31:21 +02:00
Robin Mueller	273f79d1e6	use release satrs-shared All checks were successful Rust/sat-rs/pipeline/head This commit looks good Details	2024-04-16 21:07:51 +02:00
Robin Müller	622221835e	Merge pull request 'allow sat-rs shared spacepackets range' (#158 ) from satrs-shared-spacepackets-range into main All checks were successful Rust/sat-rs/pipeline/head This commit looks good Details Reviewed-on: #158	2024-04-16 20:54:59 +02:00
Robin Mueller	e396ad2e7a	small fix All checks were successful Rust/sat-rs/pipeline/head This commit looks good Details	2024-04-16 19:52:32 +02:00
Robin Mueller	772927d50b	allow spacepackets range All checks were successful Rust/sat-rs/pipeline/head This commit looks good Details	2024-04-16 19:50:46 +02:00
Robin Müller	be9a45e55f	Merge pull request 'changelog satrs-shared v0.1.3' (#157 ) from changelog-satrs-shared into main All checks were successful Rust/sat-rs/pipeline/head This commit looks good Details Reviewed-on: #157	2024-04-16 19:48:12 +02:00
Robin Mueller	eee8a69550	changelog satrs-shared v0.1.3 Some checks are pending Rust/sat-rs/pipeline/head Build queued... Details	2024-04-16 19:47:36 +02:00
Robin Müller	f7a6d3ce47	Merge pull request 'bump spacepackets to v0.11.0' (#156 ) from bump-spacepackets into main All checks were successful Rust/sat-rs/pipeline/head This commit looks good Details Reviewed-on: #156	2024-04-16 19:46:17 +02:00
Robin Mueller	df97a3a93e	small adjustment Some checks are pending Rust/sat-rs/pipeline/pr-main Build started... Details	2024-04-16 19:39:07 +02:00
Robin Mueller	42750e08c0	bump spacepackets to v0.11.0 All checks were successful Rust/sat-rs/pipeline/head This commit looks good Details	2024-04-16 19:26:46 +02:00
Robin Müller	786671bbd7	Merge pull request 're-worked TMTC modules' (#155 ) from rework-tmtc-modules into main All checks were successful Rust/sat-rs/pipeline/head This commit looks good Details Reviewed-on: #155	2024-04-16 11:10:52 +02:00
Robin Mueller	63f37f0917	Re-worked TMTC modules All checks were successful Rust/sat-rs/pipeline/pr-main This commit looks good Details	2024-04-16 11:04:22 +02:00