diff --git a/README.md b/README.md index 5b1b850..d249016 100644 --- a/README.md +++ b/README.md @@ -20,11 +20,11 @@ Use `python3 tools/setup-native.py --check --cargo-manifest catalog/rust/Cargo.t to check the local dependency graph. Existing platform rendering backends remain part of their applications; the framework controls the shared VM and UI sources. -**Known gap:** the lock (and the matching Cargo revs) currently select -Octoscript-Makepad `b1596d9c`, which is not on its `main`; the other OctoSense -consumers are on `463e3da8` (makepad `cd812acd`). Until [#4](https://github.com/OctoSense-org/OctoScript-Android/issues/4) -is fixed, prepare this repository in its own workspace rather than beside an -OctoScript-App-Design-Flow checkout. +**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 `297ff0bb`, a commit on its `main` +(makepad `cd812acd`, Octoscript `68f6a9df`: 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. Octoscript DSL rendered to **native Android widgets** from Rust — the Android peer of diff --git a/README.zh-CN.md b/README.zh-CN.md index d60e869..7263617 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -17,10 +17,10 @@ OctoSense 外壳、App Hub 的 `card-host`、Mail 以及其他 OctoSense 应用 用 `python3 tools/setup-native.py --check --cargo-manifest catalog/rust/Cargo.toml` 检查本地依赖图。现有的各平台渲染后端仍然属于各自的应用;框架负责的是共享的 VM 和 UI 源码。 -**已知差异:** 目前锁文件(以及对应的 Cargo 版本)选定的是 Octoscript-Makepad `b1596d9c`, -它不在该仓库的 `main` 上;其他 OctoSense 使用方都在 `463e3da8`(makepad `cd812acd`)。 -在 [#4](https://github.com/OctoSense-org/OctoScript-Android/issues/4) 修复之前,请把本仓库放在单独的工作区里准备,不要和 -OctoScript-App-Design-Flow 的 checkout 放在一起。 +**运行时锁定([#4](https://github.com/OctoSense-org/OctoScript-Android/issues/4) 已于 2026-09-26 修复):** 锁文件和对应的 Cargo 版本现在选定 +Octoscript-Makepad `297ff0bb`,它在该仓库的 `main` 上(makepad `cd812acd`、Octoscript `68f6a9df`, +与其他 OctoSense 使用方的框架源码相同)。之前锁定的 `b1596d9c` 是 main 上 `f4acc6c` +在历史重写之前的哈希,迁移没有丢失任何内容。 用 Rust 把 Octoscript DSL 渲染成 **Android 原生控件**——它是 diff --git a/catalog/rust/Cargo.toml b/catalog/rust/Cargo.toml index d71dd50..08db9f9 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 = "b1596d9c2cee6e80cca9d27b1b0c2d57b9d28dd8" } +octoscript-render = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "297ff0bb230d8715f95827939e7f120121c65e49" } 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 095afdc..ed0d651 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": "b1596d9c2cee6e80cca9d27b1b0c2d57b9d28dd8" + "revision": "297ff0bb230d8715f95827939e7f120121c65e49" } diff --git a/probe/rust/Cargo.toml b/probe/rust/Cargo.toml index 7e68d85..0f51347 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 = "b1596d9c2cee6e80cca9d27b1b0c2d57b9d28dd8" } +octoscript-render = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "297ff0bb230d8715f95827939e7f120121c65e49" } jni = "0.21" [profile.release]