From 950c9efa566e92e643cbd0f975dfc68602bd67b3 Mon Sep 17 00:00:00 2001 From: James Rich <2199651+jamesarich@users.noreply.github.com> Date: Mon, 22 Jun 2026 11:09:44 -0500 Subject: [PATCH] chore(deps): track androidx.compose.material (M2) with the CMP-aligned compose ref (#5902) Co-authored-by: Claude Opus 4.8 --- .github/renovate.json | 3 ++- gradle/libs.versions.toml | 12 +++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 1469dbcee..ba277db37 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -62,7 +62,8 @@ "matchPackageNames": [ "/^org\\.jetbrains\\.compose/", "androidx.compose.runtime:runtime-tracing", - "androidx.compose.ui:ui-test-manifest" + "androidx.compose.ui:ui-test-manifest", + "androidx.compose.material:material" ] }, { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b25565535..22f164373 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -57,10 +57,6 @@ compose-multiplatform-material3 = "1.11.0-alpha07" # AndroidCompose.kt's resolutionStrategy force-aligns these groups to *this* version # at resolution time, so it is the source of truth for the Android target. androidx-compose-bom-aligned = "1.11.3" -# `androidx-compose-material` (M2) is independent of CMP. Pinned because -# maps-compose-widgets requests `androidx.compose.material:material` without -# a version (relying on a BOM that we exclude). M2 is frozen at 1.7.8. -androidx-compose-material = "1.7.8" jetbrains-adaptive = "1.3.0-beta02" # Google @@ -164,9 +160,11 @@ androidx-uiautomator = { module = "androidx.test.uiautomator:uiautomator", versi # AndroidX Compose (explicit versions — BOM removed; CMP is the sole version authority) androidx-compose-runtime-tracing = { module = "androidx.compose.runtime:runtime-tracing", version.ref = "androidx-compose-bom-aligned" } androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "androidx-compose-bom-aligned" } # Required by Robolectric Compose tests (registers ComponentActivity) -# M2 `material`, version-less from maps-compose-widgets (google). Declared explicitly so the version -# propagates to consumers of the app's graph (e.g. :baselineprofile); see androidApp/build.gradle.kts. -androidx-compose-material = { module = "androidx.compose.material:material", version.ref = "androidx-compose-material" } +# M2 `material` rides the same AndroidX train as the bom-aligned compose artifacts, so it shares +# that ref (stays aligned; Renovate bumps it with the compose group). Requested version-less by +# maps-compose-widgets (google), declared explicitly so the version propagates to consumers of the +# app's graph (e.g. :baselineprofile); see androidApp/build.gradle.kts. +androidx-compose-material = { module = "androidx.compose.material:material", version.ref = "androidx-compose-bom-aligned" } # Compose Multiplatform compose-multiplatform-animation = { module = "org.jetbrains.compose.animation:animation", version.ref = "compose-multiplatform" }