Skip to content

Commit

Permalink
convex-rs PR 6: Don't require native-tls-vendored in tokio-tungstenit…
Browse files Browse the repository at this point in the history
…e unless requested (#30548)

It will get required if one builds with the native-tls-vendored feature, which is actually the default feature for convex-rs.

---

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

GitOrigin-RevId: 1a6afdfeba70a5b995e04c2ed2a88bc625bd80e3
  • Loading branch information
nipunn1313 authored and Convex, Inc. committed Oct 9, 2024
1 parent f50685b commit 2839c16
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 12 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

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

5 changes: 5 additions & 0 deletions crates/convex/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Upcoming

# 0.8.1

Remove native-tls-vendored dependency for tokio-tungstenite. Rely on requested
features instead.

# 0.8.0

- Support for passing through a client_id to ConvexClient
Expand Down
8 changes: 4 additions & 4 deletions crates/convex/Cargo.oss.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "convex"
description = "Client library for Convex (convex.dev)"
authors = [ "Convex, Inc. <[email protected]>" ]
version = "0.8.0"
version = "0.8.1"
edition = "2021"
rust-version = "1.65.0"
resolver = "2"
Expand All @@ -15,7 +15,7 @@ anyhow = { version = "1" }
async-trait = { version = "0.1" }
base64 = { version = "0.13" }
bytes = { version = "1.1.0" }
convex_sync_types = { path = "./sync_types", version = "=0.8.0" }
convex_sync_types = { path = "./sync_types", version = "=0.8.1" }
futures = { version = "0.3" }
imbl = { version = "3.0.0" }
parking_lot = { optional = true, version = "0.12", features = [ "hardware-lock-elision" ] }
Expand All @@ -26,14 +26,14 @@ serde_json = { features = [ "float_roundtrip", "preserve_order" ], version = "1"
thiserror = { version = "1" }
tokio = { features = [ "full" ], version = "1" }
tokio-stream = { features = [ "io-util", "sync" ], version = "0.1" }
tokio-tungstenite = { version = "0.21.0", features = [ "native-tls-vendored" ] }
tokio-tungstenite = { features = [], version = "0.21.0" }
tracing = { version = "0.1" }
url = { version = "2.5.2" }
uuid = { features = [ "serde", "v4" ], version = "1.6" }

[dev-dependencies]
colored = { version = "2" }
convex_sync_types = { path = "./sync_types", version = "=0.8.0", features = [ "testing" ] }
convex_sync_types = { path = "./sync_types", version = "=0.8.1", features = [ "testing" ] }
dotenvy = { version = "0.15.7" }
maplit = { version = "1" }
parking_lot = { version = "0.12", features = [ "hardware-lock-elision" ] }
Expand Down
8 changes: 4 additions & 4 deletions crates/convex/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "convex"
description = "Client library for Convex (convex.dev)"
authors = ["Convex, Inc. <[email protected]>"]
version = "0.8.0"
version = "0.8.1"
edition = "2021"
rust-version = "1.65.0"
resolver = "2"
Expand All @@ -15,7 +15,7 @@ anyhow = { workspace = true }
async-trait = { workspace = true }
base64 = { workspace = true }
bytes = { workspace = true }
convex_sync_types = { path = "./sync_types", version = "=0.8.0" }
convex_sync_types = { path = "./sync_types", version = "=0.8.1" }
futures = { workspace = true }
imbl = { workspace = true }
parking_lot = { workspace = true, optional = true }
Expand All @@ -29,14 +29,14 @@ serde_json = { workspace = true, features = [
thiserror = { workspace = true }
tokio = { workspace = true, features = ["full"] }
tokio-stream = { workspace = true, features = ["io-util", "sync"] }
tokio-tungstenite = { workspace = true }
tokio-tungstenite = { workspace = true, features = [] }
tracing = { workspace = true }
url = { workspace = true }
uuid = { workspace = true, features = ["serde", "v4"] }

[dev-dependencies]
colored = { workspace = true }
convex_sync_types = { path = "./sync_types", version = "=0.8.0", features = [
convex_sync_types = { path = "./sync_types", version = "=0.8.1", features = [
"testing",
] }
dotenvy = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/convex/sync_types/Cargo.oss.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "convex_sync_types"
description = "Sync types for the Convex Websocket protocol (convex.dev)"
version = "0.8.0"
version = "0.8.1"
authors = [ "Convex, Inc. <[email protected]>" ]
edition = "2021"
rust-version = "1.65.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/convex/sync_types/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "convex_sync_types"
description = "Sync types for the Convex Websocket protocol (convex.dev)"
version = "0.8.0"
version = "0.8.1"
authors = ["Convex, Inc. <[email protected]>"]
edition = "2021"
rust-version = "1.65.0"
Expand Down

0 comments on commit 2839c16

Please sign in to comment.