Skip to content

Commit

Permalink
Merge pull request #5 from TannerRogalsky/lib-rs-directed-improvements
Browse files Browse the repository at this point in the history
Lib.rs directed improvements
  • Loading branch information
TannerRogalsky committed Mar 16, 2024
2 parents b16bc63 + 0377f3f commit 8a931d6
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 17 deletions.
40 changes: 28 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@ on: [push, pull_request]
name: Continuous integration

jobs:
# TODO: this will require a little more work to figure out
# check_minimal_versions:
# name: Check Minimal Versions
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v2
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: nightly
# override: true
# - uses: actions-rs/cargo@v1
# with:
# command: check
# args: --tests -Z direct-minimal-versions

check_native:
name: Check Native
runs-on: ubuntu-latest
Expand All @@ -17,6 +33,18 @@ jobs:
with:
command: check
args: --tests
- uses: actions-rs/cargo@v1
with:
command: check
args: --features native-tls
- uses: actions-rs/cargo@v1
with:
command: check
args: --features rustls-tls-native-roots
- uses: actions-rs/cargo@v1
with:
command: check
args: --features rustls-tls-webpki-roots

check_wasm:
name: Check WASM
Expand All @@ -33,18 +61,6 @@ jobs:
with:
command: check
args: --tests
- uses: actions-rs/cargo@v1
with:
command: check
args: --features native-tls
- uses: actions-rs/cargo@v1
with:
command: check
args: --features rustls-tls-native-roots
- uses: actions-rs/cargo@v1
with:
command: check
args: --features rustls-tls-webpki-roots


test:
Expand Down
17 changes: 12 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,14 @@ repository = "https://github.com/TannerRogalsky/tokio-tungstenite-wasm"
homepage = "https://github.com/TannerRogalsky/tokio-tungstenite-wasm"
license-file = "LICENSE"
readme = "README.md"
edition = "2018"
edition = "2021"
categories = [
"wasm",
"web-programming::websocket",
"asynchronous",
"network-programming",
]
keywords = ["websocket", "cross-platform", "wasm", "tokio"]

[features]
native-tls = ["tokio-tungstenite/native-tls", "dep:native-tls"]
Expand All @@ -22,8 +29,8 @@ rustls-tls-webpki-roots = [
__rustls-tls = ["dep:rustls"]

[dependencies]
thiserror = "1"
http = "1"
thiserror = "1.0"
http = "1.1"
httparse = "1.3"
futures-util = { version = "0.3", default-features = false, features = [
"sink",
Expand All @@ -33,7 +40,7 @@ futures-util = { version = "0.3", default-features = false, features = [

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio-tungstenite = "0.21"
tokio = { version = "1", default-features = false, features = ["net"] }
tokio = { version = "1.36", default-features = false, features = ["net"] }
native-tls = { version = "0.2", default-features = false, optional = true }
rustls = { version = "0.22", default-features = false, optional = true }

Expand All @@ -59,5 +66,5 @@ features = [
assert-impl = "0.1"

[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
tokio = { version = "1", features = ["full"] }
tokio = { version = "1.36", features = ["full"] }
rand = "0.8"

0 comments on commit 8a931d6

Please sign in to comment.