Merge pull request #176 from NiklasEi/fix_compilation_without_2d_3d_f…

…eatures Fix compilation without 2d 3d features
NiklasEi · Jan 3, 2024 · 59f9660 · 59f9660
2 parents 83d480e + e9de3dc
commit 59f9660
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -102,7 +102,12 @@ jobs:
           components: rustfmt, clippy
       - name: Install alsa and udev
         run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
+      - uses: taiki-e/install-action@v2
+        with:
+          tool: cargo-hack
       - name: Run clippy
         run: cargo clippy --workspace --all-targets --all-features -- -W clippy::doc_markdown
+      - name: Check all feature combinations
+        run: cargo hack check --feature-powerset
       - name: Check format
         run: cargo fmt --all -- --check
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 
-## v0.19.0 - 27.12.2023
+### v0.19.1 - 03.01.2024
+- Fix: `standard_dynamic_assets` feature fails compilation without `2d` or `3d` feature (resolves [#175](https://github.com/NiklasEi/bevy_asset_loader/issues/175))
+
+## v0.19.0 - 27.12.2023 - yanked
 - New API to add and configure loading states
   - Less API surface on Bevy's App type and fewer generics
     - Only two methods on the App: `add_loading_state` and `configure_loading_state`

diff --git a/bevy_asset_loader/Cargo.toml b/bevy_asset_loader/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_asset_loader"
-version = "0.19.0"
+version = "0.19.1"
 authors = ["Niklas Eicker <[email protected]>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"

diff --git a/bevy_asset_loader/src/standard_dynamic_asset.rs b/bevy_asset_loader/src/standard_dynamic_asset.rs
@@ -1,6 +1,6 @@
 use crate::dynamic_asset::{DynamicAsset, DynamicAssetType};
 use crate::dynamic_asset::{DynamicAssetCollection, DynamicAssets};
-use bevy::asset::{Asset, AssetServer, Assets, Handle, LoadedFolder, UntypedHandle};
+use bevy::asset::{Asset, AssetServer, Assets, LoadedFolder, UntypedHandle};
 use bevy::ecs::system::Command;
 use bevy::ecs::world::World;
 use bevy::reflect::TypePath;
@@ -248,9 +248,10 @@ impl DynamicAsset for StandardDynamicAsset {
     }
 }
 
+#[cfg(any(feature = "3d", feature = "2d"))]
 impl StandardDynamicAsset {
     fn update_image_sampler(
-        handle: &mut Handle<Image>,
+        handle: &mut bevy::asset::Handle<Image>,
         images: &mut Assets<Image>,
         sampler_type: &ImageSamplerType,
     ) {