diff --git a/Cargo.lock b/Cargo.lock index 6610c4d..acd52b6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -376,7 +376,7 @@ dependencies = [ [[package]] name = "makepad-error-log" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" dependencies = [ "makepad-micro-serde", ] @@ -384,7 +384,7 @@ dependencies = [ [[package]] name = "makepad-html" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" dependencies = [ "makepad-live-id", ] @@ -392,7 +392,7 @@ dependencies = [ [[package]] name = "makepad-live-id" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" dependencies = [ "makepad-live-id-macros", ] @@ -400,7 +400,7 @@ dependencies = [ [[package]] name = "makepad-live-id-macros" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" dependencies = [ "makepad-micro-proc-macro", ] @@ -408,7 +408,7 @@ dependencies = [ [[package]] name = "makepad-math" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" dependencies = [ "makepad-micro-serde", ] @@ -416,12 +416,12 @@ dependencies = [ [[package]] name = "makepad-micro-proc-macro" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" [[package]] name = "makepad-micro-serde" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" dependencies = [ "makepad-live-id", "makepad-micro-serde-derive", @@ -430,7 +430,7 @@ dependencies = [ [[package]] name = "makepad-micro-serde-derive" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" dependencies = [ "makepad-micro-proc-macro", ] @@ -438,12 +438,12 @@ dependencies = [ [[package]] name = "makepad-regex" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" [[package]] name = "makepad-script" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" dependencies = [ "makepad-error-log", "makepad-html", @@ -458,7 +458,7 @@ dependencies = [ [[package]] name = "makepad-script-derive" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" dependencies = [ "makepad-micro-proc-macro", ] @@ -466,7 +466,7 @@ dependencies = [ [[package]] name = "makepad-stitch" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" [[package]] name = "memchr" @@ -868,7 +868,7 @@ checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" [[package]] name = "smallvec" version = "1.15.1" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" [[package]] name = "smallvec" diff --git a/crates/octoscript-capabilities/Cargo.toml b/crates/octoscript-capabilities/Cargo.toml index 31491c7..b01f59f 100644 --- a/crates/octoscript-capabilities/Cargo.toml +++ b/crates/octoscript-capabilities/Cargo.toml @@ -13,7 +13,7 @@ workspace = true blake3 = { version = "1.8.5", features = ["pure"] } getrandom = { version = "0.3.4", features = ["wasm_js"] } keyring = { version = "3.6.3", default-features = false, features = ["apple-native", "windows-native"], optional = true } -makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "030914056c10a5e33ae156567864b15f57d8679c" } +makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bb45d4115762d27f05137d1420907fa166831bd0" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.150" octoscript-core = { path = "../octoscript-core" } diff --git a/crates/octoscript-core/Cargo.toml b/crates/octoscript-core/Cargo.toml index 796a8df..114c358 100644 --- a/crates/octoscript-core/Cargo.toml +++ b/crates/octoscript-core/Cargo.toml @@ -11,5 +11,5 @@ workspace = true [dependencies] octoscript-ui-l0 = { path = "../octoscript-ui-l0" } -makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "030914056c10a5e33ae156567864b15f57d8679c" } +makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bb45d4115762d27f05137d1420907fa166831bd0" } serde_json = "1.0.150" diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index fe0218c..5711a71 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -313,7 +313,7 @@ dependencies = [ [[package]] name = "makepad-error-log" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" dependencies = [ "makepad-micro-serde", ] @@ -321,7 +321,7 @@ dependencies = [ [[package]] name = "makepad-html" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" dependencies = [ "makepad-live-id", ] @@ -329,7 +329,7 @@ dependencies = [ [[package]] name = "makepad-live-id" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" dependencies = [ "makepad-live-id-macros", ] @@ -337,7 +337,7 @@ dependencies = [ [[package]] name = "makepad-live-id-macros" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" dependencies = [ "makepad-micro-proc-macro", ] @@ -345,7 +345,7 @@ dependencies = [ [[package]] name = "makepad-math" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" dependencies = [ "makepad-micro-serde", ] @@ -353,12 +353,12 @@ dependencies = [ [[package]] name = "makepad-micro-proc-macro" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" [[package]] name = "makepad-micro-serde" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" dependencies = [ "makepad-live-id", "makepad-micro-serde-derive", @@ -367,7 +367,7 @@ dependencies = [ [[package]] name = "makepad-micro-serde-derive" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" dependencies = [ "makepad-micro-proc-macro", ] @@ -375,12 +375,12 @@ dependencies = [ [[package]] name = "makepad-regex" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" [[package]] name = "makepad-script" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" dependencies = [ "makepad-error-log", "makepad-html", @@ -395,7 +395,7 @@ dependencies = [ [[package]] name = "makepad-script-derive" version = "1.0.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" dependencies = [ "makepad-micro-proc-macro", ] @@ -403,7 +403,7 @@ dependencies = [ [[package]] name = "makepad-stitch" version = "0.1.0" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" [[package]] name = "memchr" @@ -720,7 +720,7 @@ checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" [[package]] name = "smallvec" version = "1.15.1" -source = "git+https://github.com/OctoSense-org/makepad.git?rev=030914056c10a5e33ae156567864b15f57d8679c#030914056c10a5e33ae156567864b15f57d8679c" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=bb45d4115762d27f05137d1420907fa166831bd0#bb45d4115762d27f05137d1420907fa166831bd0" [[package]] name = "subtle"