Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/gen-protocol.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ jobs:
- name: Install Protoc
uses: arduino/setup-protoc@v2
with:
version: "25.2"
version: "34.1"
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Install prost generators
run: cargo install protoc-gen-prost@0.3.1 protoc-gen-prost-serde@0.3.1
run: cargo install protoc-gen-prost@0.5.0 protoc-gen-prost-serde@0.4.0

- name: generate python stubs
run: ./generate_proto.sh
Expand Down
136 changes: 33 additions & 103 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ parking_lot = "0.12"
prost = "0.14"
prost-build = "0.14"
prost-types = "0.14"
pbjson = "0.9"
pbjson-types = "0.9"
rand = "0.9"
serde = "1"
serde_json = "1.0"
Expand Down
4 changes: 2 additions & 2 deletions livekit-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ sha2 = "0.10"
url = "2.3"
log = { workspace = true }
parking_lot = { workspace = true }
prost = "0.12"
pbjson-types = "0.6"
prost = { workspace = true }
pbjson-types = { workspace = true }

# webhooks
serde_json = { workspace = true, optional = true }
Expand Down
6 changes: 3 additions & 3 deletions livekit-protocol/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ tokio = { workspace = true, default-features = false, features = [
] }
futures-util = { workspace = true, features = ["sink"] }
parking_lot = { workspace = true }
prost = "0.12"
prost = { workspace = true }

serde = { workspace = true }
pbjson = "0.6"
pbjson-types = "0.6"
pbjson = { workspace = true }
pbjson-types = { workspace = true }
thiserror = { workspace = true }
2 changes: 1 addition & 1 deletion livekit-protocol/generate_proto.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# dependencies: cargo install protoc-gen-prost@0.3.1 protoc-gen-prost-serde@0.3.1
# dependencies: cargo install protoc-gen-prost@0.5.0 protoc-gen-prost-serde@0.4.0


PROTOCOL=protocol/protobufs
Expand Down
4 changes: 2 additions & 2 deletions livekit-protocol/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pub mod enum_dispatch;
pub mod observer;
pub mod promise;

include!("livekit.rs");
include!("livekit/livekit.rs");

#[cfg(feature = "serde")]
include!("livekit.serde.rs");
include!("livekit/livekit.serde.rs");
Loading
Loading