quartz 1.15.2 -> 2.7.3, and the engine it used to carry from marmot 2.2.1 over mls 1.3.0
over crypto 2.1.0. docs/scripts/marmot-kmp-imports.sh --apply moved 187 lines by the rule;
42 `quartz.marmot` imports stay, which are the event classes quartz kept.
The 854 non-Marmot quartz imports came through the major bump without an edit. All 45
compile errors were in the engine seam, and 44 were one thing: five accessors that were
members of `MlsGroup` in quartz's engine are extension functions in marmot-kmp
(`currentGroupState`, `currentMarmotData`, `currentNostrGroupId`, `currentAdminIdentities`,
`isLocalAdmin`), so 14 files import one now. The 45th, `buildCurrentProfileFrom`, likewise.
No constructor the app drives changed shape, and `GroupEventResult` still has exactly nine
variants -- `MarmotEngine`'s exhaustive `when` compiling is the proof there is no tenth to
drop on the floor.
One change here is not a rename. `MlsGroupPolicy` is new in mls-kmp: quartz's engine
hardcoded Marmot's rules, mls-kmp made them an argument, and every factory defaults it to
`Permissive` -- so the eleven places this app builds a group itself were building a
non-Marmot group. The loud half is that `commitExporter` is then null, `preCommitExporterSecret`
comes back empty and `GroupEventEncryption.encrypt` refuses it ("Group key must be 32
bytes"), which is the one test that failed. The silent half matters more: `Permissive`
greases the leaf's capabilities, which MDK has never been tested against; it knows neither
`0xF2EE` nor the app-data dictionary, so RFC 9420 13.4 refuses a GroupContextExtensions
proposal in a group we are a member of; and it authorizes every commit, proposal and
SelfRemove without a check. So `MarmotGroupPolicy` goes in at all eleven. The
current-profile paths needed none -- `CurrentProfileGroupFactory` and every
`MlsGroupManager` entry point pass it themselves.
1149 tests, 0 failures; compileDebugKotlinAndroid clean; the three audits unchanged.
Import blocks were re-sorted in the touched files only: 253 further files in composeApp
have blocks that were already out of order, and C2 is the reason to leave them be.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
130 lines
9.1 KiB
TOML
130 lines
9.1 KiB
TOML
[versions]
|
|
agp = "9.4.0"
|
|
android-compileSdk = "37"
|
|
android-minSdk = "26"
|
|
android-targetSdk = "37"
|
|
androidx-activity = "1.13.0"
|
|
androidx-appcompat = "1.8.0"
|
|
androidx-core = "1.19.0"
|
|
androidx-espresso = "3.7.0"
|
|
androidx-lifecycle = "2.11.0"
|
|
androidx-testExt = "1.3.0"
|
|
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"
|
|
datastorePreferences = "1.2.1"
|
|
junit = "4.13.2"
|
|
kermit = "2.1.0"
|
|
kotlin = "2.4.10"
|
|
kotlinx-coroutines = "1.11.0"
|
|
kotlinx-datetime = "0.8.0"
|
|
kotlinxSerialization = "1.11.0"
|
|
ksp = "2.3.6"
|
|
ktor = "3.5.2"
|
|
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"
|
|
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
|
|
# 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
|
|
# through `supportLargeAndXLargeWidth`.
|
|
material3Adaptive = "1.2.0"
|
|
materialIconsCore = "1.7.3"
|
|
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"
|
|
room3 = "3.0.1"
|
|
sqldelight = "2.3.2"
|
|
sqlite = "2.7.0"
|
|
|
|
[libraries]
|
|
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core" }
|
|
androidx-testExt-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-testExt" }
|
|
androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-espresso" }
|
|
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
|
|
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
|
|
androidx-datastore = { module = "androidx.datastore:datastore", version.ref = "datastorePreferences" }
|
|
androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastorePreferences" }
|
|
androidx-sqlite-bundled = { module = "androidx.sqlite:sqlite-bundled", version.ref = "sqlite" }
|
|
androidx-sqlite-bundled-jvm = { module = "androidx.sqlite:sqlite-bundled-jvm", version.ref = "sqlite" }
|
|
androidx-room3-runtime = { module = "androidx.room3:room3-runtime", version.ref = "room3" }
|
|
androidx-room3-compiler = { module = "androidx.room3:room3-compiler", version.ref = "room3" }
|
|
androidx-room3-sqlite-wrapper = { module = "androidx.room3:room3-sqlite-wrapper", version.ref = "room3" }
|
|
androidx-lifecycle-viewmodelCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
|
|
androidx-lifecycle-runtimeCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }
|
|
coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coilCompose" }
|
|
coil-network-ktor3 = { module = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coilCompose" }
|
|
compose-components-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "composeMultiplatform" }
|
|
compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "composeMultiplatform" }
|
|
compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "composeMultiplatform" }
|
|
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.
|
|
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" }
|
|
compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "composeMultiplatform" }
|
|
compose-uiTooling = { module = "org.jetbrains.compose.ui:ui-tooling", version.ref = "composeMultiplatform" }
|
|
compose-uiToolingPreview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "composeMultiplatform" }
|
|
junit = { module = "junit:junit", version.ref = "junit" }
|
|
kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
|
|
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
|
|
kotlin-testJunit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
|
|
kotlinx-coroutinesSwing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" }
|
|
kotlinx-coroutinesTest = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
|
|
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
|
|
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerialization" }
|
|
kotlinx-serialization-cbor = { module = "org.jetbrains.kotlinx:kotlinx-serialization-cbor", version.ref = "kotlinxSerialization" }
|
|
ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
|
|
ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
|
|
ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" }
|
|
ktor-client-websockets = { module = "io.ktor:ktor-client-websockets", version.ref = "ktor" }
|
|
ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
|
|
lightning-kmp-core = { module = "fr.acinq.lightning:lightning-kmp-core", version.ref = "lightningKmpCore" }
|
|
navigation-compose = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "navigationCompose" }
|
|
okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
|
|
qrose = { module = "io.github.alexzhirkevich:qrose", version.ref = "qrose" }
|
|
sqldelight-android-driver = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }
|
|
sqldelight-coroutines-extensions = { module = "app.cash.sqldelight:coroutines-extensions", version.ref = "sqldelight" }
|
|
sqldelight-native-driver = { module = "app.cash.sqldelight:native-driver", version.ref = "sqldelight" }
|
|
sqldelight-runtime = { module = "app.cash.sqldelight:runtime", version.ref = "sqldelight" }
|
|
sqldelight-sqlite-driver = { module = "app.cash.sqldelight:sqlite-driver", version.ref = "sqldelight" }
|
|
vitorpamplona-crypto = { module = "com.vitorpamplona.crypto:crypto", version.ref = "cryptoKmp" }
|
|
vitorpamplona-marmot = { module = "com.vitorpamplona.marmot:marmot", version.ref = "marmot" }
|
|
vitorpamplona-mls = { module = "com.vitorpamplona.mls:mls", version.ref = "mls" }
|
|
vitorpamplona-quartz = { module = "com.vitorpamplona.quartz:quartz", version.ref = "quartz" }
|
|
|
|
[plugins]
|
|
androidApplication = { id = "com.android.application", version.ref = "agp" }
|
|
androidx-room3 = { id = "androidx.room3", version.ref = "room3" }
|
|
androidLibrary = { id = "com.android.library", version.ref = "agp" }
|
|
composeHotReload = { id = "org.jetbrains.compose.hot-reload", version.ref = "composeHotReload" }
|
|
composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "composeMultiplatform" }
|
|
composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
|
|
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
|
|
kotlinPluginSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
|
|
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
|
|
sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" } |