From 65a2507a1120291b646ca829da4ce3a163efe3ce Mon Sep 17 00:00:00 2001 From: Kgothatso Ngako Date: Fri, 20 Nov 2026 15:40:11 +0200 Subject: [PATCH] docs: the comments that named the old versions (dependency-update, Phase 7) Comments that state a current version now state the new one: the material3 notes in the catalogue, Theme.kt's expressive note, m3-audit.sh's role list (ColorScheme declares the same getters at 1.12.0-alpha03), the Kotlin/Native workaround's note, and two lines of quartz-mls-marmot-update.md. Notes that record what was true when they were written are left. The plan's status names what is left: pushing the four submodule branches, Phase 8, and Compose 1.13.0 once final. Co-Authored-By: Claude Opus 5.5 --- composeApp/build.gradle.kts | 3 +++ .../kotlin/mobi/giza/compose/ui/theme/Theme.kt | 4 ++-- docs/README.md | 2 +- docs/dependency-update.md | 14 ++++++++++++-- docs/quartz-mls-marmot-update.md | 5 +++-- docs/scripts/m3-audit.sh | 3 ++- gradle/libs.versions.toml | 10 +++++----- 7 files changed, 28 insertions(+), 13 deletions(-) diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index b7eb8861..9c8e0449 100644 --- a/composeApp/build.gradle.kts +++ b/composeApp/build.gradle.kts @@ -190,6 +190,9 @@ kotlin { * graph has at least one statement in its body, and something in this module's graph arrives * with an empty one. The pass is an optimization only; disabling it costs the redundant * initializer calls it would have removed and nothing else. + * + * Seen on 2.4.10. The app is on 2.4.21 now, which has not yet been linked on a mac without + * this flag; remove it only once a release link passes there (docs/dependency-update.md, C5). */ tasks.withType().configureEach { if (name.startsWith("linkRelease")) { diff --git a/composeApp/src/commonMain/kotlin/mobi/giza/compose/ui/theme/Theme.kt b/composeApp/src/commonMain/kotlin/mobi/giza/compose/ui/theme/Theme.kt index 397cabdf..8d85f03b 100644 --- a/composeApp/src/commonMain/kotlin/mobi/giza/compose/ui/theme/Theme.kt +++ b/composeApp/src/commonMain/kotlin/mobi/giza/compose/ui/theme/Theme.kt @@ -471,8 +471,8 @@ internal fun appColorScheme(darkTheme: Boolean, contrast: ThemeContrast): ColorS * The app's theme: colour, shape, type and motion, in one place. * * **Expressive, deliberately.** `MaterialExpressiveTheme` rather than `MaterialTheme` is a - * product decision taken 2026-09-08. The pinned material3 1.10.0-alpha05 ships the whole - * expressive set -- button groups, split buttons, floating toolbars, wide navigation rails, + * product decision taken 2026-09-08. The pinned material3 (1.10.0-alpha05 then, + * 1.12.0-alpha03 now) ships the whole expressive set -- button groups, split buttons, floating toolbars, wide navigation rails, * loading indicators, the eight-step shape scale, thirty type roles -- and the tree already * opts into `ExperimentalMaterial3ExpressiveApi` in 66 places. The visible effect is that * components take their expressive defaults: rounder, larger, more motion. It is one diff --git a/docs/README.md b/docs/README.md index 6b2f2d4e..b07957b4 100644 --- a/docs/README.md +++ b/docs/README.md @@ -36,7 +36,7 @@ the [retired](./retired/) notes now. | [marmot-v2.md](./marmot-v2.md) | bringing the group layer onto the Marmot current profile after the quartz 1.15.2 bump — the nine rules that reach this app, why the room's id and the routing id have to become two values, nine phases from reading both profiles to publishing before applying, the rollout that put new rooms on the current profile and retired the legacy KeyPackage slot, and the one fork the library cannot yet settle | | [marmot-kmp.md](./marmot-kmp.md) | moving the group layer off quartz's engine and onto marmot-kmp, mls-kmp and crypto-kmp — why staying on quartz 1.15.2 is staying on an engine that left, the 228 import lines and the one rule that places all but two of them, the group state on a device that must still open afterwards, nine phases that put the swap in one commit and the evidence around it, how often this app persists a group once a sent message no longer rewrites it, and the schema change that followed, opened from the version the app ships | | [quartz-mls-marmot-update.md](./quartz-mls-marmot-update.md) | moving quartz, mls-kmp, marmot-kmp and crypto-kmp to their newest releases, phased and built but for a mac and mls-kmp 1.4.0's release — why almost nothing the app calls has changed while the way the build reaches them has (Nostr + Blossom through Magpie, none of it on Maven Central), the go/no-go that is the owner's, marmot's own pins first and the newest second, and the lock that has to be written on a mac before it can be frozen | -| [dependency-update.md](./dependency-update.md) | moving everything else in the catalogue to its newest stable release, phased and not yet built — why the libraries go first and need no newer Kotlin, why AGP and Kotlin can only move down the whole submodule chain at once, the material3 alpha that was built for an older Compose than the app's, and what has to keep opening on a device afterwards | +| [dependency-update.md](./dependency-update.md) | moving everything else in the catalogue to its newest stable release, phased and built but for a mac, devices and pushing the submodule branches — why the libraries go first and need no newer Kotlin, why AGP and Kotlin can only move down the whole submodule chain at once, the material3 alpha that was built for an older Compose than the app's, and what has to keep opening on a device afterwards | | [giza-wallet-removal.md](./giza-wallet-removal.md) | taking every wallet out of Giza, phased and built but for moving off the wallet library (7b). Covers why a Giza member declines a Bennu peer's wallet proposal instead of ignoring or signing it, why the wallet's kinds are retired rather than freed, why a recovery phrase stays as a key backup that has to derive the same npub and id byte for byte, and why the threshold crypto keeps the build tied to the wallet library until the last phase | | [member-admin-promotion.md](./member-admin-promotion.md) | making a member an admin and back, phased and built, promotion with a share and demotion with a refresh under the experimental enrollment, under three rules: every admin holds a share, every commit in a keyed room is a proposal until the group's threshold signature is on it, and a robust group keeps at least three admins. Covers why the commit rides inside the group's signature and the rule inside the group's state, which lets every device refuse an unsigned commit with the libraries as they are, why a member's own leave stays exempt, and why a removed admin comes back as an admin when re-invited today | | [admin-change-rotation.md](./admin-change-rotation.md) | an admin change carries its rotation with it: a phased plan, built but for its device session, in which the rotation that follows removing an admin, and the one before a first promotion, asks nobody, because the group's signature on the change already decided who is withheld, and in which admin changes and rotations take turns. Covers the five ways the two overlap today, a removed admin who keeps a live share among them, and the one check a device makes to take part unasked | diff --git a/docs/dependency-update.md b/docs/dependency-update.md index ae871a8e..cce3028c 100644 --- a/docs/dependency-update.md +++ b/docs/dependency-update.md @@ -25,8 +25,17 @@ Researched on 2026-11-20 against `390d4bc3`. The composite's pins were read from ### Where the build stands -**Being built** on `claude/dependency-update-plan-1b853a`, one commit per step. Each phase -records what it turned out to be in the results table below. +**Built but for a mac, devices, and pushing the submodules**, on +`claude/dependency-update-plan-1b853a`, one commit per step. Each phase records what it turned +out to be in the results table below. Three things are left: + +- **The submodule commits are local.** secp256k1-kmp, bitcoin-kmp, lightning-kmp and + lightning-kmp-app each have a `claude/dependency-update` branch, two commits deep, that Giza's + pointer names. They have to be pushed, bottom up, before this branch is merged, or a fresh + clone cannot resolve `lightning-kmp-app`. +- **Phase 8:** an Android install over the current build, a desktop run on existing profiles, + QR codes scanned, and iOS on a mac, including the Kotlin/Native link without its workaround. +- **Compose 1.13.0**, once it is final: a follow-up that changes two lines (D3). | phase | result | |---|---| @@ -39,6 +48,7 @@ records what it turned out to be in the results table below. | 4 | built. Gradle 9.9.2, with the wrapper run twice. 9.9.2's wrapper adds `retries=0` and `retryBackOffMs=500` to `gradle-wrapper.properties` and regenerates both scripts. The daemon still resolves Java 21 from `gradle-daemon-jvm.properties`. Resolved graphs identical to Phase 3's. `check` green, `jvmTest` 1,407 / 0, `testDebugUnitTest` 529 / 0. Gradle 10 deprecations are the same as before, all from the composite's scripts or plugins: `by getting` ×3, `by registering` ×2, `AbstractTestTask.afterSuite(Closure)` and `Configuration.getTaskDependencyFromProjectDependency` | | 5 | built, in the submodules and here: secp256k1-kmp `b0f0e37` (both pins), bitcoin-kmp `3ea162a` and lightning-kmp `9ec407fe` (pointers), lightning-kmp-app `63a48b2` (catalogue and pointer), each on a `claude/dependency-update` branch and **not pushed**. AGP 9.5.1 found three things 9.4.0 had not. **(1)** It registers `generateComposePreviewRunfiles` on every variant with Compose on and refuses to configure it while unit tests exclude Android resources, so `composeApp` sets `testOptions.unitTests.isIncludeAndroidResources = true`. **(2)** It refuses the same task for a variant with no unit tests, and AGP 9 gives unit tests to the tested build type only, while Kotlin's `allTests` realizes the release one, so `check` would not configure. `gradle.properties` sets `android.onlyEnableUnitTestForTheTestedBuildType=false`, and `check` now runs `testReleaseUnitTest` too (529 run, 0 failed). There is no option for turning the preview task off: it is gated only on the Compose build feature. **(3)** Its lint now reads `commonMain` and found three real errors, fixed in `3e0a16b1` before this commit: an unremembered `mutableStateOf`, and two `Scaffold`s that ignored `innerPadding`. Merged manifests (debug and release) are byte-identical to 9.4.0's. Resolved graphs unchanged. Debug APK 50.4 MB, unsigned release 38.1 MB. `jvmTest` 1,407 / 0. The seven opt-out flags all still warn "removed in version 10.0", as at Phase 0. **Not done here:** an Android Studio sync, and the submodule-level checks, which Phase 6 makes once for both versions | | 6 | built: secp256k1-kmp `bcaa985`, bitcoin-kmp `0fd254b`, lightning-kmp `f8835338` and lightning-kmp-app `d87af50`, each a Kotlin commit on top of its Phase 5 commit on `claude/dependency-update`, **not pushed**, with `engine-interop/new` moved too. The resolved graphs did not change at all: stdlib was already resolving 2.4.21 under quartz, and now the declared version matches it. Giza: `check` green, `jvmTest` 1,407 / 0, `testDebugUnitTest` and `testReleaseUnitTest` 529 / 0 each, both APKs built. Down the chain, run standalone for both phases: secp256k1-kmp `:tests:jvmTest`, bitcoin-kmp `jvmTest`, and lightning-kmp-app `:library:compileKotlinJvm :library:compileAndroidMain` all pass. engine-interop prints ALL PASSED both ways through epoch 3. A full recompile under 2.4.21 reports 31 warnings in the app's sources and none is an error: nullability redundancies, the deprecations already named in Phase 3, and two `ExperimentalCoroutinesApi` opt-ins in tests. **Not done here:** the mac link without `-Xdisable-phases` (C5), so the workaround stays | +| 7 | built. The comments that stated a current version now state the new one: the two material3 comments in the catalogue (adaptive 1.2.0 is still what the navigation suite asks for, at 1.12.0-alpha03 and 1.13.0-rc01), `Theme.kt`'s expressive note, `m3-audit.sh`'s role list (checked: `ColorScheme` declares the same getters at 1.12.0-alpha03 as at 1.10.0-alpha05, so the hardcoded roles still hold), the Kotlin/Native comment (seen on 2.4.10, not yet re-linked at 2.4.21), and two lines of quartz-mls-marmot-update.md. Left as written, because they record what was true when they were written: `Color.kt`'s citation of the 1.10.0-alpha05 token file, jvm-target.md's dependency table, marmot-kmp.md's skew notes, material-design-conformance.md's versions, and quartz-mls-marmot-update.md's before/after tables | | phase | what it is | rough size | |---|---|---| diff --git a/docs/quartz-mls-marmot-update.md b/docs/quartz-mls-marmot-update.md index a6d6d4af..77c0b2c6 100644 --- a/docs/quartz-mls-marmot-update.md +++ b/docs/quartz-mls-marmot-update.md @@ -114,7 +114,7 @@ plugin at v0.2.3: `MagpieSettingsPlugin.kt`, `docs/ARCHITECTURE.md`, `LockFile.k - **Requirements.** - The Gradle daemon must run on Java 21+, or the build throws at configuration time (`MIN_DAEMON_JAVA = 21`). - - Gradle 8.8+. The app is on 9.7.1. + - Gradle 8.8+. The app was on 9.7.1, and is on 9.9.2 since [dependency-update.md](./dependency-update.md), Phase 4. - Configuration cache is supported, which is moot here: the app has it off for `lightning-kmp-app`'s sake. - The engine is about 21 MB in its own class loader per daemon. @@ -713,7 +713,8 @@ None of these can be automated here, and all of them stand between this work and GroupInfo-aware `validateJoin` for the robust-room joiner check, and the authored-fork fix. All are library-enabled behaviour (D5). `marmot-quic` and the `com.vitorpamplona.quic` group. Kotlin 2.4.10 → 2.4.21, which would close the stdlib skew the app already lives with -and is a toolchain change rather than a library one. +and is a toolchain change rather than a library one. [dependency-update.md](./dependency-update.md) +did it, in its Phase 6. ## Where the numbers come from diff --git a/docs/scripts/m3-audit.sh b/docs/scripts/m3-audit.sh index 0b290d7f..e828e601 100755 --- a/docs/scripts/m3-audit.sh +++ b/docs/scripts/m3-audit.sh @@ -118,7 +118,8 @@ hdr 'Colour (phases 1, 3)' declared=$(grep -oE '^\s{4}[a-zA-Z]+ = ' "$THEME/Theme.kt" 2>/dev/null \ | tr -d ' =' | sort -u) # The 49 roles of androidx.compose.material3.ColorScheme, as of material3 -# 1.10.0-alpha05. Hardcoded because the artifact is not on this script's path. +# 1.10.0-alpha05, and unchanged at 1.12.0-alpha03 (its ColorScheme declares the +# same getters; docs/dependency-update.md, Phase 7). Hardcoded because the artifact is not on this script's path. all_roles="primary onPrimary primaryContainer onPrimaryContainer inversePrimary secondary onSecondary secondaryContainer onSecondaryContainer tertiary onTertiary tertiaryContainer onTertiaryContainer diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c1cc645c..270b4a96 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -37,10 +37,10 @@ marmot = { strictly = "2.3.0" } # (docs/quartz-mls-marmot-update.md, Phase 0). mls = { strictly = "1.3.1" } material3 = "1.12.0-alpha03" -# The version material3 1.10.0-alpha05 itself resolves: its -# material3-adaptive-navigation-suite pom asks for adaptive 1.2.0. Picking the newer -# 1.3.0-beta02 would drag window-core 1.5.0 in beside the 1.4.0 the pinned material3 -# compiled against, for a large/extra-large breakpoint pair that 1.2.0 already computes +# The version the pinned material3 itself resolves: its material3-adaptive-navigation-suite +# pom asks for adaptive 1.2.0, at 1.10.0-alpha05 and still at 1.12.0-alpha03 and 1.13.0-rc01. +# Picking the newer 1.3.0 would drag window-core 1.5.0 in beside the 1.4.0 the pinned +# material3 compiled against, for a large/extra-large breakpoint pair that 1.2.0 already computes # through `supportLargeAndXLargeWidth`. material3Adaptive = "1.2.0" materialIconsCore = "1.7.3" @@ -75,7 +75,7 @@ compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", v compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "material3" } compose-material3-adaptive = { module = "org.jetbrains.compose.material3.adaptive:adaptive", version.ref = "material3Adaptive" } # Versioned with material3 rather than with material3Adaptive: it is published by the -# material3 group and its 1.10.0-alpha05 is what names adaptive 1.2.0 in the first place. +# material3 group, and its version is what names adaptive 1.2.0 in the first place. compose-material3-adaptive-navigation-suite = { module = "org.jetbrains.compose.material3:material3-adaptive-navigation-suite", version.ref = "material3" } compose-material-icons-core = { module = "org.jetbrains.compose.material:material-icons-core", version.ref = "materialIconsCore" } compose-material-icons-extended = { module = "org.jetbrains.compose.material:material-icons-extended", version.ref = "materialIconsExtended" }