Merge branch 'main' into duan/fix-build-for-android

.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

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" }

examples/basic_room_dispatcher/Cargo.toml

@@ -11,4 +11,4 @@ livekit = { path = "../../livekit", default-features = false, features = ["nativ
 livekit-api = { path = "../../livekit-api" }
 log = "0.4"
 
-[workspace]
+[workspace]

examples/basic_room_dispatcher/src/main.rs

@@ -47,12 +47,11 @@ fn main() {
             .unwrap();
 
         let (room, mut rx) = Room::connect(&url, &token, RoomOptions::default()).await.unwrap();
-        log::info!("Connected to room: {} - {}", room.name(), room.sid());
+        log::info!("Connected to room: {} - {}", room.name(), room.sid().await);
 
         room.local_participant()
             .publish_data(DataPacket {
                 payload: "Hello world".to_owned().into_bytes(),
-                kind: DataPacketKind::Reliable,
                 ..Default::default()
             })
             .await