Set version to 1.2.0 + updated dependencies

Author: bladecoder

cli-player/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "binkplayer"
-version = "1.1.0"
+version = "1.2.0"
 description = """
 Console player for compiled .json Ink story files.
 """
@@ -18,7 +18,7 @@ path = "src/main.rs"
 anyhow = "1.0.75"
 bladeink = { path = "../lib", "version" = "1.1.0" }
 clap = { "version" = "4.4.6", features = ["derive"] }
-rand = "0.8.5"
+rand = "0.9.2"
 
 [dev-dependencies]
 assert_cmd = "2.0.12"

cli-player/src/main.rs

@@ -92,7 +92,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         let choices = story.get_current_choices();
         if !choices.is_empty() {
             let command = if args.auto_play {
-                let i = rand::thread_rng().gen_range(0..choices.len());
+                let i = rand::rng().random_range(0..choices.len());
 
                 println!();
                 print_choices(&choices);

lib/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bladeink"
-version = "1.1.0"
+version = "1.2.0"
 authors = ["Rafael Garcia <[email protected]>"]
 description = """
 This is a Rust port of inkle's ink, a scripting language for writing interactive narrative.
@@ -19,13 +19,13 @@ path = "src/lib.rs"
 [dependencies]
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.93"
-strum = { version = "0.26.3", features = ["derive"] }
+strum = { version = "0.27.2", features = ["derive"] }
 as-any = "0.3.0"
-rand = "0.8.5"
+rand = "0.9.2"
 web-time = "1.1.0"
 
 [features]
 stream-json-parser = []
 
 [target.'cfg(all(target_family = "wasm", target_os = "unknown"))'.dependencies]
-getrandom = { version = "0.2.15", features = ["js"] }
+getrandom = { version = "0.3.3", features = ["wasm_js"] }

lib/src/story/control_logic.rs

@@ -391,7 +391,7 @@ impl Story {
                     let result_seed =
                         self.get_state().story_seed + self.get_state().previous_random;
                     let mut rng = StdRng::seed_from_u64(result_seed as u64);
-                    let next_random = rng.gen::<u32>();
+                    let next_random = rng.random::<u32>();
                     let chosen_value = (next_random % random_range as u32) as i32 + min_value;
                     self.get_state_mut()
                         .push_evaluation_stack(Rc::new(Value::new::<i32>(chosen_value)));
@@ -535,7 +535,7 @@ impl Story {
                             let result_seed =
                                 self.get_state().story_seed + self.get_state().previous_random;
                             let mut rng = StdRng::seed_from_u64(result_seed as u64);
-                            let next_random = rng.gen::<u32>();
+                            let next_random = rng.random::<u32>();
                             let list_item_index = (next_random as usize) % list.items.len(); // Iterate through to get the random element, sorted for
                                                                                              // predictibility
                             let mut sorted: Vec<(&InkListItem, &i32)> = list.items.iter().collect();

lib/src/story/mod.rs

@@ -161,7 +161,7 @@ mod misc {
             let mut unpicked_indices: Vec<i32> = (0..num_elements).collect();
 
             for i in 0..=iteration_index {
-                let chosen = rng.gen::<i32>().rem_euclid(unpicked_indices.len() as i32);
+                let chosen = rng.random::<i32>().rem_euclid(unpicked_indices.len() as i32);
                 let chosen_index = unpicked_indices[chosen as usize];
                 unpicked_indices.retain(|&x| x != chosen_index);
 

lib/src/story_state.rs

@@ -64,8 +64,8 @@ impl StoryState {
         let current_flow = Flow::new(DEFAULT_FLOW_NAME, main_content_container.clone());
         let callstack = current_flow.callstack.clone();
 
-        let mut rng = rand::thread_rng();
-        let story_seed = rng.gen_range(0..100);
+        let mut rng = rand::rng();
+        let story_seed = rng.random_range(0..100);
 
         let state = StoryState {
             current_flow,

lib/tests/common/mod.rs

@@ -46,7 +46,7 @@ pub fn run_story(
 
     let mut choice_list_index = 0;
 
-    let mut rng = rand::thread_rng();
+    let mut rng = rand::rng();
 
     while story.can_continue() || !story.get_current_choices().is_empty() {
         println!("{}", story.build_string_of_hierarchy());
@@ -80,11 +80,11 @@ pub fn run_story(
                     story.choose_choice_index(choice_list[choice_list_index])?;
                     choice_list_index += 1;
                 } else {
-                    let random_choice_index = rng.gen_range(0..len);
+                    let random_choice_index = rng.random_range(0..len);
                     story.choose_choice_index(random_choice_index)?;
                 }
             } else {
-                let random_choice_index = rng.gen_range(0..len);
+                let random_choice_index = rng.random_range(0..len);
                 story.choose_choice_index(random_choice_index)?;
             }
         }