diff --git a/Cargo.toml b/Cargo.toml index 6dbbf7e7..d74d550a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,24 +63,24 @@ authors = ["octos-app contributors"] # BEGIN native-apps: pins (generated by tools/native_apps.py from native-apps.json; do not edit) rinx = { git = "https://github.com/hagency-org/Rinx.git", rev = "68afcf796d303aaf646eeb832d65c450a56c92b5", default-features = false, features = ["octosense-module"] } octosense-reference = { path = "apps/reference" } -makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0", default-features = false } -makepad-terminal = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" } +makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "4531e695251f03bf8b248075491691ecf77ecdaf", default-features = false } +makepad-terminal = { git = "https://github.com/OctoSense-org/makepad.git", rev = "4531e695251f03bf8b248075491691ecf77ecdaf" } octosense-appcard = { path = "apps/appcard/module" } octosense-app-hub-app = { git = "https://github.com/OctoSense-org/OctoSense-App-Hub", rev = "e8601b80ce104db2e48208094714bdcffdce6b5a" } # END native-apps: pins # --- Makepad (OctoSense-org/makepad), the revision Octoscript-Makepad's # runtime.json pins (native-runtime.lock.json); resolved to .sources/makepad. -makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" } -makepad-code-editor = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" } -makepad-ai = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" } -makepad-studio-protocol = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" } -makepad-network = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" } -makepad-wm-api = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" } -makepad-ai-services = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" } -makepad-strict-json = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" } -makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" } -makepad-wm-theme = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" } -makepad-aichat = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0", default-features = false } +makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "4531e695251f03bf8b248075491691ecf77ecdaf" } +makepad-code-editor = { git = "https://github.com/OctoSense-org/makepad.git", rev = "4531e695251f03bf8b248075491691ecf77ecdaf" } +makepad-ai = { git = "https://github.com/OctoSense-org/makepad.git", rev = "4531e695251f03bf8b248075491691ecf77ecdaf" } +makepad-studio-protocol = { git = "https://github.com/OctoSense-org/makepad.git", rev = "4531e695251f03bf8b248075491691ecf77ecdaf" } +makepad-network = { git = "https://github.com/OctoSense-org/makepad.git", rev = "4531e695251f03bf8b248075491691ecf77ecdaf" } +makepad-wm-api = { git = "https://github.com/OctoSense-org/makepad.git", rev = "4531e695251f03bf8b248075491691ecf77ecdaf" } +makepad-ai-services = { git = "https://github.com/OctoSense-org/makepad.git", rev = "4531e695251f03bf8b248075491691ecf77ecdaf" } +makepad-strict-json = { git = "https://github.com/OctoSense-org/makepad.git", rev = "4531e695251f03bf8b248075491691ecf77ecdaf" } +makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "4531e695251f03bf8b248075491691ecf77ecdaf" } +makepad-wm-theme = { git = "https://github.com/OctoSense-org/makepad.git", rev = "4531e695251f03bf8b248075491691ecf77ecdaf" } +makepad-aichat = { git = "https://github.com/OctoSense-org/makepad.git", rev = "4531e695251f03bf8b248075491691ecf77ecdaf", default-features = false } # --- OctoScript (Octoscript 68f6a9df) and its Makepad runtime # (Octoscript-Makepad 65d30a09, native-runtime.lock.json). octoscript-ui-l0 = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "68f6a9df55692b5d8ef8873a12721e279a3f40d6" } @@ -89,8 +89,8 @@ octoscript-ui-l0 = { git = "https://github.com/OctoSense-org/Octoscript.git", re octoscript-core = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "68f6a9df55692b5d8ef8873a12721e279a3f40d6" } octoscript-capabilities = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "68f6a9df55692b5d8ef8873a12721e279a3f40d6" } octoscript-schema = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "68f6a9df55692b5d8ef8873a12721e279a3f40d6" } -octoscript-makepad = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "5fc3681026247761d2e2e16e15b0c4dff3a1c521" } -octoscript-node = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "5fc3681026247761d2e2e16e15b0c4dff3a1c521" } +octoscript-makepad = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "bbb9f69fa62858e775058ab743047746e432bfaa" } +octoscript-node = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "bbb9f69fa62858e775058ab743047746e432bfaa" } # --- App Hub's host service registry the Mail and llm services register # into; the same revision as App Hub's app crate (a native app, above). octosense-appstore = { git = "https://github.com/OctoSense-org/OctoSense-App-Hub", rev = "e8601b80ce104db2e48208094714bdcffdce6b5a" } diff --git a/apps/appcard/native-runtime.lock.json b/apps/appcard/native-runtime.lock.json index 2030f4e4..6115e179 100644 --- a/apps/appcard/native-runtime.lock.json +++ b/apps/appcard/native-runtime.lock.json @@ -1,5 +1,5 @@ { "schema_version": 1, "url": "https://github.com/OctoSense-org/Octoscript-Makepad.git", - "revision": "5fc3681026247761d2e2e16e15b0c4dff3a1c521" + "revision": "bbb9f69fa62858e775058ab743047746e432bfaa" } diff --git a/native-apps.json b/native-apps.json index 65af3b64..aa66958f 100644 --- a/native-apps.json +++ b/native-apps.json @@ -36,7 +36,7 @@ { "id": "sheets", "crate": "makepad-sheets", - "source": { "git": "https://github.com/OctoSense-org/makepad.git", "rev": "f08eec5378fa3f83902a2794dacda03e829a0ef0", "local": ".sources/makepad/apps/sheets" }, + "source": { "git": "https://github.com/OctoSense-org/makepad.git", "rev": "4531e695251f03bf8b248075491691ecf77ecdaf", "local": ".sources/makepad/apps/sheets" }, "module": "makepad_sheets::SHEETS_MODULE", "bin": "sheets", "default_features": false, @@ -52,7 +52,7 @@ { "id": "terminal", "crate": "makepad-terminal", - "source": { "git": "https://github.com/OctoSense-org/makepad.git", "rev": "f08eec5378fa3f83902a2794dacda03e829a0ef0", "local": ".sources/makepad/apps/terminal" }, + "source": { "git": "https://github.com/OctoSense-org/makepad.git", "rev": "4531e695251f03bf8b248075491691ecf77ecdaf", "local": ".sources/makepad/apps/terminal" }, "module": "makepad_terminal::TERMINAL_MODULE", "bin": "terminal", "default_features": true, diff --git a/native-runtime.lock.json b/native-runtime.lock.json index 2030f4e4..6115e179 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": "5fc3681026247761d2e2e16e15b0c4dff3a1c521" + "revision": "bbb9f69fa62858e775058ab743047746e432bfaa" } diff --git a/phone/docs/build-tool.md b/phone/docs/build-tool.md index 5d88372a..9eefd2c0 100644 --- a/phone/docs/build-tool.md +++ b/phone/docs/build-tool.md @@ -73,9 +73,9 @@ move that touches `tools/cargo_makepad` is the usual trigger): cargo install --path .sources/makepad/tools/cargo_makepad --force ``` -The shared release selects Makepad main `f08eec53`, which includes App Hub's +The shared release selects Makepad main `4531e695`, which includes App Hub's isolate containment (#22), contained script apps (#30), the QR scanner -(#31), Splash `reapply_text` (#35) self-confirmed assistant tools (#36) and the one-call-site Slug, cursor and glass shaders (#37, #39), the terminal's confirmed runs (#41), trackpad scrolling (#42), gestures (#46) and Chinese text (#48), and WebReader's close ending the page (#43); the consumer lock +(#31), Splash `reapply_text` (#35) self-confirmed assistant tools (#36) and the one-call-site Slug, cursor and glass shaders (#37, #39), the terminal's confirmed runs (#41), trackpad scrolling (#42), gestures (#46), Chinese text (#48), tabs and installed fonts (#47), and every app's system-font fallback (#49), and WebReader's close ending the page (#43); the consumer lock needs no `makepad_override`. To see which checkout an installed tool reads its Java from: diff --git a/phone/docs/makepad-fork.md b/phone/docs/makepad-fork.md index 0e7bcc25..6ab6ee39 100644 --- a/phone/docs/makepad-fork.md +++ b/phone/docs/makepad-fork.md @@ -20,15 +20,16 @@ Makepad and that no fork is required do not. The revision is pinned as a chain, not in one place: 1. `native-runtime.lock.json` here names one revision of - `OctoSense-org/Octoscript-Makepad` (`5fc36810`, its main). + `OctoSense-org/Octoscript-Makepad` (`bbb9f69f`, its main). 2. That repo's `runtime.json` names the Makepad fork revision - (`f08eec53`, Makepad main: the enforced isolate policy of PR #22, module + (`4531e695`, Makepad main: the enforced isolate policy of PR #22, module windows, the ROM's Splash fixes, the contained script apps and host services of PR #30, the QR scanner of PR #31, Splash `reapply_text` of PR #35, the self-confirmed assistant tools of PR #36, the one-call-site Slug, cursor and glass shaders of PRs #37 and #39 the terminal module of PRs #40 and #41 and the terminal's trackpad scrolling of PR #42, WebReader's close - ending the page of PR #43 and the terminal gestures of PR #46 and the terminal's CJK font of PR #48) and the Octoscript revision + ending the page of PR #43 and the terminal gestures of PR #46 and the terminal's CJK font of PR #48, the terminal's tabs and installed fonts of PR #47 + and the system-font fallback for every app of PR #49) and the Octoscript revision (`68f6a9d`). OctoSense, AppCard, Rinx and the ROM lock the same release. 3. The manifests repeat the Makepad revision as `rev = "…"`: here in `Cargo.toml` and `apps/*/Cargo.toml`. Octoscript-Makepad's unmodified diff --git a/rom/docs/home-build.md b/rom/docs/home-build.md index 2443a444..756f5828 100644 --- a/rom/docs/home-build.md +++ b/rom/docs/home-build.md @@ -29,7 +29,7 @@ assistant (`octos-app`, `apps/appcard/app/app`) is built only with `--features app-appcard`: it is not shipped for now, so default, `mobile-apps` and native mobile builds leave its UI out. -The runtime's Makepad (main `f08eec53`, OctoScript-Makepad `5fc36810`) +The runtime's Makepad (main `4531e695`, OctoScript-Makepad `bbb9f69f`) includes the contained-app and isolate controls from makepad#30, the camera QR scanner AI providers uses (makepad#31), Splash `reapply_text` (makepad#35) with stateful mini-app inputs (OctoScript-Makepad#46) for Rinx, diff --git a/runtime-patches.lock.json b/runtime-patches.lock.json index 933d11e8..b55174a2 100644 --- a/runtime-patches.lock.json +++ b/runtime-patches.lock.json @@ -1,10 +1,10 @@ { "schema_version": 1, "makepad": { - "base_revision": "f08eec5378fa3f83902a2794dacda03e829a0ef0", + "base_revision": "4531e695251f03bf8b248075491691ecf77ecdaf", "patch": "tools/runtime-patches/makepad-settings.patch", "sha256": "ba59081fb600b022844db5882f969712275be7a7976be8cb5ced7eac1bfa26a5", - "tree": "563e5b4b7fa0aa1b9c790c495603beea1342b158", + "tree": "05575fe1d37f0555eafaa4e5ec86c9b558b8f1fb", "product_fixes": [ "Settings integration: Android IME synchronization, accessibility and reduced motion, GLES program-cache validation, obscured-gesture cancellation and scroll-position observation.", "Contained-app isolation and secret-input restrictions come from the pinned upstream runtime; the Settings overlay preserves those gates.",