From 77b89d9df5a28f66ae6b153e6d24cf0d58042353 Mon Sep 17 00:00:00 2001
From: Arend van Beelen jr <arendjr@gmail.com>
Date: Tue, 7 Nov 2023 16:40:07 +0100
Subject: [PATCH] Upgrade to Bevy 0.12 (#108)

---
 Cargo.toml            | 6 +++---
 README.md             | 3 ++-
 benchmarks/Cargo.toml | 2 +-
 src/lib.rs            | 2 +-
 src/plugin.rs         | 8 ++------
 src/tweenable.rs      | 8 ++++----
 6 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 0eec4b4..35d25e5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_tweening"
-version = "0.8.0"
+version = "0.9.0"
 authors = ["François Mockers <mockersf@gmail.com>", "Jerome Humbert <djeedai@gmail.com>"]
 edition = "2021"
 description = "Tweening animation plugin for the Bevy game engine"
@@ -25,10 +25,10 @@ bevy_text = ["bevy/bevy_text", "bevy/bevy_render", "bevy/bevy_sprite"]
 
 [dependencies]
 interpolation = "0.2"
-bevy = { version = "0.11", default-features = false }
+bevy = { version = "0.12", default-features = false }
 
 [dev-dependencies]
-bevy-inspector-egui = "0.19"
+bevy-inspector-egui = "0.21"
 
 [[example]]
 name = "menu"
diff --git a/README.md b/README.md
index 0337349..f5837eb 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ Add to `Cargo.toml`:
 
 ```toml
 [dependencies]
-bevy_tweening = "0.8"
+bevy_tweening = "0.9"
 ```
 
 This crate supports the following features:
@@ -327,6 +327,7 @@ Compatibility of `bevy_tweening` versions:
 
 | `bevy_tweening` | `bevy` |
 | :--             | :--    |
+| `0.9`           | `0.12` |
 | `0.8`           | `0.11` |
 | `0.7`           | `0.10` |
 | `0.6`           | `0.9`  |
diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml
index 8abc515..5469734 100644
--- a/benchmarks/Cargo.toml
+++ b/benchmarks/Cargo.toml
@@ -18,7 +18,7 @@ criterion = { version = "0.4", features = ["html_reports"] }
 bevy_tweening = { path = "../" }
 
 [dependencies.bevy]
-version = "0.11"
+version = "0.12"
 default-features = false
 features = ["bevy_render", "bevy_sprite", "bevy_text", "bevy_ui"]
 
diff --git a/src/lib.rs b/src/lib.rs
index b97a0cb..5f34b1d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -558,7 +558,7 @@ mod tests {
     }
 
     #[cfg(feature = "bevy_asset")]
-    #[derive(Debug, Default, Reflect, TypeUuid)]
+    #[derive(Asset, Debug, Default, Reflect, TypeUuid)]
     #[uuid = "a33abc11-264e-4bbb-82e8-b87226bb4383"]
     struct DummyAsset {
         value: f32,
diff --git a/src/plugin.rs b/src/plugin.rs
index 7425578..a4bfd7f 100644
--- a/src/plugin.rs
+++ b/src/plugin.rs
@@ -157,10 +157,7 @@ mod tests {
         pub fn new<T: Component>(animator: T) -> Self {
             let mut world = World::new();
             world.init_resource::<Events<TweenCompleted>>();
-
-            let mut time = Time::default();
-            time.update();
-            world.insert_resource(time);
+            world.init_resource::<Time>();
 
             let entity = world.spawn((Transform::default(), animator)).id();
 
@@ -178,8 +175,7 @@ mod tests {
             // Simulate time passing by updating the simulation time resource
             {
                 let mut time = self.world.resource_mut::<Time>();
-                let last_update = time.last_update().unwrap();
-                time.update_with_instant(last_update + duration);
+                time.advance_by(duration);
             }
 
             // Reset world-related change detection
diff --git a/src/tweenable.rs b/src/tweenable.rs
index 7bfcdd3..45476e1 100644
--- a/src/tweenable.rs
+++ b/src/tweenable.rs
@@ -3,7 +3,7 @@ use std::{ops::DerefMut, time::Duration};
 use bevy::prelude::*;
 
 #[cfg(feature = "bevy_asset")]
-use bevy::asset::{Asset, HandleId};
+use bevy::asset::{Asset, AssetId};
 
 use crate::{EaseMethod, Lens, RepeatCount, RepeatStrategy, TweeningDirection};
 
@@ -234,7 +234,7 @@ impl<'a, T: Asset> AssetTarget<'a, T> {
     pub fn new(assets: ResMut<'a, Assets<T>>) -> Self {
         Self {
             assets,
-            handle: Handle::weak(HandleId::default::<T>()),
+            handle: Handle::Weak(AssetId::default()),
         }
     }
 
@@ -1465,7 +1465,7 @@ mod tests {
                     assert_eq!(cb_mon.last_reported_count, times_completed);
                     {
                         let mut event_reader = event_reader_system_state.get_mut(&mut world);
-                        let event = event_reader.iter().next();
+                        let event = event_reader.read().next();
                         if just_completed {
                             assert!(event.is_some());
                             if let Some(event) = event {
@@ -1877,7 +1877,7 @@ mod tests {
 
                 {
                     let mut event_reader = event_reader_system_state.get_mut(&mut world);
-                    let event = event_reader.iter().next();
+                    let event = event_reader.read().next();
                     if i == 5 {
                         assert!(event.is_some());
                         let event = event.unwrap();