build: quartz 2.20.0, marmot-kmp 2.3.0, mls-kmp 1.3.1 and crypto-kmp 2.1.1, through Magpie (quartz-mls-marmot-update, Phase 2)
None of the four is on Maven Central at these versions: they are released on Nostr + Blossom, and the Magpie settings plugin (0.2.3) serves the quartz, marmot, mls, crypto, negentropy and schnorr256k1 groups exclusively. The versions are marmot 2.3.0's own pins (D2), declared `strictly` so a transitive request cannot move them (D3). gradle/magpie.lock pins the release key and the manifest of every module resolved -- jvm, android and root so far; the iOS lines need a mac (Phase 6). No Kotlin file changed. The resolved graph moved by exactly the four libraries, negentropy v1.2.3 and the new schnorr256k1-kotlin; secp256k1-kmp still resolves to the composite. check green, jvmTest 1389/1389 with no test edited, release minifies through R8. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
971dd45947
commit
f56be2b358
4 files changed
+91
-17
No files matched your search
@@ -329,6 +329,32 @@ not only in the diff.
|
||||
- `releaseRuntimeClasspath` as well as debug, because R8 is where a class that quartz moved
|
||||
between modules would show.
|
||||
|
||||
**Built, and the compiler had nothing to say.** No Kotlin file changed. `settings.gradle.kts`
|
||||
applies Magpie 0.2.3 over the six groups, the catalogue names marmot 2.3.0's own pins with
|
||||
`strictly`, and the first build wrote `gradle/magpie.lock`. Its 27 lines are a header, six
|
||||
`publisher` lines (all the same key, vouched for by `nip05:releases@vitorpamplona.com`) and
|
||||
eighteen `release` lines: the root, `-jvm` and `-android` module of each of the six releases.
|
||||
As C4 predicted, there are no iOS lines.
|
||||
|
||||
- **Compile.** `compileDebugKotlinAndroid`, `compileKotlinJvm` and `compileTestKotlinJvm`
|
||||
were clean. The 85 deprecation warnings are all Compose's and AGP's (`LocalClipboardManager`,
|
||||
the non-mirrored icons, `runDesktopComposeUiTest`), which were there already. None names
|
||||
a quartz symbol.
|
||||
- **The resolved graph.** It moved by exactly the expected delta in all three runtime
|
||||
classpaths: the four libraries, negentropy v1.2.0 → v1.2.3, and schnorr256k1-kotlin (root
|
||||
plus `-jvm` or `-android`) added. That is 268 → 273 on jvm, 332 → 337 on debug and
|
||||
326 → 331 on release. Nothing outside the six groups moved. `secp256k1-kmp`, `-jni-jvm`
|
||||
and `-jni-android` still resolve to the composite's projects.
|
||||
- **The suite.** `./gradlew check` is green, and `jvmTest` runs 1389 tests in 182 classes
|
||||
with 0 failures, the same count as Phase 0. No test was edited.
|
||||
- **R8.** An unsigned `assembleRelease` minifies with the new graph and produces a 37 MB
|
||||
APK. No missing-class warnings. The one R8 warning is the deprecated
|
||||
`android.r8.optimizedResourceShrinking=false` in this repo's own `gradle.properties`.
|
||||
|
||||
Phase 1's commit also had to take `gradle/gradle-daemon-jvm.properties` out of
|
||||
`.gitignore`. It had been ignored since `8de05742`, most likely to keep an IDE-generated
|
||||
copy out of the tree. A file that states the build's daemon JVM has to be tracked.
|
||||
|
||||
## Phase 3 — what the swap means
|
||||
|
||||
Phase 2 ends when it compiles and the suite is green. This phase is for what is green and
|
||||
|
||||
+20
-17
@@ -13,11 +13,15 @@ coilCompose = "3.5.0"
|
||||
composeHotReload = "1.2.0"
|
||||
composeMultiplatform = "1.11.1"
|
||||
# SHA, HMAC, HKDF, AES, ChaCha20, X25519, Ed25519 and RandomInstance
|
||||
# (vitorpamplona/crypto-kmp). It arrives transitively under both quartz 2.x and mls-kmp,
|
||||
# and is declared because the app's source names it in 27 places: the two curves the
|
||||
# KeyPackage fixtures generate keys with, `RandomInstance.bytes` and `sha256`. Keep it at
|
||||
# the newer of the versions quartz and mls-kmp ask for, which is what gradle resolves anyway.
|
||||
cryptoKmp = "2.1.0"
|
||||
# (vitorpamplona/crypto-kmp). It arrives transitively under quartz, mls-kmp and marmot-kmp, and is
|
||||
# declared because the app's source names it in 27 places: the two curves the KeyPackage fixtures
|
||||
# generate keys with, `RandomInstance.bytes` and `sha256`. On Nostr + Blossom from 2.1.1, through
|
||||
# Magpie (settings.gradle.kts).
|
||||
#
|
||||
# This and the three below are `strictly`: gradle otherwise resolves to the highest version anything
|
||||
# asks for, so a library asking for a newer quartz or crypto would move it silently. Strict, the
|
||||
# catalog is the resolved graph. docs/quartz-mls-marmot-update.md, D3.
|
||||
cryptoKmp = { strictly = "2.1.1" }
|
||||
datastorePreferences = "1.2.1"
|
||||
junit = "4.13.2"
|
||||
kermit = "2.1.0"
|
||||
@@ -31,12 +35,13 @@ lightningKmpCore = "1.11.5"
|
||||
# Marmot (MIP-00..05), the three processors, convergence, the publish gate, the app
|
||||
# components and the KeyPackage managers (vitorpamplona/marmot-kmp). This is quartz's
|
||||
# former `marmot` package: 2.3.0 dropped the engine and kept only the event classes.
|
||||
# See docs/marmot-kmp.md.
|
||||
marmot = "2.2.1"
|
||||
# The RFC 9420 MLS engine (vitorpamplona/mls-kmp), which is quartz's former
|
||||
# `marmot.mls` package. Pinned by marmot 2.2.1 and named here so the catalog says
|
||||
# which engine reads the group state on every device.
|
||||
mls = "1.3.0"
|
||||
# See docs/marmot-kmp.md. On Nostr + Blossom from 2.3.0, whose source is 2.2.1's.
|
||||
marmot = { strictly = "2.3.0" }
|
||||
# The RFC 9420 MLS engine (vitorpamplona/mls-kmp), which is quartz's former `marmot.mls`
|
||||
# package. The version marmot 2.3.0 was built against, and named here so the catalog says
|
||||
# which engine reads the group state on every device. 1.4.0 is tagged but not released
|
||||
# (docs/quartz-mls-marmot-update.md, Phase 0).
|
||||
mls = { strictly = "1.3.1" }
|
||||
material3 = "1.10.0-alpha05"
|
||||
# The version material3 1.10.0-alpha05 itself resolves: its
|
||||
# material3-adaptive-navigation-suite pom asks for adaptive 1.2.0. Picking the newer
|
||||
@@ -49,12 +54,10 @@ materialIconsExtended = "1.7.3"
|
||||
navigationCompose = "2.9.2"
|
||||
okio = "3.18.1"
|
||||
qrose = "1.1.2"
|
||||
# Not the newest published (2.15.1): the version marmot 2.2.1 was compiled and tested
|
||||
# against. A quartz that moved an API marmot-kmp calls gives a NoSuchMethodError at run
|
||||
# time rather than a compile error, and gradle resolves to the highest of what is asked
|
||||
# for -- so this number has to be deliberate. Moving both forward is its own change, with
|
||||
# marmot-kmp's CI as the evidence. docs/marmot-kmp.md, D2.
|
||||
quartz = "2.7.3"
|
||||
# The version marmot 2.3.0 was compiled and tested against. A quartz that moved an API
|
||||
# marmot-kmp calls gives a NoSuchMethodError at run time rather than a compile error, so
|
||||
# moving past it is its own change, with its own evidence. docs/quartz-mls-marmot-update.md, D2.
|
||||
quartz = { strictly = "2.20.0" }
|
||||
room3 = "3.0.1"
|
||||
sqldelight = "2.3.2"
|
||||
sqlite = "2.7.0"
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
# Magpie lock file. Commit it: it pins the key each group's domain vouched for and the
|
||||
# manifest each resolved version came from. A change to either fails the build.
|
||||
version 1
|
||||
publisher com.vitorpamplona.crypto e9867c970848e300d6fca32bbd600c2fd4bd92c760ae5707355058720991955c nip05:releases@vitorpamplona.com
|
||||
publisher com.vitorpamplona.marmot e9867c970848e300d6fca32bbd600c2fd4bd92c760ae5707355058720991955c nip05:releases@vitorpamplona.com
|
||||
publisher com.vitorpamplona.mls e9867c970848e300d6fca32bbd600c2fd4bd92c760ae5707355058720991955c nip05:releases@vitorpamplona.com
|
||||
publisher com.vitorpamplona.negentropy e9867c970848e300d6fca32bbd600c2fd4bd92c760ae5707355058720991955c nip05:releases@vitorpamplona.com
|
||||
publisher com.vitorpamplona.quartz e9867c970848e300d6fca32bbd600c2fd4bd92c760ae5707355058720991955c nip05:releases@vitorpamplona.com
|
||||
publisher com.vitorpamplona.schnorr256k1 e9867c970848e300d6fca32bbd600c2fd4bd92c760ae5707355058720991955c nip05:releases@vitorpamplona.com
|
||||
release com.vitorpamplona.crypto:crypto-android:2.1.1 1012859c6c4548599c203c41f2126fcc0ca2138feae1f2acf84f42222f96825e 1c993cfd7b8b034a12ce66b20b1910a88f2c1816a39f3c284155fd8831acf80d
|
||||
release com.vitorpamplona.crypto:crypto-jvm:2.1.1 1012859c6c4548599c203c41f2126fcc0ca2138feae1f2acf84f42222f96825e 1c993cfd7b8b034a12ce66b20b1910a88f2c1816a39f3c284155fd8831acf80d
|
||||
release com.vitorpamplona.crypto:crypto:2.1.1 1012859c6c4548599c203c41f2126fcc0ca2138feae1f2acf84f42222f96825e 1c993cfd7b8b034a12ce66b20b1910a88f2c1816a39f3c284155fd8831acf80d
|
||||
release com.vitorpamplona.marmot:marmot-android:2.3.0 a24c22b76974376bb4c271e3dc973b12478d88af76b326ce55ca23ca66ce0aa0 b9498111dfc41c27fdb152869aa6d3f04052e2588ca9aac7a301a7dc7eb40341
|
||||
release com.vitorpamplona.marmot:marmot-jvm:2.3.0 a24c22b76974376bb4c271e3dc973b12478d88af76b326ce55ca23ca66ce0aa0 b9498111dfc41c27fdb152869aa6d3f04052e2588ca9aac7a301a7dc7eb40341
|
||||
release com.vitorpamplona.marmot:marmot:2.3.0 a24c22b76974376bb4c271e3dc973b12478d88af76b326ce55ca23ca66ce0aa0 b9498111dfc41c27fdb152869aa6d3f04052e2588ca9aac7a301a7dc7eb40341
|
||||
release com.vitorpamplona.mls:mls-android:1.3.1 afaee9458cfea00107297adeb93ef7315543288cdd008b4ed2dcf08d67f2c162 1b6b39440116e65adce199f237c878fbc3821d2e09946550af6b3852218fe086
|
||||
release com.vitorpamplona.mls:mls-jvm:1.3.1 afaee9458cfea00107297adeb93ef7315543288cdd008b4ed2dcf08d67f2c162 1b6b39440116e65adce199f237c878fbc3821d2e09946550af6b3852218fe086
|
||||
release com.vitorpamplona.mls:mls:1.3.1 afaee9458cfea00107297adeb93ef7315543288cdd008b4ed2dcf08d67f2c162 1b6b39440116e65adce199f237c878fbc3821d2e09946550af6b3852218fe086
|
||||
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-jvm:2.20.0 893d9b079b98f3aead17fbbceaa46902beb6707bdac2fea136cbe08a66c686b6 5b125908669198513ef9eae94c337280dd81b75cd55789bcd7ccbe1f7e3a8d66
|
||||
release com.vitorpamplona.quartz:quartz:2.20.0 893d9b079b98f3aead17fbbceaa46902beb6707bdac2fea136cbe08a66c686b6 5b125908669198513ef9eae94c337280dd81b75cd55789bcd7ccbe1f7e3a8d66
|
||||
release com.vitorpamplona.schnorr256k1:schnorr256k1-kotlin-android:1.0.3 c8b474acf88c25958132495167bc27613f0db8492871fdced6bd4ac51a2a660e 004147e4e84462d3f867001b45e41b16eec93f0e00ca3668741c085be7af5c21
|
||||
release com.vitorpamplona.schnorr256k1:schnorr256k1-kotlin-jvm:1.0.3 c8b474acf88c25958132495167bc27613f0db8492871fdced6bd4ac51a2a660e 004147e4e84462d3f867001b45e41b16eec93f0e00ca3668741c085be7af5c21
|
||||
release com.vitorpamplona.schnorr256k1:schnorr256k1-kotlin:1.0.3 c8b474acf88c25958132495167bc27613f0db8492871fdced6bd4ac51a2a660e 004147e4e84462d3f867001b45e41b16eec93f0e00ca3668741c085be7af5c21
|
||||
@@ -30,6 +30,24 @@ dependencyResolutionManagement {
|
||||
|
||||
plugins {
|
||||
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
|
||||
// quartz, mls-kmp, marmot-kmp and crypto-kmp are released on Nostr + Blossom, not Maven Central,
|
||||
// from quartz 2.19.0, mls 1.3.1, marmot 2.3.0 and crypto 2.1.1. Magpie serves the groups below
|
||||
// and nothing else, trusting only the key vitorpamplona.com's nostr.json names as `releases`;
|
||||
// gradle/magpie.lock pins that key and the manifest of every module resolved. Needs a Java 21
|
||||
// daemon (gradle/gradle-daemon-jvm.properties). docs/quartz-mls-marmot-update.md
|
||||
id("com.vitorpamplona.magpie") version "0.2.3"
|
||||
}
|
||||
|
||||
// Exclusive per group: none of these resolves from Maven Central any more, at any version.
|
||||
// negentropy and schnorr256k1 come in under quartz and are on neither Central nor anywhere else.
|
||||
// com.vitorpamplona.quic is marmot-quic's, which nothing here uses.
|
||||
magpie {
|
||||
group("com.vitorpamplona.quartz")
|
||||
group("com.vitorpamplona.marmot")
|
||||
group("com.vitorpamplona.mls")
|
||||
group("com.vitorpamplona.crypto")
|
||||
group("com.vitorpamplona.negentropy")
|
||||
group("com.vitorpamplona.schnorr256k1")
|
||||
}
|
||||
|
||||
include(":composeApp")
|
||||
|
||||
Reference in new issue
Block a user