diff --git a/Cargo.lock b/Cargo.lock index 3e09e424..a52dcf1c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5,7 +5,7 @@ version = 4 [[package]] name = "ab_glyph_rasterizer" version = "0.1.8" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "accessory" @@ -610,7 +610,7 @@ dependencies = [ [[package]] name = "bitflags" version = "2.10.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "bitmaps" @@ -728,7 +728,7 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "bytemuck" version = "1.25.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "byteorder" @@ -739,7 +739,7 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "byteorder" version = "1.5.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "bytes" @@ -1954,9 +1954,9 @@ dependencies = [ [[package]] name = "fxhash" version = "0.2.1" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ - "byteorder 1.5.0 (git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion)", + "byteorder 1.5.0 (git+https://github.com/makepad/makepad?branch=dev)", ] [[package]] @@ -2950,7 +2950,7 @@ dependencies = [ [[package]] name = "makepad-apple-sys" version = "1.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "makepad-objc-sys", ] @@ -2958,12 +2958,12 @@ dependencies = [ [[package]] name = "makepad-byteorder-lite" version = "0.1.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "makepad-code-editor" version = "2.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "makepad-widgets", ] @@ -2971,7 +2971,7 @@ dependencies = [ [[package]] name = "makepad-derive-wasm-bridge" version = "1.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "makepad-micro-proc-macro", ] @@ -2979,7 +2979,7 @@ dependencies = [ [[package]] name = "makepad-derive-widget" version = "2.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "makepad-live-id", "makepad-micro-proc-macro", @@ -2988,7 +2988,7 @@ dependencies = [ [[package]] name = "makepad-draw" version = "2.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "ab_glyph_rasterizer", "fxhash", @@ -3003,15 +3003,15 @@ dependencies = [ "rustybuzz", "sdfer", "serde", - "unicode-bidi 0.3.18 (git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion)", + "unicode-bidi 0.3.18 (git+https://github.com/makepad/makepad?branch=dev)", "unicode-linebreak", - "unicode-segmentation 1.12.0 (git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion)", + "unicode-segmentation 1.12.0 (git+https://github.com/makepad/makepad?branch=dev)", ] [[package]] name = "makepad-error-log" version = "1.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "makepad-micro-serde", ] @@ -3019,22 +3019,22 @@ dependencies = [ [[package]] name = "makepad-filesystem-watcher" version = "0.1.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "makepad-futures" version = "1.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "makepad-futures-legacy" version = "1.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "makepad-gif" version = "0.1.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "weezl", ] @@ -3042,7 +3042,7 @@ dependencies = [ [[package]] name = "makepad-html" version = "1.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "makepad-live-id", ] @@ -3056,7 +3056,7 @@ checksum = "9775cbec5fa0647500c3e5de7c850280a88335d1d2d770e5aa2332b801ba7064" [[package]] name = "makepad-latex-math" version = "0.1.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "ttf-parser", ] @@ -3064,7 +3064,7 @@ dependencies = [ [[package]] name = "makepad-live-id" version = "1.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "makepad-live-id-macros", "serde", @@ -3073,7 +3073,7 @@ dependencies = [ [[package]] name = "makepad-live-id-macros" version = "1.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "makepad-micro-proc-macro", ] @@ -3081,7 +3081,7 @@ dependencies = [ [[package]] name = "makepad-live-reload-core" version = "0.1.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "makepad-filesystem-watcher", ] @@ -3089,7 +3089,7 @@ dependencies = [ [[package]] name = "makepad-math" version = "1.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "makepad-micro-serde", ] @@ -3097,12 +3097,12 @@ dependencies = [ [[package]] name = "makepad-micro-proc-macro" version = "1.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "makepad-micro-serde" version = "1.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "makepad-live-id", "makepad-micro-serde-derive", @@ -3111,7 +3111,7 @@ dependencies = [ [[package]] name = "makepad-micro-serde-derive" version = "1.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "makepad-micro-proc-macro", ] @@ -3119,7 +3119,7 @@ dependencies = [ [[package]] name = "makepad-network" version = "1.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "makepad-apple-sys", "makepad-error-log", @@ -3133,15 +3133,15 @@ dependencies = [ [[package]] name = "makepad-objc-sys" version = "1.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "makepad-platform" version = "2.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "ash", - "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion)", + "bitflags 2.10.0 (git+https://github.com/makepad/makepad?branch=dev)", "ctrlc", "hilog-sys", "makepad-android-state", @@ -3163,7 +3163,7 @@ dependencies = [ "napi-derive-ohos", "napi-ohos", "ohos-sys", - "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion)", + "smallvec 1.15.1 (git+https://github.com/makepad/makepad?branch=dev)", "wayland-client", "wayland-egl", "wayland-protocols", @@ -3175,12 +3175,12 @@ dependencies = [ [[package]] name = "makepad-regex" version = "0.1.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "makepad-script" version = "1.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "makepad-error-log", "makepad-html", @@ -3188,13 +3188,13 @@ dependencies = [ "makepad-math", "makepad-regex", "makepad-script-derive", - "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion)", + "smallvec 1.15.1 (git+https://github.com/makepad/makepad?branch=dev)", ] [[package]] name = "makepad-script-derive" version = "1.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "makepad-micro-proc-macro", ] @@ -3202,7 +3202,7 @@ dependencies = [ [[package]] name = "makepad-script-std" version = "1.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "makepad-network", "makepad-script", @@ -3211,14 +3211,14 @@ dependencies = [ [[package]] name = "makepad-shared-bytes" version = "1.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "makepad-studio-protocol" version = "0.1.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ - "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion)", + "bitflags 2.10.0 (git+https://github.com/makepad/makepad?branch=dev)", "makepad-error-log", "makepad-live-id", "makepad-micro-serde", @@ -3228,7 +3228,7 @@ dependencies = [ [[package]] name = "makepad-svg" version = "1.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "makepad-html", "makepad-live-id", @@ -3237,7 +3237,7 @@ dependencies = [ [[package]] name = "makepad-tsdf" version = "0.1.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "makepad-math", "makepad-micro-serde", @@ -3246,7 +3246,7 @@ dependencies = [ [[package]] name = "makepad-wasm-bridge" version = "1.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "makepad-derive-wasm-bridge", "makepad-live-id", @@ -3255,7 +3255,7 @@ dependencies = [ [[package]] name = "makepad-webp" version = "0.2.4" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "makepad-byteorder-lite", ] @@ -3263,7 +3263,7 @@ dependencies = [ [[package]] name = "makepad-widgets" version = "2.0.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "makepad-derive-widget", "makepad-draw", @@ -3272,18 +3272,18 @@ dependencies = [ "pulldown-cmark 0.12.2", "serde", "ttf-parser", - "unicode-segmentation 1.12.0 (git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion)", + "unicode-segmentation 1.12.0 (git+https://github.com/makepad/makepad?branch=dev)", ] [[package]] name = "makepad-zune-core" version = "0.5.1" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "makepad-zune-inflate" version = "0.2.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "simd-adler32", ] @@ -3291,7 +3291,7 @@ dependencies = [ [[package]] name = "makepad-zune-jpeg" version = "0.5.12" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "makepad-zune-core", ] @@ -3299,7 +3299,7 @@ dependencies = [ [[package]] name = "makepad-zune-png" version = "0.5.1" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "makepad-zune-core", "makepad-zune-inflate", @@ -3686,7 +3686,7 @@ checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "memchr" version = "2.7.6" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "mime" @@ -4439,10 +4439,10 @@ dependencies = [ [[package]] name = "pulldown-cmark" version = "0.12.2" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ - "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion)", - "memchr 2.7.6 (git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion)", + "bitflags 2.10.0 (git+https://github.com/makepad/makepad?branch=dev)", + "memchr 2.7.6 (git+https://github.com/makepad/makepad?branch=dev)", "unicase 2.9.0", ] @@ -5267,12 +5267,12 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "rustybuzz" version = "0.18.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ - "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion)", + "bitflags 2.10.0 (git+https://github.com/makepad/makepad?branch=dev)", "bytemuck", "makepad-error-log", - "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion)", + "smallvec 1.15.1 (git+https://github.com/makepad/makepad?branch=dev)", "ttf-parser", "unicode-bidi-mirroring", "unicode-ccc", @@ -5367,7 +5367,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sdfer" version = "0.2.1" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "sealed" @@ -5666,7 +5666,7 @@ dependencies = [ [[package]] name = "simd-adler32" version = "0.3.8" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "siphasher" @@ -5692,7 +5692,7 @@ dependencies = [ [[package]] name = "smallvec" version = "1.15.1" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "socket2" @@ -6473,7 +6473,7 @@ dependencies = [ [[package]] name = "ttf-parser" version = "0.24.1" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "tungstenite" @@ -6525,7 +6525,7 @@ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" [[package]] name = "unicase" version = "2.9.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "unicode-bidi" @@ -6536,17 +6536,17 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" [[package]] name = "unicode-bidi" version = "0.3.18" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "unicode-bidi-mirroring" version = "0.3.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "unicode-ccc" version = "0.3.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "unicode-ident" @@ -6557,7 +6557,7 @@ checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d" [[package]] name = "unicode-linebreak" version = "0.1.5" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "unicode-normalization" @@ -6577,12 +6577,12 @@ checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" [[package]] name = "unicode-properties" version = "0.1.4" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "unicode-script" version = "0.5.8" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "unicode-segmentation" @@ -6593,7 +6593,7 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-segmentation" version = "1.12.0" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "unicode-width" @@ -6925,7 +6925,7 @@ dependencies = [ [[package]] name = "wayland-backend" version = "0.3.12" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "downcast-rs", "libc", @@ -6937,7 +6937,7 @@ dependencies = [ [[package]] name = "wayland-client" version = "0.31.12" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "bitflags 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc", @@ -6947,7 +6947,7 @@ dependencies = [ [[package]] name = "wayland-egl" version = "0.32.9" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "wayland-backend", "wayland-sys", @@ -6956,7 +6956,7 @@ dependencies = [ [[package]] name = "wayland-protocols" version = "0.32.10" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "bitflags 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-backend", @@ -6966,7 +6966,7 @@ dependencies = [ [[package]] name = "wayland-sys" version = "0.31.8" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "log", "pkg-config", @@ -7026,7 +7026,7 @@ dependencies = [ [[package]] name = "weezl" version = "0.1.12" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "whoami" @@ -7079,7 +7079,7 @@ dependencies = [ [[package]] name = "windows" version = "0.62.2" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "windows-collections 0.3.2", "windows-core 0.62.2", @@ -7098,7 +7098,7 @@ dependencies = [ [[package]] name = "windows-collections" version = "0.3.2" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "windows-core 0.62.2", ] @@ -7131,7 +7131,7 @@ dependencies = [ [[package]] name = "windows-core" version = "0.62.2" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "windows-link 0.2.1", "windows-result 0.4.1", @@ -7152,7 +7152,7 @@ dependencies = [ [[package]] name = "windows-future" version = "0.3.2" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "windows-core 0.62.2", ] @@ -7216,7 +7216,7 @@ checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" [[package]] name = "windows-link" version = "0.2.1" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" [[package]] name = "windows-numerics" @@ -7260,7 +7260,7 @@ dependencies = [ [[package]] name = "windows-result" version = "0.4.1" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "windows-link 0.2.1", ] @@ -7277,7 +7277,7 @@ dependencies = [ [[package]] name = "windows-strings" version = "0.5.1" -source = "git+https://github.com/kevinaboos/makepad?branch=dedup_ios_ime_conversion#f50b89db140cf75d7aec1da75d337689419f757b" +source = "git+https://github.com/makepad/makepad?branch=dev#6d1e9d324ca4af7daf4fca42f359efd498960d7a" dependencies = [ "windows-link 0.2.1", ] diff --git a/Cargo.toml b/Cargo.toml index 5ccf1998..298df42e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,11 +14,8 @@ version = "1.0.0-alpha.1" metadata.makepad-auto-version = "zqpv-Yj-K7WNVK2I8h5Okhho46Q=" [dependencies] -# makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "dev", features = ["serde"] } -# makepad-code-editor = { git = "https://github.com/makepad/makepad", branch = "dev" } - -makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "dedup_ios_ime_conversion", features = ["serde"] } -makepad-code-editor = { git = "https://github.com/kevinaboos/makepad", branch = "dedup_ios_ime_conversion" } +makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "dev", features = ["serde"] } +makepad-code-editor = { git = "https://github.com/makepad/makepad", branch = "dev" } ## Including this crate automatically configures all `robius-*` crates to work with Makepad.