From 47525c368251b31a553492d4d2c0bee22287890f Mon Sep 17 00:00:00 2001
From: Tristan Druyen <tristan@vault81.de>
Date: Fri, 31 Jan 2025 18:45:24 +0100
Subject: [PATCH] Update iced to 0.13

---
 Cargo.lock | 697 +++++++++--------------------------------------------
 Cargo.toml |   3 +-
 2 files changed, 115 insertions(+), 585 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index badbf39..73fb1cd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "ab_glyph"
@@ -156,18 +156,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "any_spawner"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9747eb01aed7603aba23f7c869d5d7e5d37aab9c3501aced42d8fdb786f1f6e3"
-dependencies = [
- "futures",
- "thiserror",
- "tokio",
- "wasm-bindgen-futures",
-]
-
 [[package]]
 name = "anyhow"
 version = "1.0.94"
@@ -1050,17 +1038,6 @@ dependencies = [
  "objc",
 ]
 
-[[package]]
-name = "codee"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d3ad3122b0001c7f140cf4d605ef9a9e2c24d96ab0b4fb4347b76de2425f445"
-dependencies = [
- "serde",
- "serde_json",
- "thiserror",
-]
-
 [[package]]
 name = "codespan-reporting"
 version = "0.11.1"
@@ -1177,12 +1154,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "const_str_slice_concat"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f67855af358fcb20fac58f9d714c94e2b228fe5694c1c9b4ead4a366343eda1b"
-
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -1613,20 +1584,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "dashmap"
-version = "6.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core 0.9.10",
-]
-
 [[package]]
 name = "dconf_rs"
 version = "0.3.0"
@@ -1822,11 +1779,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "dpi"
-version = "0.1.1"
-source = "git+https://github.com/iced-rs/winit.git?rev=254d6b3420ce4e674f516f7a2bd440665e05484d#254d6b3420ce4e674f516f7a2bd440665e05484d"
-
 [[package]]
 name = "drain_filter_polyfill"
 version = "0.1.3"
@@ -1902,15 +1854,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "either_of"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6e22feb4d5cacf9f2c64902a1c35ef0f2d766e42db316a98b93992bbce669cb"
-dependencies = [
- "pin-project-lite",
-]
-
 [[package]]
 name = "emacs"
 version = "0.19.0"
@@ -2735,18 +2678,6 @@ dependencies = [
  "gl_generator",
 ]
 
-[[package]]
-name = "glyphon"
-version = "0.5.0"
-source = "git+https://github.com/hecrj/glyphon.git?rev=feef9f5630c2adb3528937e55f7bfad2da561a65#feef9f5630c2adb3528937e55f7bfad2da561a65"
-dependencies = [
- "cosmic-text",
- "etagere",
- "lru 0.12.4",
- "rustc-hash 2.0.0",
- "wgpu",
-]
-
 [[package]]
 name = "gobject-sys"
 version = "0.18.0"
@@ -2862,12 +2793,6 @@ dependencies = [
  "syn 2.0.77",
 ]
 
-[[package]]
-name = "guardian"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "493913a18c0d7bebb75127a26a432162c59edbe06f6cf712001e3e769345e8b5"
-
 [[package]]
 name = "guillotiere"
 version = "0.6.2"
@@ -3108,22 +3033,6 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
-[[package]]
-name = "hydration_context"
-version = "0.2.0-beta5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b807c29c4af72bfcc71a4427625749ad7a0c22b936f8a1a82f464140b633afe6"
-dependencies = [
- "futures",
- "js-sys",
- "once_cell",
- "or_poisoned",
- "pin-project-lite",
- "serde",
- "throw_error",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "hyper"
 version = "1.4.1"
@@ -3239,7 +3148,8 @@ dependencies = [
 [[package]]
 name = "iced"
 version = "0.13.1"
-source = "git+https://github.com/iced-rs/iced.git?branch=master#bf3b6f100df7b1585dfac88da432bc29784ed534"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88acfabc84ec077eaf9ede3457ffa3a104626d79022a9bf7f296093b1d60c73f"
 dependencies = [
  "iced_core",
  "iced_futures",
@@ -3251,8 +3161,9 @@ dependencies = [
 
 [[package]]
 name = "iced_core"
-version = "0.13.1"
-source = "git+https://github.com/iced-rs/iced.git?branch=master#bf3b6f100df7b1585dfac88da432bc29784ed534"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0013a238275494641bf8f1732a23a808196540dc67b22ff97099c044ae4c8a1c"
 dependencies = [
  "bitflags 2.6.0",
  "bytes",
@@ -3270,8 +3181,9 @@ dependencies = [
 
 [[package]]
 name = "iced_futures"
-version = "0.13.1"
-source = "git+https://github.com/iced-rs/iced.git?branch=master#bf3b6f100df7b1585dfac88da432bc29784ed534"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c04a6745ba2e80f32cf01e034fd00d853aa4f4cd8b91888099cb7aaee0d5d7c"
 dependencies = [
  "futures",
  "iced_core",
@@ -3281,10 +3193,24 @@ dependencies = [
  "wasm-timer",
 ]
 
+[[package]]
+name = "iced_glyphon"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41c3bb56f1820ca252bc1d0994ece33d233a55657c0c263ea7cb16895adbde82"
+dependencies = [
+ "cosmic-text",
+ "etagere",
+ "lru 0.12.4",
+ "rustc-hash 2.0.0",
+ "wgpu",
+]
+
 [[package]]
 name = "iced_graphics"
-version = "0.13.1"
-source = "git+https://github.com/iced-rs/iced.git?branch=master#bf3b6f100df7b1585dfac88da432bc29784ed534"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba25a18cfa6d5cc160aca7e1b34f73ccdff21680fa8702168c09739767b6c66f"
 dependencies = [
  "bitflags 2.6.0",
  "bytemuck",
@@ -3302,8 +3228,9 @@ dependencies = [
 
 [[package]]
 name = "iced_renderer"
-version = "0.13.1"
-source = "git+https://github.com/iced-rs/iced.git?branch=master#bf3b6f100df7b1585dfac88da432bc29784ed534"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73558208059f9e622df2bf434e044ee2f838ce75201a023cf0ca3e1244f46c2a"
 dependencies = [
  "iced_graphics",
  "iced_tiny_skia",
@@ -3314,8 +3241,9 @@ dependencies = [
 
 [[package]]
 name = "iced_runtime"
-version = "0.13.1"
-source = "git+https://github.com/iced-rs/iced.git?branch=master#bf3b6f100df7b1585dfac88da432bc29784ed534"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "348b5b2c61c934d88ca3b0ed1ed913291e923d086a66fa288ce9669da9ef62b5"
 dependencies = [
  "bytes",
  "iced_core",
@@ -3326,8 +3254,9 @@ dependencies = [
 
 [[package]]
 name = "iced_tiny_skia"
-version = "0.13.1"
-source = "git+https://github.com/iced-rs/iced.git?branch=master#bf3b6f100df7b1585dfac88da432bc29784ed534"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c625d368284fcc43b0b36b176f76eff1abebe7959dd58bd8ce6897d641962a50"
 dependencies = [
  "bytemuck",
  "cosmic-text",
@@ -3341,15 +3270,16 @@ dependencies = [
 
 [[package]]
 name = "iced_wgpu"
-version = "0.13.1"
-source = "git+https://github.com/iced-rs/iced.git?branch=master#bf3b6f100df7b1585dfac88da432bc29784ed534"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15708887133671d2bcc6c1d01d1f176f43a64d6cdc3b2bf893396c3ee498295f"
 dependencies = [
  "bitflags 2.6.0",
  "bytemuck",
  "futures",
  "glam",
- "glyphon",
  "guillotiere",
+ "iced_glyphon",
  "iced_graphics",
  "log",
  "once_cell",
@@ -3360,8 +3290,9 @@ dependencies = [
 
 [[package]]
 name = "iced_widget"
-version = "0.13.1"
-source = "git+https://github.com/iced-rs/iced.git?branch=master#bf3b6f100df7b1585dfac88da432bc29784ed534"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81429e1b950b0e4bca65be4c4278fea6678ea782030a411778f26fa9f8983e1d"
 dependencies = [
  "iced_renderer",
  "iced_runtime",
@@ -3374,8 +3305,9 @@ dependencies = [
 
 [[package]]
 name = "iced_winit"
-version = "0.13.1"
-source = "git+https://github.com/iced-rs/iced.git?branch=master#bf3b6f100df7b1585dfac88da432bc29784ed534"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f44cd4e1c594b6334f409282937bf972ba14d31fedf03c23aa595d982a2fda28"
 dependencies = [
  "iced_futures",
  "iced_graphics",
@@ -3388,7 +3320,7 @@ dependencies = [
  "web-sys",
  "winapi",
  "window_clipboard",
- "winit 0.30.1",
+ "winit 0.30.8",
 ]
 
 [[package]]
@@ -3649,54 +3581,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0cbb3237c274dadf00dcc27db96c52601b40375117178fb24a991cda073624f0"
 dependencies = [
  "cfg-if",
- "leptos_config 0.6.15",
- "leptos_dom 0.6.15",
- "leptos_macro 0.6.15",
+ "leptos_config",
+ "leptos_dom",
+ "leptos_macro",
  "leptos_reactive",
- "leptos_server 0.6.15",
+ "leptos_server",
  "serde",
  "serde_json",
- "server_fn 0.6.15",
+ "server_fn",
  "tracing",
- "typed-builder 0.18.2",
- "typed-builder-macro 0.18.2",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "leptos"
-version = "0.7.0-beta5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dce271592769bc3aaece4b23228176fe2862b24666a6ad1d49639af9e3081f93"
-dependencies = [
- "any_spawner",
- "base64 0.22.1",
- "cfg-if",
- "either_of",
- "futures",
- "hydration_context",
- "leptos_config 0.7.0-beta5",
- "leptos_dom 0.7.0-beta5",
- "leptos_hot_reload 0.7.0-beta5",
- "leptos_macro 0.7.0-beta5",
- "leptos_server 0.7.0-beta5",
- "oco_ref 0.2.0",
- "or_poisoned",
- "paste",
- "rand 0.8.5",
- "reactive_graph",
- "rustc-hash 2.0.0",
- "send_wrapper",
- "serde",
- "serde_qs 0.13.0",
- "server_fn 0.7.0-beta5",
- "slotmap",
- "tachys",
- "thiserror",
- "throw_error",
- "typed-builder 0.19.1",
- "typed-builder-macro 0.19.1",
+ "typed-builder",
+ "typed-builder-macro",
  "wasm-bindgen",
  "web-sys",
 ]
@@ -3711,47 +3606,20 @@ dependencies = [
  "cfg-if",
  "futures",
  "http-body-util",
- "leptos 0.6.15",
- "leptos_integration_utils 0.6.15",
- "leptos_macro 0.6.15",
- "leptos_meta 0.6.15",
- "leptos_router 0.6.15",
+ "leptos",
+ "leptos_integration_utils",
+ "leptos_macro",
+ "leptos_meta",
+ "leptos_router",
  "once_cell",
  "parking_lot 0.12.3",
  "serde_json",
- "server_fn 0.6.15",
+ "server_fn",
  "tokio",
  "tokio-util",
  "tracing",
 ]
 
-[[package]]
-name = "leptos_axum"
-version = "0.7.0-beta5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1da6b4c9e2662a5b1dbc6f01b3c3ba6c4f2016b66e69f176fee41fa54c5be11b"
-dependencies = [
- "any_spawner",
- "axum",
- "dashmap 6.1.0",
- "futures",
- "http 1.1.0",
- "http-body-util",
- "hydration_context",
- "leptos 0.7.0-beta5",
- "leptos_integration_utils 0.7.0-beta5",
- "leptos_macro 0.7.0-beta5",
- "leptos_meta 0.7.0-beta5",
- "leptos_router 0.7.0-beta5",
- "once_cell",
- "parking_lot 0.12.3",
- "serde_json",
- "server_fn 0.7.0-beta5",
- "tokio",
- "tower",
- "tower-http",
-]
-
 [[package]]
 name = "leptos_config"
 version = "0.6.15"
@@ -3762,20 +3630,7 @@ dependencies = [
  "regex",
  "serde",
  "thiserror",
- "typed-builder 0.18.2",
-]
-
-[[package]]
-name = "leptos_config"
-version = "0.7.0-beta5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4cbdc8ee8cb4d4f808f0281a9c3164abeb8e2a9e647bed8761f4caf13182933"
-dependencies = [
- "config",
- "regex",
- "serde",
- "thiserror",
- "typed-builder 0.19.1",
+ "typed-builder",
 ]
 
 [[package]]
@@ -3800,7 +3655,7 @@ dependencies = [
  "rustc-hash 1.1.0",
  "serde",
  "serde_json",
- "server_fn 0.6.15",
+ "server_fn",
  "smallvec",
  "tracing",
  "wasm-bindgen",
@@ -3808,21 +3663,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "leptos_dom"
-version = "0.7.0-beta5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db28172a39d7b8f97c69ad8dbc3a2c05a244ade74f1da9bc0bd557d25914d8b1"
-dependencies = [
- "js-sys",
- "or_poisoned",
- "reactive_graph",
- "send_wrapper",
- "tachys",
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "leptos_hot_reload"
 version = "0.6.15"
@@ -3835,25 +3675,7 @@ dependencies = [
  "parking_lot 0.12.3",
  "proc-macro2",
  "quote",
- "rstml 0.11.2",
- "serde",
- "syn 2.0.77",
- "walkdir",
-]
-
-[[package]]
-name = "leptos_hot_reload"
-version = "0.7.0-beta5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39d2b962cac155477b5ee82587c50235b2e1b88b657930b9cb5b9250352a3347"
-dependencies = [
- "anyhow",
- "camino",
- "indexmap 2.5.0",
- "parking_lot 0.12.3",
- "proc-macro2",
- "quote",
- "rstml 0.12.0",
+ "rstml",
  "serde",
  "syn 2.0.77",
  "walkdir",
@@ -3866,28 +3688,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a96976631c2225ec116a7bf9c0ed5bf6999a19fed33f5e3cbcf37af44c384dc"
 dependencies = [
  "futures",
- "leptos 0.6.15",
- "leptos_config 0.6.15",
- "leptos_hot_reload 0.6.15",
- "leptos_meta 0.6.15",
+ "leptos",
+ "leptos_config",
+ "leptos_hot_reload",
+ "leptos_meta",
  "tracing",
 ]
 
-[[package]]
-name = "leptos_integration_utils"
-version = "0.7.0-beta5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "404fee3f4bdd5acc0288d0fb90b41dce815df64a44498d6dad6df495b1caf87c"
-dependencies = [
- "futures",
- "hydration_context",
- "leptos 0.7.0-beta5",
- "leptos_config 0.7.0-beta5",
- "leptos_meta 0.7.0-beta5",
- "leptos_router 0.7.0-beta5",
- "reactive_graph",
-]
-
 [[package]]
 name = "leptos_macro"
 version = "0.6.15"
@@ -3899,40 +3706,18 @@ dependencies = [
  "convert_case 0.6.0",
  "html-escape",
  "itertools 0.12.1",
- "leptos_hot_reload 0.6.15",
+ "leptos_hot_reload",
  "prettyplease",
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "rstml 0.11.2",
- "server_fn_macro 0.6.15",
+ "rstml",
+ "server_fn_macro",
  "syn 2.0.77",
  "tracing",
  "uuid",
 ]
 
-[[package]]
-name = "leptos_macro"
-version = "0.7.0-beta5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e98a32e24e3c4998d162ea71c9299e1fe0d38005b714fe30225ae613d9f0bf05"
-dependencies = [
- "attribute-derive",
- "cfg-if",
- "convert_case 0.6.0",
- "html-escape",
- "itertools 0.13.0",
- "leptos_hot_reload 0.7.0-beta5",
- "prettyplease",
- "proc-macro-error2",
- "proc-macro2",
- "quote",
- "rstml 0.12.0",
- "server_fn_macro 0.7.0-beta5",
- "syn 2.0.77",
- "uuid",
-]
-
 [[package]]
 name = "leptos_meta"
 version = "0.6.15"
@@ -3941,28 +3726,12 @@ checksum = "25acc2f63cf91932013e400a95bf6e35e5d3dbb44a7b7e25a8e3057d12005b3b"
 dependencies = [
  "cfg-if",
  "indexmap 2.5.0",
- "leptos 0.6.15",
+ "leptos",
  "tracing",
  "wasm-bindgen",
  "web-sys",
 ]
 
-[[package]]
-name = "leptos_meta"
-version = "0.7.0-beta5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773788bc79b195fd4af745d0eb59e08435bcfb5eb068ebdda018fbe1302685c7"
-dependencies = [
- "futures",
- "indexmap 2.5.0",
- "leptos 0.7.0-beta5",
- "once_cell",
- "or_poisoned",
- "send_wrapper",
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "leptos_reactive"
 version = "0.6.15"
@@ -3974,7 +3743,7 @@ dependencies = [
  "futures",
  "indexmap 2.5.0",
  "js-sys",
- "oco_ref 0.1.1",
+ "oco_ref",
  "paste",
  "pin-project",
  "rustc-hash 1.1.0",
@@ -4003,9 +3772,9 @@ dependencies = [
  "itertools 0.12.1",
  "js-sys",
  "lazy_static",
- "leptos 0.6.15",
- "leptos_integration_utils 0.6.15",
- "leptos_meta 0.6.15",
+ "leptos",
+ "leptos_integration_utils",
+ "leptos_meta",
  "linear-map",
  "lru 0.11.1",
  "once_cell",
@@ -4023,44 +3792,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "leptos_router"
-version = "0.7.0-beta5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c79346efd7b0fe1884a9a6dda3d7f92dae4bef7be9ef65c6dd80d2ba5c4fb8"
-dependencies = [
- "any_spawner",
- "either_of",
- "futures",
- "gloo-net 0.6.0",
- "js-sys",
- "leptos 0.7.0-beta5",
- "leptos_router_macro",
- "once_cell",
- "or_poisoned",
- "paste",
- "percent-encoding",
- "reactive_graph",
- "send_wrapper",
- "serde",
- "tachys",
- "thiserror",
- "url",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "leptos_router_macro"
-version = "0.7.0-beta5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cc536868a8d444ee14e763addfde2e44f94786bb71122bb0f0f5356748ee125"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
-]
-
 [[package]]
 name = "leptos_server"
 version = "0.6.15"
@@ -4069,52 +3800,14 @@ checksum = "4a97eb90a13f71500b831c7119ddd3bdd0d7ae0a6b0487cade4fddeed3b8c03f"
 dependencies = [
  "inventory",
  "lazy_static",
- "leptos_macro 0.6.15",
+ "leptos_macro",
  "leptos_reactive",
  "serde",
- "server_fn 0.6.15",
+ "server_fn",
  "thiserror",
  "tracing",
 ]
 
-[[package]]
-name = "leptos_server"
-version = "0.7.0-beta5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1250915d58d808b763aa17f3d873e0dcd1e8c72ba1f2f557c2889ff03494f23"
-dependencies = [
- "any_spawner",
- "base64 0.22.1",
- "codee",
- "futures",
- "hydration_context",
- "reactive_graph",
- "send_wrapper",
- "serde",
- "serde_json",
- "server_fn 0.7.0-beta5",
- "tachys",
-]
-
-[[package]]
-name = "leptos_stub"
-version = "0.1.0"
-dependencies = [
- "axum",
- "console_error_panic_hook",
- "http 1.1.0",
- "leptos 0.7.0-beta5",
- "leptos_axum 0.7.0-beta5",
- "leptos_meta 0.7.0-beta5",
- "leptos_router 0.7.0-beta5",
- "thiserror",
- "tokio",
- "tower",
- "tower-http",
- "tracing",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "libc"
 version = "0.2.158"
@@ -4223,7 +3916,7 @@ dependencies = [
  "cfg-if",
  "chrono",
  "console_error_panic_hook",
- "dashmap 5.5.3",
+ "dashmap",
  "derive_more",
  "futures",
  "futures-util",
@@ -4231,10 +3924,10 @@ dependencies = [
  "gloo-timers",
  "gtk",
  "http 1.1.0",
- "leptos 0.6.15",
- "leptos_axum 0.6.15",
- "leptos_meta 0.6.15",
- "leptos_router 0.6.15",
+ "leptos",
+ "leptos_axum",
+ "leptos_meta",
+ "leptos_router",
  "mime_guess",
  "once_cell",
  "pin-project-lite",
@@ -4246,7 +3939,7 @@ dependencies = [
  "rust-embed",
  "serde",
  "serde_json",
- "server_fn 0.6.15",
+ "server_fn",
  "sqlx",
  "sqlx-macros",
  "strum",
@@ -4639,12 +4332,6 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
-[[package]]
-name = "next_tuple"
-version = "0.1.0-beta5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf84e075aa6ad90a5868f864c36ba983b2ffc52d1f584899398ae248fd77b414"
-
 [[package]]
 name = "nix"
 version = "0.29.0"
@@ -5064,16 +4751,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "oco_ref"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64b94982fe39a861561cf67ff17a7849f2cedadbbad960a797634032b7abb998"
-dependencies = [
- "serde",
- "thiserror",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.19.0"
@@ -5133,12 +4810,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "or_poisoned"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c04f5d74368e4d0dfe06c45c8627c81bd7c317d52762d118fb9b3076f6420fd"
-
 [[package]]
 name = "orbclient"
 version = "0.3.47"
@@ -6078,27 +5749,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "reactive_graph"
-version = "0.1.0-beta5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a4ad833d7f44ca640ad93e7169b263ca9ecdc1a9599cdb6ca5c02e5b24656a"
-dependencies = [
- "any_spawner",
- "async-lock",
- "futures",
- "guardian",
- "hydration_context",
- "or_poisoned",
- "pin-project-lite",
- "rustc-hash 2.0.0",
- "send_wrapper",
- "serde",
- "slotmap",
- "thiserror",
- "web-sys",
-]
-
 [[package]]
 name = "read-fonts"
 version = "0.20.0"
@@ -6424,21 +6074,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "rstml"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51187e564f12336ef40cd04f6f4d805d6919188001dcf1e0a021898ea0fe28ce"
-dependencies = [
- "derive-where",
- "proc-macro2",
- "proc-macro2-diagnostics",
- "quote",
- "syn 2.0.77",
- "syn_derive",
- "thiserror",
-]
-
 [[package]]
 name = "rust-embed"
 version = "8.5.0"
@@ -6674,14 +6309,14 @@ dependencies = [
 
 [[package]]
 name = "sctk-adwaita"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7555fcb4f753d095d734fdefebb0ad8c98478a21db500492d87c55913d3b0086"
+checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec"
 dependencies = [
  "ab_glyph",
  "log",
  "memmap2",
- "smithay-client-toolkit 0.18.1",
+ "smithay-client-toolkit 0.19.2",
  "tiny-skia",
 ]
 
@@ -6909,7 +6544,7 @@ dependencies = [
  "bytes",
  "ciborium",
  "const_format",
- "dashmap 5.5.3",
+ "dashmap",
  "futures",
  "gloo-net 0.6.0",
  "http 1.1.0",
@@ -6924,7 +6559,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_qs 0.12.0",
- "server_fn_macro_default 0.6.15",
+ "server_fn_macro_default",
  "thiserror",
  "tower",
  "tower-layer",
@@ -6936,42 +6571,6 @@ dependencies = [
  "xxhash-rust",
 ]
 
-[[package]]
-name = "server_fn"
-version = "0.7.0-beta5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c6ca573753dbd6777647be6d98bfed22d0d71e205eb1126bf6bc85c42affc2f"
-dependencies = [
- "axum",
- "bytes",
- "const_format",
- "dashmap 6.1.0",
- "futures",
- "gloo-net 0.6.0",
- "http 1.1.0",
- "http-body-util",
- "hyper",
- "inventory",
- "js-sys",
- "once_cell",
- "pin-project-lite",
- "send_wrapper",
- "serde",
- "serde_json",
- "serde_qs 0.13.0",
- "server_fn_macro_default 0.7.0-beta5",
- "thiserror",
- "throw_error",
- "tower",
- "tower-layer",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-streams",
- "web-sys",
- "xxhash-rust",
-]
-
 [[package]]
 name = "server_fn_macro"
 version = "0.6.15"
@@ -6986,37 +6585,13 @@ dependencies = [
  "xxhash-rust",
 ]
 
-[[package]]
-name = "server_fn_macro"
-version = "0.7.0-beta5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63c8d47c8c8524526633b79c48e9ded61ed00670e45ebb900b22e23815888b70"
-dependencies = [
- "const_format",
- "convert_case 0.6.0",
- "proc-macro2",
- "quote",
- "syn 2.0.77",
- "xxhash-rust",
-]
-
 [[package]]
 name = "server_fn_macro_default"
 version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f2aa8119b558a17992e0ac1fd07f080099564f24532858811ce04f742542440"
 dependencies = [
- "server_fn_macro 0.6.15",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "server_fn_macro_default"
-version = "0.7.0-beta5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b2439cb2af4644cb59653db8d6e68e8d75c1cd9e82dea2d98f29f32ba5f4a0b"
-dependencies = [
- "server_fn_macro 0.7.0-beta5",
+ "server_fn_macro",
  "syn 2.0.77",
 ]
 
@@ -7861,37 +7436,6 @@ dependencies = [
  "version-compare",
 ]
 
-[[package]]
-name = "tachys"
-version = "0.1.0-beta5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd5906862cc50f3a32da67184a0259c5ee991d67d9c38e8cd87e63f8d9df142"
-dependencies = [
- "any_spawner",
- "const_str_slice_concat",
- "drain_filter_polyfill",
- "either_of",
- "futures",
- "html-escape",
- "indexmap 2.5.0",
- "itertools 0.13.0",
- "js-sys",
- "linear-map",
- "next_tuple",
- "oco_ref 0.2.0",
- "once_cell",
- "or_poisoned",
- "parking_lot 0.12.3",
- "paste",
- "reactive_graph",
- "rustc-hash 2.0.0",
- "send_wrapper",
- "slotmap",
- "throw_error",
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "tao"
 version = "0.27.1"
@@ -7905,7 +7449,7 @@ dependencies = [
  "crossbeam-channel",
  "dispatch",
  "dlopen2",
- "dpi 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dpi",
  "gdkwayland-sys",
  "gdkx11-sys",
  "gtk",
@@ -8058,15 +7602,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "throw_error"
-version = "0.2.0-beta5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4f5aa80794461408e66eacde42bdc1c0fa6a626c75601c1e909c6267750915"
-dependencies = [
- "pin-project-lite",
-]
-
 [[package]]
 name = "time"
 version = "0.3.36"
@@ -8505,16 +8040,7 @@ version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77739c880e00693faef3d65ea3aad725f196da38b22fdc7ea6ded6e1ce4d3add"
 dependencies = [
- "typed-builder-macro 0.18.2",
-]
-
-[[package]]
-name = "typed-builder"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06fbd5b8de54c5f7c91f6fe4cebb949be2125d7758e630bb58b1d831dbce600"
-dependencies = [
- "typed-builder-macro 0.19.1",
+ "typed-builder-macro",
 ]
 
 [[package]]
@@ -8528,17 +8054,6 @@ dependencies = [
  "syn 2.0.77",
 ]
 
-[[package]]
-name = "typed-builder-macro"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9534daa9fd3ed0bd911d462a37f172228077e7abf18c18a5f67199d959205f8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
-]
-
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -8989,6 +8504,19 @@ dependencies = [
  "wayland-scanner",
 ]
 
+[[package]]
+name = "wayland-protocols-plasma"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a0a41a6875e585172495f7a96dfa42ca7e0213868f4f15c313f7c33221a7eff"
+dependencies = [
+ "bitflags 2.6.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols 0.32.4",
+ "wayland-scanner",
+]
+
 [[package]]
 name = "wayland-protocols-wlr"
 version = "0.2.0"
@@ -9690,7 +9218,7 @@ dependencies = [
  "wayland-backend",
  "wayland-client",
  "wayland-protocols 0.31.2",
- "wayland-protocols-plasma",
+ "wayland-protocols-plasma 0.2.0",
  "web-sys",
  "web-time 0.2.4",
  "windows-sys 0.48.0",
@@ -9701,8 +9229,9 @@ dependencies = [
 
 [[package]]
 name = "winit"
-version = "0.30.1"
-source = "git+https://github.com/iced-rs/winit.git?rev=254d6b3420ce4e674f516f7a2bd440665e05484d#254d6b3420ce4e674f516f7a2bd440665e05484d"
+version = "0.30.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5d74280aabb958072864bff6cfbcf9025cf8bfacdde5e32b5e12920ef703b0f"
 dependencies = [
  "ahash 0.8.11",
  "android-activity 0.6.0",
@@ -9710,13 +9239,13 @@ dependencies = [
  "bitflags 2.6.0",
  "block2 0.5.1",
  "bytemuck",
- "calloop 0.12.4",
+ "calloop 0.13.0",
  "cfg_aliases 0.2.1",
  "concurrent-queue",
  "core-foundation 0.9.4",
  "core-graphics 0.23.2",
  "cursor-icon",
- "dpi 0.1.1 (git+https://github.com/iced-rs/winit.git?rev=254d6b3420ce4e674f516f7a2bd440665e05484d)",
+ "dpi",
  "js-sys",
  "libc",
  "memmap2",
@@ -9731,8 +9260,8 @@ dependencies = [
  "raw-window-handle 0.6.2",
  "redox_syscall 0.4.1",
  "rustix",
- "sctk-adwaita 0.9.1",
- "smithay-client-toolkit 0.18.1",
+ "sctk-adwaita 0.10.1",
+ "smithay-client-toolkit 0.19.2",
  "smol_str",
  "tracing",
  "unicode-segmentation",
@@ -9740,8 +9269,8 @@ dependencies = [
  "wasm-bindgen-futures",
  "wayland-backend",
  "wayland-client",
- "wayland-protocols 0.31.2",
- "wayland-protocols-plasma",
+ "wayland-protocols 0.32.4",
+ "wayland-protocols-plasma 0.3.4",
  "web-sys",
  "web-time 1.1.0",
  "windows-sys 0.52.0",
@@ -9788,7 +9317,7 @@ dependencies = [
  "cocoa",
  "core-graphics 0.23.2",
  "crossbeam-channel",
- "dpi 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dpi",
  "dunce",
  "gdkx11",
  "gtk",
diff --git a/Cargo.toml b/Cargo.toml
index 54e9c94..1a8236a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,7 +41,8 @@ version = "0.1.1"
 edition = "2021"
 
 [workspace.dependencies]
-iced = { git = "https://github.com/iced-rs/iced.git", branch = "master" }
+# iced = { git = "https://github.com/iced-rs/iced.git", branch = "master" }
+iced = { version = "0.13" }
 leptos = { version = "0.6", features = ["serde"] }
 leptos_axum = { version = "0.6" }
 leptos_meta = { version = "0.6" }