simplify version cascading by using workspaces (#483)

livekit · Nov 20, 2024 · fe8037a · fe8037a
1 parent b41861c
commit fe8037a
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 14 deletions.
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -31,6 +31,14 @@ jobs:
           toolchain: nightly-2023-12-30
           components: rustfmt
 
+      - name: Check workspace versions match
+        run: |
+          cargo metadata --format-version=1 --no-deps |
+          jq -e -r '.packages[] | "\(.name) \(.version)"' |
+          sort | xargs -l bash -c \
+          'grep "$0 = { version = \"$1\"" -q Cargo.toml && printf "version %-7s %-27s $0\n" $1 "matches package" || printf "version %-7s is not reflected on package $0\n" "$1" | false';
+          if [ $? -eq 0 ]; then exit 0; else exit 1; fi
+
       - name: Cargo fmt
         run: |
           cargo fmt -- --check
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,8 +4,20 @@ members = [
     "livekit-api",
     "livekit-protocol",
     "livekit-ffi",
+    "livekit-runtime",
     "libwebrtc",
     "soxr-sys",
     "webrtc-sys",
     "webrtc-sys/build",
 ]
+
+[workspace.dependencies]
+libwebrtc = { version = "0.3.7", path = "libwebrtc" }
+livekit-api = { version = "0.4.1", path = "livekit-api" }
+livekit-ffi = { version = "0.12.2", path = "livekit-ffi" }
+livekit-protocol = { version = "0.3.6", path = "livekit-protocol" }
+livekit-runtime = { version = "0.3.1", path = "livekit-runtime" }
+livekit = { version = "0.7.0", path = "livekit" }
+soxr-sys = { version = "0.1.0", path = "soxr-sys" }
+webrtc-sys-build = { version = "0.3.5", path = "webrtc-sys/build" }
+webrtc-sys = { version = "0.3.5", path = "webrtc-sys" }
diff --git a/libwebrtc/Cargo.toml b/libwebrtc/Cargo.toml
@@ -8,7 +8,7 @@ description = "Livekit safe bindings to libwebrtc"
 repository = "https://github.com/livekit/rust-sdks"
 
 [dependencies]
-livekit-protocol = { path = "../livekit-protocol", version = "0.3.5" }
+livekit-protocol = { workspace = true }
 log = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

diff --git a/livekit-api/.nanparc b/livekit-api/.nanparc
@@ -1,2 +1,2 @@
-version 0.4.0
+version 0.4.1
 language rust
diff --git a/livekit-ffi/.nanparc b/livekit-ffi/.nanparc
@@ -1,2 +1,2 @@
-version 0.10.2
+version 0.12.2
 language rust
diff --git a/livekit-ffi/Cargo.toml b/livekit-ffi/Cargo.toml
@@ -18,9 +18,9 @@ __rustls-tls = ["livekit/__rustls-tls"]
 tracing = ["tokio/tracing", "console-subscriber"]
 
 [dependencies]
-livekit = { path = "../livekit", version = "0.7.0" }
+livekit = { workspace = true }
 soxr-sys = { path = "../soxr-sys" }
-livekit-protocol = { path = "../livekit-protocol", version = "0.3.6" }
+livekit-protocol = { workspace = true }
 tokio = { version = "1", features = ["full", "parking_lot"] }
 futures-util = { version = "0.3", default-features = false, features = ["sink"] }
 parking_lot = { version = "0.12", features = ["deadlock_detection"] }

diff --git a/livekit-protocol/.nanparc b/livekit-protocol/.nanparc
@@ -1,2 +1,2 @@
-version 0.3.5
+version 0.3.6
 language rust
diff --git a/livekit-protocol/Cargo.toml b/livekit-protocol/Cargo.toml
@@ -7,7 +7,7 @@ description = "Livekit protocol and utilities for the Rust SDK"
 repository = "https://github.com/livekit/rust-sdks"
 
 [dependencies]
-livekit-runtime = { path = "../livekit-runtime", version = "0.3.1" }
+livekit-runtime = { workspace = true }
 tokio = { version = "1", default-features = false, features = [
     "sync",
     "macros",

diff --git a/livekit-runtime/.nanparc b/livekit-runtime/.nanparc
@@ -1,2 +1,2 @@
-version 0.3.0
+version 0.3.1
 language rust
diff --git a/livekit/.nanparc b/livekit/.nanparc
@@ -1,2 +1,2 @@
-version 0.6.0
+version 0.7.0
 language rust
diff --git a/livekit/Cargo.toml b/livekit/Cargo.toml
@@ -27,10 +27,10 @@ __rustls-tls = ["livekit-api/__rustls-tls"]
 __lk-internal = []
 
 [dependencies]
-livekit-runtime = { path = "../livekit-runtime", version = "0.3.1", default-features = false }
-livekit-api = { path = "../livekit-api", version = "0.4.1", default-features = false }
-libwebrtc = { path = "../libwebrtc", version = "0.3.7" }
-livekit-protocol = { path = "../livekit-protocol", version = "0.3.6" }
+livekit-runtime = { workspace = true, default-features = false }
+livekit-api = { workspace = true, default-features = false }
+libwebrtc = { workspace = true }
+livekit-protocol = { workspace = true }
 prost = "0.12"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1.0"

diff --git a/webrtc-sys/Cargo.toml b/webrtc-sys/Cargo.toml
@@ -12,7 +12,7 @@ cxx = "1.0"
 log = "0.4"
 
 [build-dependencies]
-webrtc-sys-build = { version = "0.3.5", path = "./build" }
+webrtc-sys-build = { workspace = true }
 cxx-build = "1.0"
 glob = "0.3"
 cc = "1.0"