From bbcbbd8ce34913a4c983693350f098c508390f2f Mon Sep 17 00:00:00 2001
From: Rekai Musuka <rekai@musuka.dev>
Date: Mon, 6 Dec 2021 13:36:23 -0400
Subject: [PATCH] chore: fix dependency conflict

---
 Cargo.lock | 34 ++++------------------------------
 Cargo.toml |  2 +-
 2 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1fd89e1..3ee1dfc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -645,12 +645,12 @@ dependencies = [
 
 [[package]]
 name = "egui_winit_platform"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0ae306ae9cd296ed3178d518fd0d9edf45f176cfdfe31ff77b7051c5f1d5278"
+checksum = "060a783c2f05a8ff8f02ade860e8bfcc6153d62104097938b1192405b7039973"
 dependencies = [
  "egui",
- "winit 0.25.0",
+ "winit",
 ]
 
 [[package]]
@@ -730,7 +730,7 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "wgpu",
- "winit 0.26.0",
+ "winit",
 ]
 
 [[package]]
@@ -2355,32 +2355,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "winit"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79610794594d5e86be473ef7763f604f2159cbac8c94debd00df8fb41e86c2f8"
-dependencies = [
- "bitflags",
- "cocoa",
- "core-foundation 0.9.2",
- "core-graphics 0.22.3",
- "core-video-sys",
- "dispatch",
- "instant",
- "lazy_static",
- "libc",
- "log",
- "ndk 0.3.0",
- "ndk-glue 0.3.0",
- "ndk-sys",
- "objc",
- "parking_lot",
- "raw-window-handle 0.3.4",
- "scopeguard",
- "winapi",
-]
-
 [[package]]
 name = "winit"
 version = "0.26.0"
diff --git a/Cargo.toml b/Cargo.toml
index 1c04153..0e9f2ff 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,7 +15,7 @@ winit = "0.26"
 egui = "0.15"
 wgpu = "0.11"
 egui_wgpu_backend = "0.14"
-egui_winit_platform = "0.11"
+egui_winit_platform = "0.12"
 pollster = "0.2"
 rodio = "0.14"
 rtrb = "0.2"