From 3ef7563e007b6f57f954889268f6e8c5d754a6d6 Mon Sep 17 00:00:00 2001 From: ymote <151983+ymote@users.noreply.github.com> Date: Wed, 7 Oct 2026 17:29:04 -0700 Subject: [PATCH] Pin makepad 32d6415f / OSM 33dea2f1 (13th sweep) Move the runtime lock and the matching Cargo revs from Octoscript-Makepad aa80f72c to 33dea2f1 (OSM #80), whose runtime.json pins makepad main 32d6415f (compute kernel JIT + script fixes) and Octoscript 2e37d9e6 (unchanged): native-runtime.lock.json, octoscript-render in catalog/rust/Cargo.toml and probe/rust/Cargo.toml, and the runtime-lock lines in both READMEs. Both Cargo.lock files are unchanged. Co-Authored-By: Claude Fable 5 --- README.md | 4 ++-- README.zh-CN.md | 2 +- catalog/rust/Cargo.toml | 2 +- native-runtime.lock.json | 2 +- probe/rust/Cargo.toml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 85b43fa..4c9d625 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 [#4](https://github.com/OctoSense-org/OctoScript-Android/issues/4), 2026-09-26):** the lock and the matching -Cargo revs now select Octoscript-Makepad `aa80f72c`, a commit on its `main` -(makepad `68d1f4ec`, Octoscript `2e37d9e6`: the same framework sources as the +Cargo revs now select Octoscript-Makepad `33dea2f1`, a commit on its `main` +(makepad `32d6415f`, 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 b18b588..9ffc8e5 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -18,7 +18,7 @@ OctoSense 外壳、App Hub 的 `card-host`、Mail 以及其他 OctoSense 应用 检查本地依赖图。现有的各平台渲染后端仍然属于各自的应用;框架负责的是共享的 VM 和 UI 源码。 **运行时锁定([#4](https://github.com/OctoSense-org/OctoScript-Android/issues/4) 已于 2026-09-26 修复):** 锁文件和对应的 Cargo 版本现在选定 -Octoscript-Makepad `aa80f72c`,它在该仓库的 `main` 上(makepad `68d1f4ec`、Octoscript `2e37d9e6`, +Octoscript-Makepad `33dea2f1`,它在该仓库的 `main` 上(makepad `32d6415f`、Octoscript `2e37d9e6`, 与其他 OctoSense 使用方的框架源码相同)。之前锁定的 `b1596d9c` 是 main 上 `f4acc6c` 在历史重写之前的哈希,迁移没有丢失任何内容。 diff --git a/catalog/rust/Cargo.toml b/catalog/rust/Cargo.toml index a6d1064..692b270 100644 --- a/catalog/rust/Cargo.toml +++ b/catalog/rust/Cargo.toml @@ -9,7 +9,7 @@ name = "octoscript_catalog" crate-type = ["cdylib", "rlib"] [dependencies] -octoscript-render = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "aa80f72c509c767faf04822b939d44b2f34fbc81" } +octoscript-render = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "33dea2f1f3ad3f1346a219aa8cf6e91b31361e23" } jni = "0.21" serde_json = "1.0.151" ureq = { version = "2", features = ["tls"] } diff --git a/native-runtime.lock.json b/native-runtime.lock.json index 0b32d23..9f35c44 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": "aa80f72c509c767faf04822b939d44b2f34fbc81" + "revision": "33dea2f1f3ad3f1346a219aa8cf6e91b31361e23" } diff --git a/probe/rust/Cargo.toml b/probe/rust/Cargo.toml index 342b881..dd1a43b 100644 --- a/probe/rust/Cargo.toml +++ b/probe/rust/Cargo.toml @@ -11,7 +11,7 @@ crate-type = ["cdylib"] # The real thing: the backend-agnostic Octoscript renderer core. Depends only on # makepad-script (the VM). No makepad-platform / draw / widgets anywhere. [dependencies] -octoscript-render = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "aa80f72c509c767faf04822b939d44b2f34fbc81" } +octoscript-render = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "33dea2f1f3ad3f1346a219aa8cf6e91b31361e23" } jni = "0.21" [profile.release]