Skip to content

Commit

Permalink
Use workspace metadata
Browse files Browse the repository at this point in the history
  • Loading branch information
surban committed Sep 13, 2023
1 parent 84a0d3d commit 383f9bb
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 27 deletions.
14 changes: 14 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
[workspace.package]
version = "0.11.0"

edition = "2021"
rust-version = "1.72"
license = "Apache-2.0"

repository = "https://github.com/ENQT-GmbH/remoc/"
authors = [
"Sebastian Urban <[email protected]>",
"ENQT GmbH <[email protected]>",
"Remoc contributors",
]

[workspace]
resolver = "2"
members = ["remoc", "remoc_macro"]
Expand Down
6 changes: 2 additions & 4 deletions check_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@
# remoc depends on the exact same remoc_macro version.
#

VERSION=$(grep "^version = " remoc/Cargo.toml | cut -d ' ' -f 3 | tr -d \")
MACRO_VERSION=$(grep "^version = " remoc_macro/Cargo.toml | cut -d ' ' -f 3 | tr -d \")
VERSION=$(grep "^version = " Cargo.toml | cut -d ' ' -f 3 | tr -d \")
MACRO_DEP=$(grep 'remoc_macro = ' remoc/Cargo.toml | cut -d ' ' -f 6 | tr -d \",=)

if [ "$VERSION" != "$MACRO_VERSION" ] || [ "$VERSION" != "$MACRO_DEP" ] ; then
if [ "$VERSION" != "$MACRO_DEP" ] ; then
echo "Version mismatch!"
echo "remoc version is $VERSION"
echo "remoc_macro version is $MACRO_VERSION"
echo "remoc_macro dependency version is $MACRO_DEP"
exit 1
fi
Expand Down
2 changes: 1 addition & 1 deletion publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set -e
echo "Checking crate versions"
./check_version.sh

VERSION=$(grep "^version = " remoc/Cargo.toml | cut -d ' ' -f 3 | tr -d \")
VERSION=$(grep "^version = " Cargo.toml | cut -d ' ' -f 3 | tr -d \")

echo "Publishing remoc_macro $VERSION"
cargo publish --manifest-path remoc_macro/Cargo.toml
Expand Down
24 changes: 10 additions & 14 deletions remoc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
[package]
name = "remoc"
version = "0.11.0-pre3"
authors = [
"Sebastian Urban <[email protected]>",
"ENQT GmbH <[email protected]>",
"Remoc contributors",
]
readme = "README.md"
repository = "https://github.com/ENQT-GmbH/remoc/"
documentation = "https://docs.rs/remoc"
edition = "2021"
rust-version = "1.59"
description = "🦑 Remote multiplexed objects, channels, observable collections and RPC making remote interactions seamless. Provides multiple remote channels and RPC over TCP, TLS or any other transport."
keywords = ["remote", "channel", "rpc", "stream", "multiplexer"]
categories = ["asynchronous", "network-programming"]
license = "Apache-2.0"

version = { workspace = true }
repository = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }
license = { workspace = true }
authors = { workspace = true }


[features]
Expand Down Expand Up @@ -43,11 +38,12 @@ full-codecs = [
"codec-message-pack",
]


[dependencies]
remoc_macro = { version = "=0.11.0", path = "../remoc_macro", optional = true }

futures = "0.3"
tokio = { version = "1.18", features = ["macros", "rt", "sync", "time"] }
tokio = { version = "1.32", features = ["macros", "rt", "sync", "time"] }
tokio-util = { version = "0.7", features = ["codec"] }
rand = "0.8"
tracing = "0.1.29"
Expand All @@ -65,7 +61,7 @@ rmp-serde = { version = "1.0", optional = true }


[dev-dependencies]
tokio = { version = "1.18", features = [
tokio = { version = "1.32", features = [
"net",
"io-util",
"rt",
Expand Down
2 changes: 1 addition & 1 deletion remoc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ By default all features are enabled and the JSON codec is used as default.
## Supported Rust versions

Remoc is built against the latest stable release.
The minimum supported Rust version (MSRV) is 1.59.
The minimum supported Rust version (MSRV) is 1.72.

## Example

Expand Down
14 changes: 7 additions & 7 deletions remoc_macro/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[package]
name = "remoc_macro"
version = "0.11.0-pre3"
authors = ["Sebastian Urban <[email protected]>", "ENQT GmbH <[email protected]>", "Remoc contributors"]
readme = "README.md"
repository = "https://github.com/ENQT-GmbH/remoc/"
edition = "2021"
rust-version = "1.59"
description = "Procedural macros for Remoc"
license = "Apache-2.0"

version = { workspace = true }
repository = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }
license = { workspace = true }
authors = { workspace = true }


[dependencies]
Expand Down

0 comments on commit 383f9bb

Please sign in to comment.