diff --git a/Cargo.lock b/Cargo.lock index c546459a..eb393e60 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -95,9 +95,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" +checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc" [[package]] name = "approx" @@ -162,9 +162,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base-x" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" +checksum = "dc19a4937b4fbd3fe3379793130e42060d10627a360f2127802b10b87e7baf74" [[package]] name = "base64" @@ -241,7 +241,7 @@ dependencies = [ "crossbeam-channel", "downcast-rs", "js-sys", - "ndk-glue 0.5.1", + "ndk-glue 0.5.2", "notify", "parking_lot", "rand", @@ -354,7 +354,7 @@ dependencies = [ [[package]] name = "bevy_ecs_ldtk" -version = "0.2.0" +version = "0.3.0" dependencies = [ "anyhow", "bevy", @@ -371,7 +371,7 @@ dependencies = [ [[package]] name = "bevy_ecs_ldtk_macros" -version = "0.2.0" +version = "0.3.0" dependencies = [ "proc-macro2", "quote", @@ -500,7 +500,7 @@ dependencies = [ "bevy_utils", "bevy_window", "bevy_winit", - "ndk-glue 0.5.1", + "ndk-glue 0.5.2", ] [[package]] @@ -801,9 +801,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.56.0" +version = "0.59.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239" +checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" dependencies = [ "bitflags", "cexpr", @@ -917,9 +917,9 @@ checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" [[package]] name = "cexpr" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" dependencies = [ "nom", ] @@ -1145,9 +1145,9 @@ dependencies = [ [[package]] name = "coreaudio-sys" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca4679a59dbd8c15f064c012dfe8c1163b9453224238b59bb9328c142b8b248b" +checksum = "3dff444d80630d7073077d38d40b4501fd518bd2b922c2a55edcc8b0f7be57e6" dependencies = [ "bindgen", ] @@ -1167,7 +1167,7 @@ dependencies = [ "libc", "mach 0.3.2", "ndk 0.6.0", - "ndk-glue 0.6.1", + "ndk-glue 0.6.2", "nix", "oboe", "parking_lot", @@ -1931,9 +1931,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.123" +version = "0.2.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb691a747a7ab48abc15c5b42066eaafde10dc427e3b6ee2a1cf43db04c763bd" +checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50" [[package]] name = "libloading" @@ -2054,6 +2054,12 @@ dependencies = [ "objc", ] +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "miniz_oxide" version = "0.3.7" @@ -2180,15 +2186,15 @@ dependencies = [ [[package]] name = "ndk-context" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5cc68637e21fe8f077f6a1c9e0b9ca495bb74895226b476310f613325884" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] name = "ndk-glue" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1c68f70683c5fc9a747a383744206cd371741b2f0b31781ab6770487ec572e2" +checksum = "c71bee8ea72d685477e28bd004cfe1bf99c754d688cd78cad139eae4089484d4" dependencies = [ "android_logger", "lazy_static", @@ -2202,9 +2208,9 @@ dependencies = [ [[package]] name = "ndk-glue" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9ffb7443daba48349d545028777ca98853b018b4c16624aa01223bc29e078da" +checksum = "0d0c4a7b83860226e6b4183edac21851f05d5a51756e97a1144b7f5a6b63e65f" dependencies = [ "lazy_static", "libc", @@ -2258,12 +2264,12 @@ dependencies = [ [[package]] name = "nom" -version = "5.1.2" +version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" dependencies = [ "memchr", - "version_check", + "minimal-lexical", ] [[package]] @@ -2423,7 +2429,7 @@ checksum = "2463c8f2e19b4e0d0710a21f8e4011501ff28db1c95d7a5482a553b2100502d2" dependencies = [ "jni", "ndk 0.6.0", - "ndk-glue 0.6.1", + "ndk-glue 0.6.2", "num-derive", "num-traits", "oboe-sys", @@ -2912,9 +2918,9 @@ dependencies = [ [[package]] name = "shlex" -version = "0.1.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "simba" @@ -3151,9 +3157,9 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" dependencies = [ "lazy_static", "log", @@ -3392,9 +3398,9 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93b1a9400e8d7f32dd4dd909bb9a391015d70633d639775ddd3f14d1104bc970" +checksum = "d684ea6a34974a2fc19f1dfd183d11a62e22d75c4f187a574bb1224df8e056c2" dependencies = [ "arrayvec", "ash", @@ -3496,7 +3502,7 @@ dependencies = [ "log", "mio 0.8.2", "ndk 0.5.0", - "ndk-glue 0.5.1", + "ndk-glue 0.5.2", "ndk-sys 0.2.2", "objc", "parking_lot", diff --git a/Cargo.toml b/Cargo.toml index 244e9225..38a824f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bevy_ecs_ldtk" description = "An ECS-friendly ldtk plugin for bevy." -version = "0.2.0" +version = "0.3.0" edition = "2021" authors = ["Trevor Lovell "] repository = "https://github.com/Trouv/bevy_ecs_ldtk" @@ -11,14 +11,14 @@ categories = ["game-development"] exclude = ["assets/*", "repo/*", "scripts/*"] [dependencies] -bevy_ecs_ldtk_macros = { version = "0.2", optional = true, path = "macros" } +bevy_ecs_ldtk_macros = { version = "0.3", optional = true, path = "macros" } bevy_ecs_tilemap = "0.6" bevy = { version = "0.7", default-features = false } -anyhow = "1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" regex = "1.5" hex = "0.4" +anyhow = "1.0" thiserror = "1.0" [dev-dependencies] diff --git a/README.md b/README.md index 081e48b3..ce136cf5 100644 --- a/README.md +++ b/README.md @@ -86,11 +86,10 @@ for additional level-loading options. ### Compatibility | bevy | bevy_ecs_tilemap | LDtk | bevy_ecs_ldtk | | --- | --- | --- | --- | +| 0.7 | 0.6 | 1.1 | 0.3 | | 0.6 | 0.5 | 0.9 | 0.2 | | 0.6 | 0.5 | 0.9 | 0.1 | -*ldtk 1.1+ support is coming to 0.3. It's available now if you depend on main.* - ### Asset Credits - [SunnyLand](https://ansimuz.itch.io/sunny-land-pixel-game-art), a texture pack by Ansimuz, licensed under [CC0 1.0](https://creativecommons.org/publicdomain/zero/1.0/) - [PIXEL FANTASY RPG ICONS](https://cazwolf.itch.io/caz-pixel-free), an icon pack by Caz, licensed under [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/) diff --git a/macros/Cargo.lock b/macros/Cargo.lock index cc2f35be..5d266c14 100644 --- a/macros/Cargo.lock +++ b/macros/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "bevy_ecs_ldtk_macros" -version = "0.2.0" +version = "0.3.0" dependencies = [ "proc-macro2", "quote", @@ -13,27 +13,27 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.32" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" +checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1" dependencies = [ "unicode-xid", ] [[package]] name = "quote" -version = "1.0.10" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" +checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" dependencies = [ "proc-macro2", ] [[package]] name = "syn" -version = "1.0.81" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966" +checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d" dependencies = [ "proc-macro2", "quote", diff --git a/macros/Cargo.toml b/macros/Cargo.toml index 4628e5ee..c76dabf1 100644 --- a/macros/Cargo.toml +++ b/macros/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bevy_ecs_ldtk_macros" description = "Derive macros for bevy_ecs_ldtk." -version = "0.2.0" +version = "0.3.0" edition = "2021" authors = ["Trevor Lovell "] license = "MIT OR Apache-2.0"