From 1d71dc36ecdb1e80b32e69af63e01b96463ae519 Mon Sep 17 00:00:00 2001 From: ymote <151983+ymote@users.noreply.github.com> Date: Fri, 9 Oct 2026 18:07:17 -0700 Subject: [PATCH 1/2] Repin makepad a772b370, Octoscript-Makepad b0960902 (14th sweep) Move native-runtime.lock.json from Octoscript-Makepad 33dea2f1 to b0960902 (Octoscript-Makepad #82), whose runtime.json pins makepad main a772b370 and Octoscript 2e37d9e6 (unchanged, so octoscript-core in the arkui and webview crates keeps its rev). The runtime-lock lines in both READMEs name the new revisions. Co-Authored-By: Claude Opus 5.5 --- README.md | 4 ++-- README.zh-CN.md | 2 +- native-runtime.lock.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6fc277a..4abeefb 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 `33dea2f1`, a commit on its `main` -(makepad `32d6415f`, Octoscript `2e37d9e6`: the same framework sources as the +Cargo revs now select Octoscript-Makepad `b0960902`, a commit on its `main` +(makepad `a772b370`, 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 9bd17aa..bdd9a95 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 `33dea2f1`，它在该仓库的 `main` 上（makepad `32d6415f`、Octoscript `2e37d9e6`， +Octoscript-Makepad `b0960902`，它在该仓库的 `main` 上（makepad `a772b370`、Octoscript `2e37d9e6`， 与其他 OctoSense 使用方的框架源码相同）。之前锁定的 `b1596d9c` 是 main 上 `f4acc6c` 在历史重写之前的哈希，迁移没有丢失任何内容。 diff --git a/native-runtime.lock.json b/native-runtime.lock.json index 9f35c44..ffe469c 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": "33dea2f1f3ad3f1346a219aa8cf6e91b31361e23" + "revision": "b0960902e771beba3fe537c07b26dae8cface619" } From 6d714bd398a379c6e588e0db2f17cd2a70675583 Mon Sep 17 00:00:00 2001 From: ymote <151983+ymote@users.noreply.github.com> Date: Fri, 9 Oct 2026 19:28:25 -0700 Subject: [PATCH 2/2] Repin makepad d653bc44, Octoscript-Makepad 6cf2d90a (14th sweep, round two) Move native-runtime.lock.json from Octoscript-Makepad b0960902 to 6cf2d90a (Octoscript-Makepad #83), whose runtime.json pins makepad main d653bc44 and Octoscript 2e37d9e6 (unchanged, so octoscript-core in the arkui and webview crates keeps its rev). The runtime-lock lines in both READMEs name the new revisions. Co-Authored-By: Claude Opus 5.5 --- README.md | 4 ++-- README.zh-CN.md | 2 +- native-runtime.lock.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4abeefb..5b44b9b 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 `b0960902`, a commit on its `main` -(makepad `a772b370`, Octoscript `2e37d9e6`: the same framework sources as the +Cargo revs now select Octoscript-Makepad `6cf2d90a`, a commit on its `main` +(makepad `d653bc44`, 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 bdd9a95..4056d83 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 `b0960902`，它在该仓库的 `main` 上（makepad `a772b370`、Octoscript `2e37d9e6`， +Octoscript-Makepad `6cf2d90a`，它在该仓库的 `main` 上（makepad `d653bc44`、Octoscript `2e37d9e6`， 与其他 OctoSense 使用方的框架源码相同）。之前锁定的 `b1596d9c` 是 main 上 `f4acc6c` 在历史重写之前的哈希，迁移没有丢失任何内容。 diff --git a/native-runtime.lock.json b/native-runtime.lock.json index ffe469c..ef21c6e 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": "b0960902e771beba3fe537c07b26dae8cface619" + "revision": "6cf2d90aa33ff4ae603f49c7557f3ecf986207f0" }