Fix cargo check

kgv · Mar 16, 2024 · 158e21c · 158e21c
1 parent 9701c65
commit 158e21c
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 29 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_fluent"
-version = "0.8.0"
+version = "0.9.0"
 authors = ["g <[email protected]>"]
 edition = "2021"
 description = "Bevy plugin for localization using Fluent"
@@ -18,23 +18,23 @@ categories = [
 exclude = [".github/**/*"]
 
 [dependencies]
-bevy = { version = "0.13", default-features = false, features = ["bevy_asset"] }
+bevy = { version = "0.13.0", default-features = false, features = [
+  "bevy_asset",
+] }
 fluent = "0.16.0"
-fluent_content = "0.0.5"
 fluent-langneg = "0.13.0"
-futures-lite = "2.0.0"
-indexmap = { version = "2.1.0", features = ["serde"] }
+fluent_content = "0.0.5"
+futures-lite = "2.2.0"
+indexmap = { version = "2.2.5", features = ["serde"] }
 intl-memoizer = "0.5.1"
 ron = "0.8.1"
-serde = { version = "1.0.188", features = ["derive"] }
-serde_yaml = "0.9.27"
-thiserror = "1.0.50"
+serde = { version = "1.0.197", features = ["derive"] }
+serde_yaml = "0.9.32"
+thiserror = "1.0.58"
 tracing = "0.1.40"
-unic-langid = { version = "0.9.1", features = ["serde"] }
-uuid = { version = "1.5.0", features = ["serde", "v4", "v5"] }
-# fluent-syntax = { git = "https://github.com/projectfluent/fluent-rs" }
-# globset = "0.4.13"
+unic-langid = { version = "0.9.4", features = ["serde"] }
+uuid = { version = "1.7.0", features = ["serde", "v4", "v5"] }
 
 [dev-dependencies]
-bevy = "0.13"
-unic-langid = { version = "0.9.1", features = ["macros"] }
+bevy = "0.13.0"
+unic-langid = { version = "0.9.4", features = ["macros"] }
diff --git a/README.md b/README.md
@@ -15,12 +15,12 @@
 ## Version
 
 | bevy | bevy_fluent |
-|------|-------------|
+| ---- | ----------- |
+| 0.13 | 0.9         |
 | 0.12 | 0.8         |
 | 0.11 | 0.7         |
 | 0.10 | 0.6         |
 | 0.9  | 0.5         |
-| 0.8  | 0.4         |
 
 ## See Also
 

diff --git a/examples/ui/main.rs b/examples/ui/main.rs
@@ -20,7 +20,7 @@ fn main() {
         .insert_resource(Locale::new(ru::RU).with_default(en::US))
         .insert_resource(Locales(vec![de::DE, en::US, ru::BY, ru::RU]))
         .init_resource::<Font>()
-        .add_state::<GameState>()
+        .init_state::<GameState>()
         .add_systems(OnEnter(GameState::Load), load::setup)
         .add_systems(Update, load::update.run_if(in_state(GameState::Load)))
         .add_systems(OnEnter(GameState::Menu), menu::setup)

diff --git a/src/assets/bundle.rs b/src/assets/bundle.rs
@@ -6,10 +6,7 @@ use bevy::{
     asset::{io::Reader, AssetLoader, AsyncReadExt, LoadContext},
     prelude::*,
     reflect::TypePath,
-    utils::{
-        tracing::{self, instrument},
-        BoxedFuture,
-    },
+    utils::{tracing::instrument, BoxedFuture},
 };
 use fluent::{bundle::FluentBundle, FluentResource};
 use intl_memoizer::concurrent::IntlLangMemoizer;

diff --git a/src/assets/resource.rs b/src/assets/resource.rs
@@ -5,10 +5,7 @@ use bevy::{
     asset::{io::Reader, AssetLoader, AsyncReadExt, LoadContext},
     prelude::*,
     reflect::TypePath,
-    utils::{
-        tracing::{self, instrument},
-        BoxedFuture,
-    },
+    utils::{tracing::instrument, BoxedFuture},
 };
 use fluent::FluentResource;
 use std::{ops::Deref, str, sync::Arc};

diff --git a/src/resources/localization.rs b/src/resources/localization.rs
@@ -1,10 +1,7 @@
 //! Localization asset
 
 use crate::{exts::fluent::BundleExt, BundleAsset};
-use bevy::{
-    prelude::*,
-    utils::tracing::{self, instrument},
-};
+use bevy::{prelude::*, utils::tracing::instrument};
 use fluent::FluentArgs;
 use fluent_content::{Content, Request};
 use indexmap::IndexMap;