From 3ada150a069a1ea46790a5a8d8bea769724c9d4d Mon Sep 17 00:00:00 2001 From: ymote <151983+ymote@users.noreply.github.com> Date: Wed, 30 Sep 2026 01:54:28 -0700 Subject: [PATCH] Repin the runtime to Octoscript-Makepad cb66de07 (makepad 1f3b1ded, Octoscript dbd48cfb) The org-wide release after makepad #58, #70, #71 and #72 (Octoscript-Makepad #65); the Octoscript pin moves to dbd48cfb with it. Co-Authored-By: Claude Opus 5.5 --- Cargo.lock | 1 + README.md | 4 ++-- README.zh-CN.md | 2 +- crates/octoscript-oh-arkui/Cargo.toml | 2 +- crates/octoscript-oh-webview/Cargo.toml | 2 +- native-runtime.lock.json | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 971ed86..1a1410a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -358,6 +358,7 @@ name = "octoscript-ui-l0" version = "0.1.0" dependencies = [ "blake3", + "serde", "serde_json", ] diff --git a/README.md b/README.md index 17619fd..d8a9967 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ to check the local dependency graph. Existing platform rendering backends remain part of their applications; the framework controls the shared VM and UI sources. **Runtime lock (fixed [#67](https://github.com/OctoSense-org/OctoScript-OH/issues/67), 2026-09-26):** the lock and the matching -Cargo revs now select Octoscript-Makepad `515acb49`, a commit on its `main` -(makepad `a5a3cf5b`, Octoscript `68f6a9df`: the same framework sources as the +Cargo revs now select Octoscript-Makepad `cb66de07`, a commit on its `main` +(makepad `1f3b1ded`, Octoscript `dbd48cfb`: the same framework sources as the other OctoSense consumers). The previous pin, `b1596d9c`, was the pre-history-rewrite hash of main's `f4acc6c`; nothing was lost in the move. diff --git a/README.zh-CN.md b/README.zh-CN.md index ee37d19..a0d17f5 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -18,7 +18,7 @@ OctoSense 外壳、App Hub 的 `card-host`、Mail 以及其他 OctoSense 应用 检查本地依赖图。现有的各平台渲染后端仍然属于各自的应用;框架负责的是共享的 VM 和 UI 源码。 **运行时锁定([#67](https://github.com/OctoSense-org/OctoScript-OH/issues/67) 已于 2026-09-26 修复):** 锁文件和对应的 Cargo 版本现在选定 -Octoscript-Makepad `515acb49`,它在该仓库的 `main` 上(makepad `a5a3cf5b`、Octoscript `68f6a9df`, +Octoscript-Makepad `cb66de07`,它在该仓库的 `main` 上(makepad `1f3b1ded`、Octoscript `dbd48cfb`, 与其他 OctoSense 使用方的框架源码相同)。之前锁定的 `b1596d9c` 是 main 上 `f4acc6c` 在历史重写之前的哈希,迁移没有丢失任何内容。 diff --git a/crates/octoscript-oh-arkui/Cargo.toml b/crates/octoscript-oh-arkui/Cargo.toml index cce8520..dfdde9b 100644 --- a/crates/octoscript-oh-arkui/Cargo.toml +++ b/crates/octoscript-oh-arkui/Cargo.toml @@ -14,7 +14,7 @@ crate-type = ["rlib"] [dependencies] # The Octoscript VM, via ymote/Octoscript rather than straight from makepad. -octoscript-core = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "68f6a9df55692b5d8ef8873a12721e279a3f40d6" } +octoscript-core = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "dbd48cfb799551c11e30970c393777d29644a605" } serde_json = "1.0.151" [build-dependencies] diff --git a/crates/octoscript-oh-webview/Cargo.toml b/crates/octoscript-oh-webview/Cargo.toml index e28f1a5..cad21c4 100644 --- a/crates/octoscript-oh-webview/Cargo.toml +++ b/crates/octoscript-oh-webview/Cargo.toml @@ -29,7 +29,7 @@ octoscript-oh-core = { path = "../octoscript-oh-core" } # not in octoscript-oh-core -- see the module docs there. octoscript-oh-plugin-demo = { path = "../octoscript-oh-plugin-demo" } # The Octoscript VM, via ymote/Octoscript rather than straight from makepad. -octoscript-core = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "68f6a9df55692b5d8ef8873a12721e279a3f40d6" } +octoscript-core = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "dbd48cfb799551c11e30970c393777d29644a605" } napi-derive-ohos = "0.0.9" napi-ohos = "0.1.3" serde = { version = "1", features = ["derive"] } diff --git a/native-runtime.lock.json b/native-runtime.lock.json index 2f1f900..be5bbb0 100644 --- a/native-runtime.lock.json +++ b/native-runtime.lock.json @@ -1,5 +1,5 @@ { "schema_version": 1, "url": "https://github.com/OctoSense-org/Octoscript-Makepad.git", - "revision": "515acb4924ab441824b4006dd031d3508cd78adf" + "revision": "cb66de073469063abeb2a5ab2a2bbf3cdb365745" }