notedeck

commit 1c16ddf9afccdf3646e9ab06507c140f01f7ed40
parent 40fd85da58170f43684cc949a1066eee80047b6c
Author: William Casarin <jb55@jb55.com>
Date:   Fri, 16 Feb 2024 17:14:11 -0800

deps: update poll-promise, add hex

Signed-off-by: William Casarin <jb55@jb55.com>

Diffstat:
M
Cargo.lock
 | 
33
+++++++++++++++++----------------
M
Cargo.toml
 | 
8
+++++---

2 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -292,6 +292,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "base32"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa"
+
+[[package]]
 name = "base64"
 version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -838,7 +844,6 @@ dependencies = [
  "objc",
  "parking_lot",
  "percent-encoding",
- "pollster",
  "puffin",
  "raw-window-handle 0.5.2",
  "raw-window-handle 0.6.0",
@@ -848,7 +853,6 @@ dependencies = [
  "wasm-bindgen-futures",
  "web-sys",
  "web-time",
- "wgpu",
  "winapi",
  "winit",
 ]
@@ -1361,9 +1365,9 @@ dependencies = [
 
 [[package]]
 name = "gif"
-version = "0.12.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045"
+checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2"
 dependencies = [
  "color_quant",
  "weezl",
@@ -1629,9 +1633,9 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.24.8"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23"
+checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
 dependencies = [
  "bytemuck",
  "byteorder",
@@ -2071,6 +2075,7 @@ version = "0.1.0"
 dependencies = [
  "android-activity 0.4.3",
  "android_logger",
+ "base32",
  "console_error_panic_hook",
  "eframe",
  "egui",
@@ -2078,6 +2083,7 @@ dependencies = [
  "ehttp 0.2.0",
  "enostr",
  "env_logger 0.10.2",
+ "hex",
  "image",
  "log",
  "nostrdb",
@@ -2367,10 +2373,13 @@ dependencies = [
 
 [[package]]
 name = "poll-promise"
-version = "0.2.0"
-source = "git+https://github.com/EmbarkStudios/poll-promise?rev=b493586107b0e508860aa2e9d18049fd8cd9d13f#b493586107b0e508860aa2e9d18049fd8cd9d13f"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f6a58fecbf9da8965bcdb20ce4fd29788d1acee68ddbb64f0ba1b81bccdb7df"
 dependencies = [
+ "document-features",
  "static_assertions",
+ "tokio",
 ]
 
 [[package]]
@@ -2388,12 +2397,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "pollster"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2"
-
-[[package]]
 name = "powerfmt"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3808,7 +3811,6 @@ dependencies = [
  "cfg_aliases",
  "js-sys",
  "log",
- "naga",
  "parking_lot",
  "profiling",
  "raw-window-handle 0.6.0",
@@ -3858,7 +3860,6 @@ dependencies = [
  "arrayvec",
  "ash",
  "bitflags 2.4.2",
- "block",
  "cfg_aliases",
  "core-graphics-types",
  "glow",
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,13 +13,13 @@ crate-type = ["lib", "cdylib"]
 [dependencies]
 #egui-android = { git = "https://github.com/jb55/egui-android.git" }  
 egui = "0.26.0"
-eframe = { version = "0.26.0", default-features = false, features = [ "glow", "wgpu", "android-native-activity" ] }
+eframe = { version = "0.26.0", default-features = false, features = [ "glow", "wpgu", "android-native-activity" ] }
 #eframe = "0.22.0"
 egui_extras = { version = "0.26.0", features = ["all_loaders"] }
 ehttp = "0.2.0"
 image = { version = "0.24", features = ["jpeg", "png", "webp"] }
 log = "0.4.17"
-poll-promise = { git = "https://github.com/EmbarkStudios/poll-promise", rev = "b493586107b0e508860aa2e9d18049fd8cd9d13f" } # todo: update to 0.2.1 when it's released. 0.2.0 was crashing on m1
+poll-promise = { version = "0.3.0", features = ["tokio"] }
 serde_derive = "1"
 serde = { version = "1", features = ["derive"] } # You only need this if you want app persistence
 tracing = "0.1.40"
@@ -30,6 +30,8 @@ env_logger = "0.10.0"
 puffin_egui = { version = "0.26.0", optional = true }
 puffin = { version = "0.19.0", optional = true }
 nostrdb = { git = "https://github.com/damus-io/nostrdb-rs", rev = "750539d0b71ed81ec626e4670eccf34950ad2942" }
+hex = "0.4.3"
+base32 = "0.4.0"
 
 [features]
 default = []
@@ -51,7 +53,7 @@ wasm-bindgen-futures = "0.4"
 
 # native:
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-tokio = { version = "1.16", features = ["macros", "rt-multi-thread"] }
+tokio = { version = "1.16", features = ["macros", "rt-multi-thread", "fs"] }
 tracing-subscriber = "0.3"