Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update bevy_fluent to bevy 0.13 #45

Merged
merged 3 commits into from
Mar 16, 2024
Merged

update bevy_fluent to bevy 0.13 #45

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c92be87
remove typeuuid
brandon-reinhart Mar 5, 2024
13d56c0
fix missing rev
brandon-reinhart Mar 5, 2024
d9f8a58
Fix cargo check
kgv Mar 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ categories = [
exclude = [".github/**/*"]

[dependencies]
bevy = { version = "0.12", default-features = false, features = ["bevy_asset"] }
bevy = { version = "0.13", default-features = false, features = ["bevy_asset"] }
fluent = "0.16.0"
fluent_content = "0.0.5"
fluent-langneg = "0.13.0"
Expand All @@ -36,5 +36,5 @@ uuid = { version = "1.5.0", features = ["serde", "v4", "v5"] }
# globset = "0.4.13"

[dev-dependencies]
bevy = "0.12"
bevy = "0.13"
unic-langid = { version = "0.9.1", features = ["macros"] }
5 changes: 2 additions & 3 deletions src/assets/bundle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use crate::ResourceAsset;
use bevy::{
asset::{io::Reader, AssetLoader, AsyncReadExt, LoadContext},
prelude::*,
reflect::{TypePath, TypeUuid},
reflect::TypePath,
utils::{
tracing::{self, instrument},
BoxedFuture,
Expand All @@ -20,8 +20,7 @@ use unic_langid::LanguageIdentifier;
/// [`FluentBundle`](fluent::bundle::FluentBundle) wrapper
///
/// Collection of [`FluentResource`]s for a single locale
#[derive(Asset, Clone, TypePath, TypeUuid)]
#[uuid = "929113bb-9187-44c3-87be-6027fc3b7ac5"]
#[derive(Asset, Clone, TypePath)]
pub struct BundleAsset(pub(crate) Arc<FluentBundle<Arc<FluentResource>, IntlLangMemoizer>>);

impl Deref for BundleAsset {
Expand Down
5 changes: 2 additions & 3 deletions src/assets/resource.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use super::{Error, Result};
use bevy::{
asset::{io::Reader, AssetLoader, AsyncReadExt, LoadContext},
prelude::*,
reflect::{TypePath, TypeUuid},
reflect::TypePath,
utils::{
tracing::{self, instrument},
BoxedFuture,
Expand All @@ -14,8 +14,7 @@ use fluent::FluentResource;
use std::{ops::Deref, str, sync::Arc};

/// [`FluentResource`](fluent::FluentResource) wrapper
#[derive(Asset, Clone, Debug, TypePath, TypeUuid)]
#[uuid = "0b2367cb-fb4a-4746-a305-df98b26dddf6"]
#[derive(Asset, Clone, Debug, TypePath)]
pub struct ResourceAsset(pub(crate) Arc<FluentResource>);

impl Deref for ResourceAsset {
Expand Down
Loading