Chore: Fixup examples, bump version pre-push

Takes the chance to bring shared deps into the example workspace while we're here. Release notes, tags etc will follow in time.
serenity-rs · Nov 27, 2023 · 22ceb17 · 22ceb17
1 parent 1ec569b
commit 22ceb17
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 68 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,7 +11,7 @@ name = "songbird"
 readme = "README.md"
 repository = "https://github.com/serenity-rs/songbird.git"
 rust-version = "1.74"
-version = "0.4.0-rc-2"
+version = "0.4.0"
 
 [dependencies]
 async-trait = { optional = true, version = "0.1" }
@@ -36,8 +36,8 @@ rusty_pool = { optional = true, version = "0.7" }
 serde = { version = "1", features = ["derive"] }
 serde-aux = { optional = true, version = "4"}
 serde_json = "1"
-serenity = { default-features = false, optional = true, version = "0.12.0-rc", features = ["voice", "gateway"] }
-serenity-voice-model = { optional = true, version = "0.1" }
+serenity = { default-features = false, optional = true, version = "0.12.0", features = ["voice", "gateway"] }
+serenity-voice-model = { optional = true, version = "0.2" }
 simd-json = { features = ["serde_impl"], optional = true, version = "0.13" }
 socket2 = { optional = true, version = "0.5" }
 streamcatcher = { optional = true, version = "1" }

diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -6,6 +6,17 @@ members = [
     "serenity/voice_receive",
     "twilight",
 ]
+resolver = "2"
+
+[workspace.dependencies]
+reqwest = "0.11"
+serenity = { features = ["cache", "framework", "standard_framework", "voice", "http", "rustls_backend"], version = "0.12" }
+songbird = { path = "../", version = "0.4" }
+symphonia = { features = ["aac", "mp3", "isomp4", "alac"], version = "0.5.2" }
+tokio = { features = ["macros", "rt-multi-thread", "signal", "sync"], version = "1" }
+tracing = "0.1"
+tracing-subscriber = "0.2"
+tracing-futures = "0.2"
 
 [profile.release]
 debug = true
diff --git a/examples/serenity/voice/Cargo.toml b/examples/serenity/voice/Cargo.toml
@@ -5,16 +5,11 @@ authors = ["my name <[email protected]>"]
 edition = "2021"
 
 [dependencies]
-serenity = { version = "0.12.0-rc", features = ["client", "standard_framework", "voice", "rustls_backend"] }
-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.songbird]
-path = "../../../"
-
-[dependencies.tokio]
-version = "1.0"
-features = ["macros", "rt-multi-thread", "signal"]
+reqwest = { workspace = true }
+serenity = { workspace = true }
+songbird = { workspace = true, default-features = true }
+symphonia = { workspace = true }
+tokio = { workspace = true }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
+tracing-futures = { workspace = true }
diff --git a/examples/serenity/voice/src/main.rs b/examples/serenity/voice/src/main.rs
@@ -33,6 +33,7 @@ use serenity::{
             macros::{command, group},
             Args,
             CommandResult,
+            Configuration,
         },
         StandardFramework,
     },
@@ -68,7 +69,7 @@ async fn main() {
     let token = env::var("DISCORD_TOKEN").expect("Expected a token in the environment");
 
     let framework = StandardFramework::new().group(&GENERAL_GROUP);
-    framework.configure(|c| c.prefix("~"));
+    framework.configure(Configuration::new().prefix("~"));
 
     let intents = GatewayIntents::non_privileged() | GatewayIntents::MESSAGE_CONTENT;
 

diff --git a/examples/serenity/voice_cached_audio/Cargo.toml b/examples/serenity/voice_cached_audio/Cargo.toml
@@ -5,15 +5,11 @@ authors = ["my name <[email protected]>"]
 edition = "2021"
 
 [dependencies]
-serenity = { version = "0.12.0-rc", features = ["cache", "framework", "standard_framework", "voice", "http", "rustls_backend"] }
-symphonia = { features = ["mp3"], version = "0.5.2" }
-tracing = "0.1"
-tracing-subscriber = "0.2"
-tracing-futures = "0.2"
-
-[dependencies.songbird]
-path = "../../../"
-
-[dependencies.tokio]
-version = "1.0"
-features = ["macros", "rt-multi-thread"]
+reqwest = { workspace = true }
+serenity = { workspace = true }
+songbird = { workspace = true, default-features = true }
+symphonia = { workspace = true }
+tokio = { workspace = true }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
+tracing-futures = { workspace = true }
diff --git a/examples/serenity/voice_cached_audio/src/main.rs b/examples/serenity/voice_cached_audio/src/main.rs
@@ -24,6 +24,7 @@ use serenity::{
             macros::{command, group},
             Args,
             CommandResult,
+            Configuration,
         },
         StandardFramework,
     },
@@ -95,7 +96,7 @@ async fn main() {
     let token = env::var("DISCORD_TOKEN").expect("Expected a token in the environment");
 
     let framework = StandardFramework::new().group(&GENERAL_GROUP);
-    framework.configure(|c| c.prefix("~"));
+    framework.configure(Configuration::new().prefix("~"));
 
     let intents = GatewayIntents::non_privileged() | GatewayIntents::MESSAGE_CONTENT;
 

diff --git a/examples/serenity/voice_events_queue/Cargo.toml b/examples/serenity/voice_events_queue/Cargo.toml
@@ -5,17 +5,11 @@ authors = ["my name <[email protected]>"]
 edition = "2021"
 
 [dependencies]
-reqwest = "0.11"
-serenity = { version = "0.12.0-rc", features = ["client", "standard_framework", "voice", "rustls_backend"] }
-symphonia = { features = ["aac", "mp3", "isomp4", "alac"], version = "0.5.2" }
-tracing = "0.1"
-tracing-subscriber = "0.2"
-tracing-futures = "0.2"
-
-[dependencies.songbird]
-features = ["builtin-queue"]
-path = "../../../"
-
-[dependencies.tokio]
-version = "1.0"
-features = ["macros", "rt-multi-thread", "signal"]
+reqwest = { workspace = true }
+serenity = { workspace = true }
+songbird = { workspace = true, default-features = true, features = ["builtin-queue"] }
+symphonia = { workspace = true }
+tokio = { workspace = true }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
+tracing-futures = { workspace = true }
diff --git a/examples/serenity/voice_events_queue/src/main.rs b/examples/serenity/voice_events_queue/src/main.rs
@@ -28,6 +28,7 @@ use serenity::{
             macros::{command, group},
             Args,
             CommandResult,
+            Configuration,
         },
         StandardFramework,
     },
@@ -75,7 +76,7 @@ async fn main() {
     let token = env::var("DISCORD_TOKEN").expect("Expected a token in the environment");
 
     let framework = StandardFramework::new().group(&GENERAL_GROUP);
-    framework.configure(|c| c.prefix("~"));
+    framework.configure(Configuration::new().prefix("~"));
 
     let intents = GatewayIntents::non_privileged() | GatewayIntents::MESSAGE_CONTENT;
 

diff --git a/examples/serenity/voice_receive/Cargo.toml b/examples/serenity/voice_receive/Cargo.toml
@@ -6,15 +6,10 @@ edition = "2021"
 
 [dependencies]
 dashmap = "5"
-serenity = { version = "0.12.0-rc", features = ["client", "standard_framework", "voice", "rustls_backend"] }
-tracing = "0.1"
-tracing-subscriber = "0.2"
-tracing-futures = "0.2"
-
-[dependencies.songbird]
-features = ["receive"]
-path = "../../../"
-
-[dependencies.tokio]
-version = "1.0"
-features = ["macros", "rt-multi-thread"]
+serenity = { workspace = true }
+songbird = { workspace = true, default-features = true, features = ["receive"] }
+symphonia = { workspace = true }
+tokio = { workspace = true }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
+tracing-futures = { workspace = true }
diff --git a/examples/serenity/voice_receive/src/main.rs b/examples/serenity/voice_receive/src/main.rs
@@ -24,6 +24,7 @@ use serenity::{
             macros::{command, group},
             Args,
             CommandResult,
+            Configuration,
         },
         StandardFramework,
     },
@@ -209,7 +210,7 @@ async fn main() {
     let token = env::var("DISCORD_TOKEN").expect("Expected a token in the environment");
 
     let framework = StandardFramework::new().group(&GENERAL_GROUP);
-    framework.configure(|c| c.prefix("~"));
+    framework.configure(Configuration::new().prefix("~"));
 
     let intents = GatewayIntents::non_privileged() | GatewayIntents::MESSAGE_CONTENT;
 

diff --git a/examples/twilight/Cargo.toml b/examples/twilight/Cargo.toml
@@ -6,17 +6,13 @@ 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" }
+reqwest = { workspace = true }
+songbird = { workspace = true, features = ["driver", "gateway", "twilight", "rustls"] }
+symphonia = { workspace = true }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
+tokio = { workspace = true }
 twilight-gateway = "0.15"
 twilight-http = "0.15"
 twilight-model = "0.15"
 twilight-standby = "0.15"
-
-[dependencies.songbird]
-default-features = false
-path = "../.."
-features = ["driver", "gateway", "twilight", "rustls"]