Skip to content

Commit

Permalink
Deps: Move to published symphonia v0.5.2 from git
Browse files Browse the repository at this point in the history
Symphonia v0.5.2 has all the API changes and fixes we were depending on, which leaves next one step closer to publishable.

Tested using `cargo make ready`.
  • Loading branch information
FelixMcFelix committed Nov 20, 2023
1 parent f2fbbfe commit fdd0d83
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 34 deletions.
15 changes: 3 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ serde_json = "1"
simd-json = { features = ["serde_impl"], optional = true, version = "0.7.0" }
socket2 = { optional = true, version = "0.4" }
streamcatcher = { optional = true, version = "1" }
symphonia = { default_features = false, optional = true, version = "0.5.2" }
symphonia-core = { optional = true, version = "0.5.2" }
tokio = { default-features = false, optional = true, version = "1.0" }
tokio-tungstenite = { optional = true, version = "0.18" }
tokio-util = { features = ["io"], optional = true, version = "0.7" }
Expand All @@ -59,21 +61,10 @@ optional = true
version = "0.11"
optional = true

[dependencies.symphonia]
git = "https://github.com/pdeljanov/Symphonia"
default-features = false
optional = true
version = "0.5"

[dependencies.symphonia-core]
git = "https://github.com/pdeljanov/Symphonia"
optional = true
version = "0.5"

[dev-dependencies]
criterion = "0.4"
ntest = "0.9"
symphonia = { version = "0.5", features = ["aac", "isomp4", "mp3"], git = "https://github.com/pdeljanov/Symphonia" }
symphonia = { version = "0.5.2", features = ["aac", "isomp4", "mp3"] }
utils = { path = "utils" }
tokio = { version = "1", features = ["rt", "rt-multi-thread"] }

Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ features = ["builtin-queue"]
[dependencies.symphonia]
# version = "0.5"
features = ["aac", "mp3", "isomp4", "alac"] # ...as well as any extras you need!
# **NOTE**: For now, please use this repository in pre-releases.
git = "https://github.com/pdeljanov/Symphonia"
```

## Dependencies
Expand Down
6 changes: 1 addition & 5 deletions examples/serenity/voice/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@ authors = ["my name <[email protected]>"]
edition = "2021"

[dependencies]
symphonia = { features = ["aac", "mp3", "isomp4", "alac"], version = "0.5.2" }
tracing = "0.1"
tracing-subscriber = "0.2"
tracing-futures = "0.2"
reqwest = "0.11"

[dependencies.symphonia]
version = "0.5"
features = ["aac", "mp3", "isomp4", "alac"]
git = "https://github.com/pdeljanov/Symphonia"

[dependencies.songbird]
path = "../../../"

Expand Down
6 changes: 1 addition & 5 deletions examples/serenity/voice_cached_audio/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ authors = ["my name <[email protected]>"]
edition = "2021"

[dependencies]
symphonia = { features = ["mp3"], version = "0.5.2" }
tracing = "0.1"
tracing-subscriber = "0.2"
tracing-futures = "0.2"
Expand All @@ -16,11 +17,6 @@ path = "../../../"
version = "0.11"
features = ["cache", "framework", "standard_framework", "voice", "http", "rustls_backend"]

[dependencies.symphonia]
version = "0.5"
features = ["mp3"]
git = "https://github.com/pdeljanov/Symphonia"

[dependencies.tokio]
version = "1.0"
features = ["macros", "rt-multi-thread"]
6 changes: 1 addition & 5 deletions examples/serenity/voice_events_queue/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ edition = "2021"

[dependencies]
reqwest = "0.11"
symphonia = { features = ["aac", "mp3", "isomp4", "alac"], version = "0.5.2" }
tracing = "0.1"
tracing-subscriber = "0.2"
tracing-futures = "0.2"
Expand All @@ -18,11 +19,6 @@ path = "../../../"
version = "0.11"
features = ["cache", "standard_framework", "voice", "rustls_backend"]

[dependencies.symphonia]
version = "0.5"
features = ["aac", "mp3", "isomp4", "alac"]
git = "https://github.com/pdeljanov/Symphonia"

[dependencies.tokio]
version = "1.0"
features = ["macros", "rt-multi-thread", "signal"]
6 changes: 1 addition & 5 deletions examples/twilight/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ edition = "2021"
[dependencies]
futures = "0.3"
reqwest = "0.11"
symphonia = { features = ["aac", "mp3", "isomp4", "alac"], version = "0.5.2" }
tracing = "0.1"
tracing-subscriber = "0.2"
tokio = { features = ["macros", "rt-multi-thread", "sync"], version = "1" }
Expand All @@ -19,8 +20,3 @@ twilight-standby = "0.14"
default-features = false
path = "../.."
features = ["driver", "gateway", "twilight", "rustls"]

[dependencies.symphonia]
version = "0.5"
features = ["aac", "mp3", "isomp4", "alac"]
git = "https://github.com/pdeljanov/Symphonia"

0 comments on commit fdd0d83

Please sign in to comment.