Bump image, rfd, env_logger

emilk · Mar 12, 2024 · e90ac0c · e90ac0c
1 parent f019032
commit e90ac0c
Show file tree

Hide file tree

Showing 27 changed files with 552 additions and 319 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/eframe/Cargo.toml b/crates/eframe/Cargo.toml
@@ -152,7 +152,7 @@ egui-winit = { workspace = true, default-features = false, features = [
   "clipboard",
   "links",
 ] }
-image = { version = "0.24", default-features = false, features = [
+image = { version = "0.25", default-features = false, features = [
   "png",
 ] } # Needed for app icon
 winit = { workspace = true, default-features = false, features = ["rwh_06"] }

diff --git a/crates/eframe/src/icon_data.rs b/crates/eframe/src/icon_data.rs
@@ -54,7 +54,7 @@ impl IconDataExt for IconData {
         image
             .write_to(
                 &mut std::io::Cursor::new(&mut png_bytes),
-                image::ImageOutputFormat::Png,
+                image::ImageFormat::Png,
             )
             .map_err(|err| err.to_string())?;
         Ok(png_bytes)

diff --git a/crates/eframe/src/native/app_icon.rs b/crates/eframe/src/native/app_icon.rs
@@ -118,7 +118,7 @@ fn set_app_icon_windows(icon_data: &IconData) -> AppIconStatus {
         if image_scaled
             .write_to(
                 &mut std::io::Cursor::new(&mut image_scaled_bytes),
-                image::ImageOutputFormat::Png,
+                image::ImageFormat::Png,
             )
             .is_err()
         {

diff --git a/crates/egui_demo_app/Cargo.toml b/crates/egui_demo_app/Cargo.toml
@@ -62,7 +62,7 @@ wgpu = { workspace = true, features = ["webgpu", "webgl"], optional = true }
 
 # feature "http":
 ehttp = { version = "0.5", optional = true }
-image = { version = "0.24", optional = true, default-features = false, features = [
+image = { version = "0.25", optional = true, default-features = false, features = [
   "jpeg",
   "png",
 ] }
@@ -74,11 +74,11 @@ serde = { version = "1", optional = true, features = ["derive"] }
 
 # native:
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { version = "0.11", default-features = false, features = [
   "auto-color",
   "humantime",
 ] }
-rfd = { version = "0.13", optional = true }
+rfd = { version = "0.14", optional = true }
 
 # web:
 [target.'cfg(target_arch = "wasm32")'.dependencies]

diff --git a/crates/egui_extras/Cargo.toml b/crates/egui_extras/Cargo.toml
@@ -42,7 +42,7 @@ http = ["dep:ehttp"]
 ##
 ## You also need to ALSO opt-in to the image formats you want to support, like so:
 ## ```toml
-## image = { version = "0.24", features = ["jpeg", "png"] } # Add the types you want support for
+## image = { version = "0.25", features = ["jpeg", "png"] } # Add the types you want support for
 
 ## ```
 image = ["dep:image"]
@@ -79,7 +79,7 @@ chrono = { version = "0.4", optional = true, default-features = false, features
 ## Enable this when generating docs.
 document-features = { workspace = true, optional = true }
 
-image = { version = "0.24", optional = true, default-features = false }
+image = { version = "0.25", optional = true, default-features = false }
 
 # file feature
 mime_guess2 = { version = "2", optional = true, default-features = false }

diff --git a/examples/confirm_exit/Cargo.toml b/examples/confirm_exit/Cargo.toml
@@ -13,7 +13,7 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { version = "0.11", default-features = false, features = [
     "auto-color",
     "humantime",
 ] }
diff --git a/examples/custom_3d_glow/Cargo.toml b/examples/custom_3d_glow/Cargo.toml
@@ -13,7 +13,7 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { version = "0.11", default-features = false, features = [
     "auto-color",
     "humantime",
 ] }
diff --git a/examples/custom_font/Cargo.toml b/examples/custom_font/Cargo.toml
@@ -13,7 +13,7 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { version = "0.11", default-features = false, features = [
     "auto-color",
     "humantime",
 ] }
diff --git a/examples/custom_font_style/Cargo.toml b/examples/custom_font_style/Cargo.toml
@@ -13,7 +13,7 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { version = "0.11", default-features = false, features = [
     "auto-color",
     "humantime",
 ] }
diff --git a/examples/custom_keypad/Cargo.toml b/examples/custom_keypad/Cargo.toml
@@ -17,7 +17,7 @@ eframe = { workspace = true, features = [
 # For image support:
 egui_extras = { workspace = true, features = ["default", "image"] }
 
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { version = "0.11", default-features = false, features = [
     "auto-color",
     "humantime",
 ] }
diff --git a/examples/custom_plot_manipulation/Cargo.toml b/examples/custom_plot_manipulation/Cargo.toml
@@ -14,7 +14,7 @@ eframe = { workspace = true, features = [
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
 egui_plot.workspace = true
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { version = "0.11", default-features = false, features = [
     "auto-color",
     "humantime",
 ] }
diff --git a/examples/custom_window_frame/Cargo.toml b/examples/custom_window_frame/Cargo.toml
@@ -13,7 +13,7 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { version = "0.11", default-features = false, features = [
     "auto-color",
     "humantime",
 ] }
diff --git a/examples/file_dialog/Cargo.toml b/examples/file_dialog/Cargo.toml
@@ -13,8 +13,8 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { version = "0.11", default-features = false, features = [
     "auto-color",
     "humantime",
 ] }
-rfd = "0.13"
+rfd = "0.14"
diff --git a/examples/hello_world/Cargo.toml b/examples/hello_world/Cargo.toml
@@ -17,7 +17,7 @@ eframe = { workspace = true, features = [
 # For image support:
 egui_extras = { workspace = true, features = ["default", "image"] }
 
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { version = "0.11", default-features = false, features = [
     "auto-color",
     "humantime",
 ] }
diff --git a/examples/hello_world_par/Cargo.toml b/examples/hello_world_par/Cargo.toml
@@ -14,7 +14,7 @@ eframe = { workspace = true, default-features = false, features = [
     "default_fonts",
     "wgpu",
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { version = "0.11", default-features = false, features = [
     "auto-color",
     "humantime",
 ] }
diff --git a/examples/hello_world_simple/Cargo.toml b/examples/hello_world_simple/Cargo.toml
@@ -13,7 +13,7 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { version = "0.11", default-features = false, features = [
     "auto-color",
     "humantime",
 ] }
diff --git a/examples/images/Cargo.toml b/examples/images/Cargo.toml
@@ -14,11 +14,11 @@ eframe = { workspace = true, features = [
   "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
 egui_extras = { workspace = true, features = ["default", "all_loaders"] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { version = "0.11", default-features = false, features = [
   "auto-color",
   "humantime",
 ] }
-image = { version = "0.24", default-features = false, features = [
+image = { version = "0.25", default-features = false, features = [
   "jpeg",
   "png",
 ] }
diff --git a/examples/keyboard_events/Cargo.toml b/examples/keyboard_events/Cargo.toml
@@ -13,7 +13,7 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { version = "0.11", default-features = false, features = [
     "auto-color",
     "humantime",
 ] }
diff --git a/examples/multiple_viewports/Cargo.toml b/examples/multiple_viewports/Cargo.toml
@@ -15,7 +15,7 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { version = "0.11", default-features = false, features = [
     "auto-color",
     "humantime",
 ] }
diff --git a/examples/puffin_profiler/Cargo.toml b/examples/puffin_profiler/Cargo.toml
@@ -18,7 +18,7 @@ eframe = { workspace = true, features = [
     "puffin",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { version = "0.11", default-features = false, features = [
     "auto-color",
     "humantime",
 ] }

diff --git a/examples/save_plot/Cargo.toml b/examples/save_plot/Cargo.toml
@@ -13,9 +13,9 @@ eframe = { workspace = true, features = [
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
 egui_plot.workspace = true
-image = { version = "0.24", default-features = false, features = ["png"] }
-rfd = "0.13.0"
-env_logger = { version = "0.10", default-features = false, features = [
+image = { version = "0.25", default-features = false, features = ["png"] }
+rfd = "0.14"
+env_logger = { version = "0.11", default-features = false, features = [
     "auto-color",
     "humantime",
 ] }
diff --git a/examples/screenshot/Cargo.toml b/examples/screenshot/Cargo.toml
@@ -17,8 +17,8 @@ eframe = { workspace = true, features = [
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
     "wgpu",
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { version = "0.11", default-features = false, features = [
     "auto-color",
     "humantime",
 ] }
-image = { version = "0.24", default-features = false, features = ["png"] }
+image = { version = "0.25", default-features = false, features = ["png"] }
diff --git a/examples/serial_windows/Cargo.toml b/examples/serial_windows/Cargo.toml
@@ -13,7 +13,7 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { version = "0.11", default-features = false, features = [
     "auto-color",
     "humantime",
 ] }
diff --git a/examples/test_inline_glow_paint/Cargo.toml b/examples/test_inline_glow_paint/Cargo.toml
@@ -14,7 +14,7 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { version = "0.11", default-features = false, features = [
     "auto-color",
     "humantime",
 ] }
diff --git a/examples/test_viewports/Cargo.toml b/examples/test_viewports/Cargo.toml
@@ -15,7 +15,7 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { version = "0.11", default-features = false, features = [
     "auto-color",
     "humantime",
 ] }
diff --git a/examples/user_attention/Cargo.toml b/examples/user_attention/Cargo.toml
@@ -12,7 +12,7 @@ eframe = { workspace = true, features = [
     "default",
     "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { version = "0.11", default-features = false, features = [
     "auto-color",
     "humantime",
 ] }