Skip to content

Chore: Move the Compose fork pin to 1.11.1-ext.2 - #277

Merged
b-re-w merged 8 commits into
developfrom
feat/fork-pin-ext2
Oct 27, 2026
Merged

b-re-w merged 8 commits into
developfrom
feat/fork-pin-ext2

Conversation

@b-re-w

@b-re-w b-re-w commented Oct 25, 2026

Copy link
Copy Markdown
Member

Moves the Compose fork pin to the commit released as 1.11.1-ext.2 (tag v1.11.1-ext.2, c7caf51523e8), which is on Maven Central.

Coordinates moved

  • renderer/scripts/build-compose.sh: REVISION, WINDOW_REVISION, MINGW_REVISION all to c7caf51523e8aa5f81563fcc7311398455ecacef; COMPOSE_AS and MATERIAL3_AS to 1.11.1-ext.2 (the fork now versions material3 with the rest; the upstream material3 version in MATERIAL3_PUBLISHED_AS is unchanged).
  • Compose deps 1.11.1-ext.1 to 1.11.1-ext.2 and 1.11.0-alpha07-ext.1 to 1.11.1-ext.2 in renderer/macos, renderer/desktop and renderer/linux module.yaml.
  • Window modules org.thisisthepy.compose.window:* from 0.1.0 to 1.11.1-ext.2 in renderer/macos, desktop, linux (including native-linux-linuxx64 and -linuxarm64) and windows module.yaml, publish-window.sh text, and scripts/tests/renderer/window-modules-no-awt.test.sh.
  • compose-fork.changes and compose-fork-mingw.changes regenerated from the new commit (472 paths each; all three pins are now the same commit).
  • Docs and test comments naming 1.11.1-ext.1 (guide troubleshooting pages, test-compose-from-fork.yml, shell tests).

Glue changes

  • publish-window.sh: scene is built for jvm plus macosArm64 on a Mac with the fork's macosArm64 Compose, because native/macos now depends on scene (it was forced to jvm only).
  • AppKitWindow.kt: AccessibleElement moved from ...window.graalvm.macos to ...window.
  • X11 accessibility (GraalVM renderer/desktop/src/X11Window.kt and Kotlin/Native renderer/linux/src/LinuxWindow.kt, LinuxRenderer.kt): the fork's X11 windows now join the AT-SPI bus themselves (AtspiWindow) and publish the AccessibleElement list from setAccessibility; AtspiSemanticsSource, X11Accessibility and the renderer-side AtspiBridge use are gone. New ReaderSemantics reads the scene with the fork's SceneSemantics, pushes through AccessibilityCache, and carries a reader's press, focus or value request back to the control through WindowListener.onAccessibilityAction. SemanticsFanOut is removed. renderer/desktop and renderer/linux depend on the fork's scene module for it.
  • Shell tests that read the fork's C and Kotlin follow its new layout: appkit-window-layout (record is dxc_ax_element in appkit_accessibility.h, Kotlin constants in AccessibilityRecords.kt), desktop-c-symbols, x11-window-layout, x11-window-frames, linux-input-access; publish-window-windows-tools gets the scene module in its fixture.

Verified on macOS

build-compose.sh --target desktop (9m05s) and --target macosArm64 (4m44s), renderer/desktop/scripts/build-macos.sh (7m40s, includes publish-window.sh), ./kotlin test -m desktop (570 of 571; the one failure is the timing-sensitive nfr9_measure_sidebar_costs_at_most_ten_percent_over_text_measurer; three context menu tests fail only under a Korean JVM locale and pass with -Duser.language=en), cargo test -p compose-rust --no-default-features --no-fail-fast, and every scripts/tests/*.test.sh except the ones that need a native-image build.

Needs CI

Linux (Kotlin/Native and GraalVM X11 window, AT-SPI against a real registry), Windows, and the native-image tests (image-has-no-awt, accessibility-runtime, linux-*) were not built here.

REVISION, WINDOW_REVISION and MINGW_REVISION all move to c7caf51523e8 (tag v1.11.1-ext.2,
the merge of the fork's bump-ext-2). COMPOSE_AS and MATERIAL3_AS become 1.11.1-ext.2 (the
fork now versions material3 with the rest), the window modules go from 0.1.0 to 1.11.1-ext.2,
compose-fork.changes and compose-fork-mingw.changes are regenerated from the new commit, and
the tests and docs that name the versions follow.
…low AccessibleElement's move

native/macos depends on scene now, so publish-window.sh keeps scene's jvm and macosArm64
platforms on a Mac that has the fork's Compose for macosArm64 (jvm alone elsewhere). The
test fixture gains the scene module the script edits. AppKitWindow imports AccessibleElement
from org.thisisthepy.compose.window, where it moved.
…neSemantics

The fork's X11 windows (GraalVM and Kotlin/Native) join the AT-SPI bus and serve a reader
themselves, from the AccessibleElement list given to setAccessibility, and report a reader's
presses through WindowListener.onAccessibilityAction. AtspiSemanticsSource, X11Accessibility
and the renderer-side AtspiBridge are gone. ReaderSemantics reads the scene with the fork's
SceneSemantics, pushes the list through AccessibilityCache and carries a reader's request
back to the control by id, in both renderers. The renderer modules depend on the scene
module for it. The shell tests that read the fork's C and Kotlin follow the new layout:
the macOS reader record is dxc_ax_element in appkit_accessibility.h, and the X11 C record
is no longer written from Kotlin.
@b-re-w b-re-w added the run-heavy-ci Run the heavy CI workflows on this pull request's head label Oct 25, 2026
The fork's build-skiko-awt.sh publishes org.thisisthepy.compose.skiko:skiko-awt
as 1.11.1-ext.2. SKIKO_AWT_AS, the desktop module, the artifact check, the
native build scripts, workflow cache paths and shell tests follow it.
b-re-w and others added 3 commits October 25, 2026 12:10
The previous change left broken YAML in both workflows (a stray path line, and the
comment landed in the NIK cache step). Restore both steps and add a marker file under
~/.m2/repository/org so upload-artifact keeps org as the root and the download restores
the org/thisisthepy/compose prefix.
…image class path

The fork lists JetBrains' skiko-awt as a second capability of every variant of its
own skiko-awt. Amper takes a variant only when its capabilities are exactly the
module's own coordinate, so it found none and stopped with "Platform is not
supported by the library" at the GraalVM Linux build. publish-skiko-awt.sh drops
the extra capability from the published copy. The fork's Compose modules still ask
for org.jetbrains.skiko:skiko, so the native build scripts now filter JetBrains'
skiko-awt off the class path and the fork's is the only one the image takes.

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>
@b-re-w b-re-w removed the run-heavy-ci Run the heavy CI workflows on this pull request's head label Oct 25, 2026
@b-re-w

b-re-w commented Oct 25, 2026

Copy link
Copy Markdown
Member Author

Handoff (2026-10-25): Branch: feat/fork-pin-ext2. State: open, pinned to fork 1.11.1-ext.2; fork build, GraalVM smoke, renderer test and static renderer checks are red and not yet triaged. Next: once fork PR #167 is merged in compose-multiplatform-core-extended, repin to its merge commit, rerun, and triage the failures. It carries the glue fixes. Blocked on: fork PR #167 merge.

b-re-w added a commit that referenced this pull request Oct 26, 2026
… native/macos, retire the old-build equivalence failure

The fork lists JetBrains' skiko-awt as a second capability of its skiko-awt, which Amper cannot
resolve; publish-skiko-awt.sh drops it and the native build scripts keep JetBrains' copy off the
image class path (from #277). publish-window.sh publishes scene whenever native/macos is built, for
the platforms whose Compose is present. The equivalence comparison with the old patched build no
longer fails the job now that the pin is on the ext.2 line.
@b-re-w
b-re-w merged commit b7ebbcb into develop Oct 27, 2026
29 of 41 checks passed
@b-re-w

b-re-w commented Oct 27, 2026

Copy link
Copy Markdown
Member Author

Superseded by #360

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant