diff --git a/README.md b/README.md index 842a90b..f8b99af 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 `2cc5ef37`, a commit on its `main` -(makepad `c155f61d`, Octoscript `5991dfae`: the same framework sources as the +Cargo revs now select Octoscript-Makepad `aa80f72c`, a commit on its `main` +(makepad `68d1f4ec`, Octoscript `2e37d9e6`: 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 9bb9e11..a4feb44 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 `2cc5ef37`,它在该仓库的 `main` 上(makepad `c155f61d`、Octoscript `5991dfae`, +Octoscript-Makepad `aa80f72c`,它在该仓库的 `main` 上(makepad `68d1f4ec`、Octoscript `2e37d9e6`, 与其他 OctoSense 使用方的框架源码相同)。之前锁定的 `b1596d9c` 是 main 上 `f4acc6c` 在历史重写之前的哈希,迁移没有丢失任何内容。 diff --git a/crates/octoscript-oh-arkui/Cargo.toml b/crates/octoscript-oh-arkui/Cargo.toml index 6cc29c2..4149af4 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 = "5991dfae9344589e732b2605b530f788e8bbcd11" } +octoscript-core = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "2e37d9e657a246f16718d9a475e167ccd2d5b5fa" } serde_json = "1.0.151" [build-dependencies] diff --git a/crates/octoscript-oh-webview/Cargo.toml b/crates/octoscript-oh-webview/Cargo.toml index 32aaf95..96c0680 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 = "5991dfae9344589e732b2605b530f788e8bbcd11" } +octoscript-core = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "2e37d9e657a246f16718d9a475e167ccd2d5b5fa" } 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 e3ad8e4..0b32d23 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": "2cc5ef37d7d6a3d2992673389ce74488f7bb2d87" + "revision": "aa80f72c509c767faf04822b939d44b2f34fbc81" }