Skip to content

Commit 4257e7b

Browse files
jamesarichCopilot
andauthored
chore(deps): split androidx-compose version ref from CMP (#5183)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 14e86b9 commit 4257e7b

2 files changed

Lines changed: 20 additions & 5 deletions

File tree

.github/renovate.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,15 @@
5656
"changelogUrl": "https://github.com/meshtastic/protobufs/compare/{{currentDigest}}...{{newDigest}}",
5757
"automerge": true
5858
},
59+
{
60+
"description": "Group CMP and the androidx.compose artifacts that track it so Renovate bumps them together (see PR #5180)",
61+
"groupName": "compose-multiplatform",
62+
"matchPackageNames": [
63+
"/^org\\.jetbrains\\.compose/",
64+
"androidx.compose.runtime:runtime-tracing",
65+
"androidx.compose.ui:ui-test-manifest"
66+
]
67+
},
5968
{
6069
"description": "Restrict sensitive infrastructure to manual minor updates",
6170
"matchUpdateTypes": [

gradle/libs.versions.toml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,17 @@ turbine = "1.2.1"
3535
# Compose Multiplatform
3636
compose-multiplatform = "1.11.0-beta02"
3737
compose-multiplatform-material3 = "1.11.0-alpha06"
38+
# `androidx-compose-bom-aligned` tracks androidx.compose.{runtime,ui} test/tracing
39+
# artifacts that ship in lockstep with CMP. Kept as a separate version ref so Renovate
40+
# can bump androidx releases (which often land first) without dragging the
41+
# `org.jetbrains.compose:*` artifacts and Gradle plugin to a version JetBrains
42+
# hasn't published yet (see PR #5180). Should normally match `compose-multiplatform`;
43+
# AndroidCompose.kt's resolutionStrategy force-aligns these groups to the CMP version
44+
# at resolution time regardless of the declared value here.
45+
androidx-compose-bom-aligned = "1.11.0-beta02"
3846
# `androidx-compose-material` (M2) is independent of CMP and pinned separately
3947
# because some third-party libs (maps-compose-widgets, datadog) drag in
40-
# unversioned material transitives. Test/tracing artifacts in the
41-
# androidx.compose.{runtime,ui} groups MUST track CMP — use compose-multiplatform
42-
# as their version ref, not a separate pin.
48+
# unversioned material transitives.
4349
androidx-compose-material = "1.7.8"
4450
jetbrains-adaptive = "1.3.0-alpha06"
4551

@@ -122,8 +128,8 @@ androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version
122128
androidx-work-testing = { module = "androidx.work:work-testing", version = "2.11.2" }
123129

124130
# AndroidX Compose (explicit versions — BOM removed; CMP is the sole version authority)
125-
androidx-compose-runtime-tracing = { module = "androidx.compose.runtime:runtime-tracing", version.ref = "compose-multiplatform" }
126-
androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "compose-multiplatform" } # Required by Robolectric Compose tests (registers ComponentActivity)
131+
androidx-compose-runtime-tracing = { module = "androidx.compose.runtime:runtime-tracing", version.ref = "androidx-compose-bom-aligned" }
132+
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)
127133

128134
# Compose Multiplatform
129135
compose-multiplatform-animation = { module = "org.jetbrains.compose.animation:animation", version.ref = "compose-multiplatform" }

0 commit comments

Comments
 (0)