From 7222df018210fc04237f0807ebd7c1c2040e3bbc Mon Sep 17 00:00:00 2001 From: Kgothatso Ngako Date: Fri, 20 Nov 2026 11:36:48 +0200 Subject: [PATCH] build: the lock holds only what resolves (quartz-mls-marmot-update, Phase 6, Linux half) quartz 2.20.0's lines went: under the strict pin, marmot's request for it is never looked up, and every classpath resolves under a frozen lock without them. Checked here: a frozen lock refuses a version it does not hold, with Magpie's own instruction, and an offline build from a fresh daemon resolves from the mirror. The iOS lines need a mac, and the freeze waits for them. Co-Authored-By: Claude Opus 5.5 --- docs/quartz-mls-marmot-update.md | 35 ++++++++++++++++++++++++++++++++ gradle/magpie.lock | 3 --- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/docs/quartz-mls-marmot-update.md b/docs/quartz-mls-marmot-update.md index 27631b93..72c8b4ee 100644 --- a/docs/quartz-mls-marmot-update.md +++ b/docs/quartz-mls-marmot-update.md @@ -582,6 +582,41 @@ A short section in this note on offline work: one online build fills **Check:** a frozen-lock build passes on Linux and on the mac. A deliberately bumped version fails the frozen build with Magpie's message. +**Half built: the Linux half.** The mac half and the freeze are still to do, in that +order. + +- **The stale lines.** Phase 5a left quartz 2.20.0's three lines in the lock. With them + removed, every runtime and compile classpath resolves under + `-Pmagpie.frozenLock=true --refresh-dependencies` and nothing is written back. Under the + strict pin, marmot's request for 2.20.0 is never looked up, so the lines are pruned. The + lock is now exactly what resolves: six publishers and 18 modules (root, `-jvm` and + `-android` for quartz 2.20.1, marmot 2.3.0, mls 1.3.1, crypto 2.1.1, negentropy v1.2.3 and + schnorr256k1-kotlin 1.0.3). +- **The frozen lock refuses.** With quartz set to `strictly 2.19.1`, which is on the relay + and not in the lock, a frozen build fails with "Magpie refused …quartz-2.19.1.module: + magpie.lock is frozen but resolution needs to add to it: release + com.vitorpamplona.quartz:quartz:2.19.1 … Run the build once without frozen locks and + commit magpie.lock." Gradle's `dependencies` report renders that as `FAILED` lines and + exits 0, but a compile fails. +- **Offline.** After `./gradlew --stop`, `./gradlew --offline -Pmagpie.frozenLock=true + :composeApp:compileKotlinJvm` succeeds. Magpie serves from + `~/.gradle/magpie/mirror//`, which any earlier online build on the machine + has filled. A machine that has never built online has to build online once. + +**Still to do, on a mac, in this order:** + +1. `./gradlew :composeApp:compileKotlinIosSimulatorArm64 + :composeApp:linkDebugFrameworkIosSimulatorArm64`, and the same for `IosArm64`. The diff + to `gradle/magpie.lock` must be additions only: `-iosarm64` and `-iossimulatorarm64` + lines for each release, plus schnorr256k1-kotlin's cinterop klib if it is published as + its own module. +2. Add the iOS suffixes to `docs/scripts/magpie-lock-audit.sh` (Phase 7), so the audit + requires them from then on. +3. Add `magpie.frozenLock=true` to `gradle.properties`, with a comment pointing here. + +Freezing before step 1 would make the first mac build fail on a lock it is not allowed to +complete. That is why the freeze is not in this commit. + ## Phase 7 — the guards, and the notes that still say 2.7.3 - **A lock guard.** Extend the `marmotAudit` script, or add a sibling, to fail `check` when a diff --git a/gradle/magpie.lock b/gradle/magpie.lock index b2df2aa3..fc42c336 100644 --- a/gradle/magpie.lock +++ b/gradle/magpie.lock @@ -19,11 +19,8 @@ release com.vitorpamplona.mls:mls:1.3.1 afaee9458cfea00107297adeb93ef7315543288c release com.vitorpamplona.negentropy:kmp-negentropy-android:v1.2.3 d005ae7d13d4fc0b5b498d554a880366554edef8c39ba123248676f360df3635 c4dfe76b4bdaa3442c5b8223778b0347e9bd9ab63f71a4b183ea42087353fdf5 release com.vitorpamplona.negentropy:kmp-negentropy-jvm:v1.2.3 d005ae7d13d4fc0b5b498d554a880366554edef8c39ba123248676f360df3635 c4dfe76b4bdaa3442c5b8223778b0347e9bd9ab63f71a4b183ea42087353fdf5 release com.vitorpamplona.negentropy:kmp-negentropy:v1.2.3 d005ae7d13d4fc0b5b498d554a880366554edef8c39ba123248676f360df3635 c4dfe76b4bdaa3442c5b8223778b0347e9bd9ab63f71a4b183ea42087353fdf5 -release com.vitorpamplona.quartz:quartz-android:2.20.0 893d9b079b98f3aead17fbbceaa46902beb6707bdac2fea136cbe08a66c686b6 5b125908669198513ef9eae94c337280dd81b75cd55789bcd7ccbe1f7e3a8d66 release com.vitorpamplona.quartz:quartz-android:2.20.1 df33aeb958e33d98efbc3eca3ed5bc0349e9b96792c067f3176ed36bd695dd11 c03e2ec67995d7efd5a08231a83b8504c7c22dd011b64fb760d6dd5ce319a47a -release com.vitorpamplona.quartz:quartz-jvm:2.20.0 893d9b079b98f3aead17fbbceaa46902beb6707bdac2fea136cbe08a66c686b6 5b125908669198513ef9eae94c337280dd81b75cd55789bcd7ccbe1f7e3a8d66 release com.vitorpamplona.quartz:quartz-jvm:2.20.1 df33aeb958e33d98efbc3eca3ed5bc0349e9b96792c067f3176ed36bd695dd11 c03e2ec67995d7efd5a08231a83b8504c7c22dd011b64fb760d6dd5ce319a47a -release com.vitorpamplona.quartz:quartz:2.20.0 893d9b079b98f3aead17fbbceaa46902beb6707bdac2fea136cbe08a66c686b6 5b125908669198513ef9eae94c337280dd81b75cd55789bcd7ccbe1f7e3a8d66 release com.vitorpamplona.quartz:quartz:2.20.1 df33aeb958e33d98efbc3eca3ed5bc0349e9b96792c067f3176ed36bd695dd11 c03e2ec67995d7efd5a08231a83b8504c7c22dd011b64fb760d6dd5ce319a47a release com.vitorpamplona.schnorr256k1:schnorr256k1-kotlin-android:1.0.3 c8b474acf88c25958132495167bc27613f0db8492871fdced6bd4ac51a2a660e 004147e4e84462d3f867001b45e41b16eec93f0e00ca3668741c085be7af5c21 release com.vitorpamplona.schnorr256k1:schnorr256k1-kotlin-jvm:1.0.3 c8b474acf88c25958132495167bc27613f0db8492871fdced6bd4ac51a2a660e 004147e4e84462d3f867001b45e41b16eec93f0e00ca3668741c085be7af5c21