Repository navigation
Chore: Move the Compose fork to 1.11.1-ext.4 - #808
Merged
Merged
Conversation
The Compose and Windows pins move to the fork's v1.11.1-ext.4 tag (cadc5984ef96ed306ea12a7e967bcf945e7b1bdd) and the window pin to the tip of the fork's extended branch (a13a6289029d11033c892b94bc200e67aeed93d7). Both commits publish every line as 1.11.1-ext.4, so COMPOSE_AS, MATERIAL3_AS and SKIKO_AWT_AS move with them, and every live coordinate follows: the renderer module.yaml files, COMPOSE_VERSION in Transform3DLayers.kt and its staged Android copy (stage-android-kotlin.sh), the troubleshooting guides in English and Korean, the scripts, the test comments and the workflow comment. ext.4 builds the design systems and window modules into Java 11 class files (fork #226), publishes skiko-awt with one capability and points the desktop modules at it (fork #167), and carries the Windows edit menu C glue (fork #221), FR-82's X11 size in dp across a scale change (fork #216), F1 to F12 and the Menu key (fork #219), the Windows maximise and restore frame (fork #222) and one macOS text menu (fork #224). The window pin adds fork #232 (Windows restore and snap show the frame drawn ahead, probe gated on a rate, #223 open), #235 (macOS native view frame in the frame's own transaction, #233), #234 (declared accessible roles on the Kotlin/Native macOS window) and CI changes #229 and #231. compose-fork.changes and compose-fork-mingw.changes are regenerated from 73ac849 to the new pin. The one path they no longer list is the scene's DrawnEditMenu.kt, which fork #221 removed on purpose. The historical CHANGELOG entry for ext.3 keeps its version and ext.4 gets its own.
Since 1.11.1-ext.4 (fork #167) the fork's desktop modules (ui-desktop, foundation-desktop and the rest) name org.thisisthepy.compose.skiko: skiko-awt at the fork version. skiko-awt is a JVM jar published as a root alone, with no per-target publications, and publish-skiko-awt.sh puts it in ~/.m2. fork-dependencies.sh still asked every root sibling for a publication per served target (skiko-awt-desktop), so require-fork-artifacts.sh desktop refused a complete repository and every renderer build script stopped before the toolchain ran. A root whose metadata has no variant pointing at a target publication ("available-at") is now published when its own files are. A multiplatform root without the target's publication is still refused. fork-dependencies.test.sh covers both; the first case failed before this change with skiko-awt named as missing.
The test read X11_DIGITS from the fork's X11Keys.kt with a sed range that ends at the next line holding a closing parenthesis. The digits sit on one line, so the range used to end at the file's end; the window pin now has X11_FUNCTION_KEYS after them (fork #219), and the range ran on into that table: 12 digits, and digit 5 read as 97. Each table is now read up to the first closing parenthesis, its opening line included. The shared table's new F1 to F12 entries and the Menu key are checked as well, since the X11 windows depend on them as they do on the rest.
This was referenced Nov 14, 2026
The fork's X11 window numbers F1 to F12 since fork #219, which the ext.4 pin brings. a_key_with_no_number_claims_no_meaning used F1 as its example of a key the window does not number, so on Linux it failed with "Expected <-1>, actual <122>" (batch CI run 43639736378, Test the linux renderer; the only failed test of that job). The example is now Scroll Lock, which the window still leaves unnumbered, and a new test checks both ends of the function row reach the scene as F1 and F12. Not compiled here: the Linux module builds only on Linux.
# Conflicts: # CHANGELOG.md
The window pin moves to the tip of the fork's extended branch, which still publishes every line as 1.11.1-ext.4. It adds fork #239 (for #233): the macOS window holds its backdrop blur still while a native view slot shows, so the view and the frame of one turn are composited together, place() works only where a slot changed, and setFrameAndVisibleRegion sets both in one call. It also brings fork #236 (the application owns a Windows window's caption strip) and #237 (quoted booleans in the publish workflows).
# Conflicts: # CHANGELOG.md
Member
Author
|
Merge evidence (compose-rust boost, w1:p1T).
Known and tracked, not fixed by this move: no wheel or trackpad scroll on the Kotlin/Native macOS window (fork PR #240, needs the next fork tag). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Moves the Compose fork from 1.11.1-ext.3 to 1.11.1-ext.4.
What moved
REVISIONandMINGW_REVISIONpin the fork's tagv1.11.1-ext.4,cadc5984ef96ed306ea12a7e967bcf945e7b1bdd.WINDOW_REVISIONpins the tip of the fork'sextendedwhen this started,a13a6289029d11033c892b94bc200e67aeed93d7(fork Feat: One executable gate for the Kotlin/Native Windows renderer #235).gradle.propertiespublishCOMPOSEandCOMPOSE_MATERIAL3as1.11.1-ext.4, and bothextended/skiko/build-skiko-awt.shpublish skiko-awt as1.11.1-ext.4, soCOMPOSE_AS,MATERIAL3_ASandSKIKO_AWT_ASare1.11.1-ext.4.module.yamlfiles (desktop, macos, linux, windows),COMPOSE_VERSIONinTransform3DLayers.ktand its staged Android copy (scripts/stage-android-kotlin.sh), the troubleshooting guides (en and ko), the scripts, the test comments and the workflow comment. The historical ext.3 CHANGELOG entry keeps its version; ext.4 gets its own entry under Unreleased.compose-fork.changesandcompose-fork-mingw.changesare regenerated from 73ac849 to the new pin. The one path they stop listing isextended/window/scene/.../DrawnEditMenu.kt, which fork Fix: Repoint fork dependencies on every build-compose.sh run #221 removed on purpose.What the pins hold
The tag (since b97666a8): Java 11 class files for the design systems and window modules, graalvm-linux at Java 17 (fork #226); skiko-awt with one capability, the desktop modules naming the fork's skiko-awt (fork #167); the Windows edit menu C glue
dxc_native_set_edit_menu, which the X11 and AppKit C answer themselves, and the scene leaving the text menu to Compose (fork #221); FR-82, an X11 window keeping its size in dp across a scale change (fork #216); F1 to F12 and the Menu key (fork #219); the Windows new size drawn before it is shown after maximise, restore or snap (fork #222); one menu on a right click in a macOS text field (fork #224); CI fixes #217, #218, #220.The window pin beyond the tag (
git log v1.11.1-ext.4..a13a6289 --first-parent): fork #232 (Windows restore and snap show the frame drawn ahead through the swapchain, the probe gated on a rate; #223 stays open), fork #235 (the macOS native view's frame committed in the frame's own transaction, #233), fork #234 (an application can declare a node's accessible role to the Kotlin/Native macOS window), and CI changes #229 and #231.The Windows edit menu feature (#762) and the FR-82 CI checks (#726) are not here; they merge develop after this.
Glue
renderer/scripts/fork-dependencies.sh: since fork Docs: Point the single-executable rule at FR-22.6's format table #167 the desktop modules nameorg.thisisthepy.compose.skiko:skiko-awt:1.11.1-ext.4, a JVM jar published as a root alone. The check asked it for askiko-awt-desktoppublication, sorequire-fork-artifacts.sh desktoprefused a complete~/.m2. A root with noavailable-atvariant now counts as published when its own files are; a multiplatform root without the target's publication is still refused.fork-dependencies.test.shcovers both (red before the fix).scripts/tests/x11-key-codes.test.sh: its sed range ran past the one-lineX11_DIGITSinto the newX11_FUNCTION_KEYS(fork Fix: Run the window publish's kotlin.bat without Git's Unix tools on its PATH #219). Each table is read to its first closing parenthesis now, and the F keys and the Menu key are checked.dxc_native_*stand-ins were needed:desktop-c-symbols.test.shpasses, 32 symbols across 3 desktops.Artifacts
1.11.1-ext.4 is on Maven Central for the tag's modules (foundation root, desktop, macosarm64, iossimulatorarm64; window common and graalvm-macos; skiko-awt), but the window pin is past the tag and the renderer checks
~/.m2. So the repo's own scripts published ext.4 into~/.m2(ext.3 untouched):build-compose.sh --target desktopand--target macosArm64at cadc5984,publish-skiko-awt.shandpublish-window.shat a13a6289. iOS and Android use JetBrains' Compose and need none of it.Gate (local, macOS arm64, head a06986c)
scripts/stand-in-renderer.sh --if-refused target/stand-in-renderercargo fmt --all -- --checkcargo clippy --workspace -- -D warningscargo test --workspacedesign_system_parity2/2 at cadc5984scripts/tests/*.test.sh, plusrenderer/window-modules-no-awt,linux-build,linux-metadatarenderer/scripts/require-fork-artifacts.sh desktop macos./kotlin test -m desktop./kotlin build -m ios -p iosSimulatorArm64(fresh tasks, konanc ran)./kotlin test -m macosdx build --package sample-minimal --platform android(app dir wiped)lib/arm64-v8a/libmain.soWhat only CI can prove
renderer/linuxagainst linuxX64 and linuxArm64 ext.4 (build-compose.sh --target linux,publish-window.shon Linux for native-linux and scene), the GraalVM Linux image with the newx11_window.c(fork Fix: Check for the fork's artifacts before the Kotlin toolchain resolves them #216 and Fix: Repoint fork dependencies on every build-compose.sh run #221), and the Linux checks in x11-window-layout.build-compose.sh --target mingwX64,compose-fork-mingw.changes),windows-sharedwith the newwin32_edit_menu.h,win32_keys.hand the Chore: Run heavy CI on request, gated on the pull request head #232 swapchain code, the GraalVM Windows image linkingdxc_native_set_edit_menufromwin32_window.c, and the Windows resize workflows.appkit_window.m.