From 5f31efb45be4f7335789cb9f63904472f15b002d Mon Sep 17 00:00:00 2001 From: James Rich Date: Mon, 13 Apr 2026 06:39:56 -0500 Subject: [PATCH] fix(build): exclude material group from CMP version alignment material-icons-core is not published at CMP version tags, so forcing the androidx.compose.material group to 1.11.0-beta02 breaks resolution via the Glance -> Material3 -> material-icons-core transitive chain. --- .../kotlin/org/meshtastic/buildlogic/AndroidCompose.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/org/meshtastic/buildlogic/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/org/meshtastic/buildlogic/AndroidCompose.kt index a2de05df1..2a3961c89 100644 --- a/build-logic/convention/src/main/kotlin/org/meshtastic/buildlogic/AndroidCompose.kt +++ b/build-logic/convention/src/main/kotlin/org/meshtastic/buildlogic/AndroidCompose.kt @@ -32,14 +32,13 @@ internal fun Project.configureAndroidCompose(commonExtension: CommonExtension) { exclude(mapOf("group" to "androidx.compose", "module" to "compose-bom")) } - // CMP publishes core AndroidX groups at the CMP version tag (e.g. 1.11.0-beta02). - // Material/Material3/Adaptive are intentionally excluded — CMP maps those to - // different AndroidX version numbers (see release notes for the mapping table). + // CMP publishes these core AndroidX groups at the CMP version tag. + // Material, Material3, and Adaptive follow separate AndroidX version numbers + // and must NOT be included here (see CMP release notes for the mapping table). val cmpVersion = libs.version("compose-multiplatform") val cmpAlignedGroups = setOf( "androidx.compose.animation", "androidx.compose.foundation", - "androidx.compose.material", "androidx.compose.runtime", "androidx.compose.ui", )