Skip to content

Commit 9505da6

Browse files
authored
Merge pull request #21 from OctoSense-org/chore/runtime-makepad-68d1f4ec
Repin makepad to main 68d1f4ec
2 parents 228b11b + 631b00f commit 9505da6

5 files changed

Lines changed: 6 additions & 6 deletions

File tree

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ to check the local dependency graph. Existing platform rendering backends remain
2121
part of their applications; the framework controls the shared VM and UI sources.
2222

2323
**Runtime lock (fixed [#4](https://github.com/OctoSense-org/OctoScript-Android/issues/4), 2026-09-26):** the lock and the matching
24-
Cargo revs now select Octoscript-Makepad `2cc5ef37`, a commit on its `main`
25-
(makepad `c155f61d`, Octoscript `5991dfae`: the same framework sources as the
24+
Cargo revs now select Octoscript-Makepad `aa80f72c`, a commit on its `main`
25+
(makepad `68d1f4ec`, Octoscript `2e37d9e6`: the same framework sources as the
2626
other OctoSense consumers). The previous pin, `b1596d9c`, was the pre-history-rewrite
2727
hash of main's `f4acc6c`; nothing was lost in the move.
2828

‎README.zh-CN.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ OctoSense 外壳、App Hub 的 `card-host`、Mail 以及其他 OctoSense 应用
1818
检查本地依赖图。现有的各平台渲染后端仍然属于各自的应用;框架负责的是共享的 VM 和 UI 源码。
1919

2020
**运行时锁定([#4](https://github.com/OctoSense-org/OctoScript-Android/issues/4) 已于 2026-09-26 修复):** 锁文件和对应的 Cargo 版本现在选定
21-
Octoscript-Makepad `2cc5ef37`,它在该仓库的 `main` 上(makepad `c155f61d`、Octoscript `5991dfae`,
21+
Octoscript-Makepad `aa80f72c`,它在该仓库的 `main` 上(makepad `68d1f4ec`、Octoscript `2e37d9e6`,
2222
与其他 OctoSense 使用方的框架源码相同)。之前锁定的 `b1596d9c` 是 main 上 `f4acc6c`
2323
在历史重写之前的哈希,迁移没有丢失任何内容。
2424

‎catalog/rust/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ name = "octoscript_catalog"
99
crate-type = ["cdylib", "rlib"]
1010

1111
[dependencies]
12-
octoscript-render = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "2cc5ef37d7d6a3d2992673389ce74488f7bb2d87" }
12+
octoscript-render = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "aa80f72c509c767faf04822b939d44b2f34fbc81" }
1313
jni = "0.21"
1414
serde_json = "1.0.151"
1515
ureq = { version = "2", features = ["tls"] }

‎native-runtime.lock.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"schema_version": 1,
33
"url": "https://github.com/OctoSense-org/Octoscript-Makepad.git",
4-
"revision": "2cc5ef37d7d6a3d2992673389ce74488f7bb2d87"
4+
"revision": "aa80f72c509c767faf04822b939d44b2f34fbc81"
55
}

‎probe/rust/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ crate-type = ["cdylib"]
1111
# The real thing: the backend-agnostic Octoscript renderer core. Depends only on
1212
# makepad-script (the VM). No makepad-platform / draw / widgets anywhere.
1313
[dependencies]
14-
octoscript-render = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "2cc5ef37d7d6a3d2992673389ce74488f7bb2d87" }
14+
octoscript-render = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "aa80f72c509c767faf04822b939d44b2f34fbc81" }
1515
jni = "0.21"
1616

1717
[profile.release]

0 commit comments

Comments
 (0)