From 47c5465b3df06b6db5f8c24365cc0d3cd215aaf7 Mon Sep 17 00:00:00 2001 From: James Rich Date: Fri, 17 Apr 2026 15:21:35 -0500 Subject: [PATCH] chore(deps): downgrade compose-multiplatform / material3 / androidx-compose to stable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Prophylactic downgrade off the bleeding-edge Compose stack while we hunt the internal-build animation freeze that first appeared on CMP 1.11.0-beta02. - compose-multiplatform 1.11.0-beta02 -> 1.10.3 (latest stable) - compose-multiplatform-material3 1.11.0-alpha06 -> 1.10.0-alpha05 (no 1.10.x stable exists; alpha05 is the matching pre-release for CMP 1.10) - androidx-compose 1.11.0-rc01 -> 1.10.3 (paired with CMP 1.10.3) Adds @file:OptIn(ExperimentalMaterial3ExpressiveApi::class) to the call sites that use MaterialTheme.typography.titleMediumEmphasized — that typography is stable in 1.11 but experimental in the 1.10 train. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../org/meshtastic/feature/node/component/NodeItem.kt | 2 ++ .../meshtastic/feature/node/metrics/DeviceMetrics.kt | 2 ++ .../feature/node/metrics/EnvironmentMetrics.kt | 2 ++ .../meshtastic/feature/node/metrics/HostMetricsLog.kt | 2 ++ .../feature/node/metrics/MetricLogComponents.kt | 3 +++ .../org/meshtastic/feature/node/metrics/PaxMetrics.kt | 3 +++ .../meshtastic/feature/node/metrics/PowerMetrics.kt | 2 ++ .../meshtastic/feature/node/metrics/SignalMetrics.kt | 3 +++ .../meshtastic/feature/node/metrics/TracerouteLog.kt | 2 ++ gradle/libs.versions.toml | 10 +++++++--- 10 files changed, 28 insertions(+), 3 deletions(-) diff --git a/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/component/NodeItem.kt b/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/component/NodeItem.kt index 22f4422ad..3a608f9b6 100644 --- a/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/component/NodeItem.kt +++ b/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/component/NodeItem.kt @@ -15,6 +15,7 @@ * along with this program. If not, see . */ @file:Suppress("MagicNumber") +@file:OptIn(ExperimentalMaterial3ExpressiveApi::class) package org.meshtastic.feature.node.component @@ -31,6 +32,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text diff --git a/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/DeviceMetrics.kt b/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/DeviceMetrics.kt index 609048a92..40096d805 100644 --- a/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/DeviceMetrics.kt +++ b/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/DeviceMetrics.kt @@ -15,6 +15,7 @@ * along with this program. If not, see . */ @file:Suppress("MagicNumber") +@file:OptIn(ExperimentalMaterial3ExpressiveApi::class) package org.meshtastic.feature.node.metrics @@ -30,6 +31,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.material3.Text diff --git a/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/EnvironmentMetrics.kt b/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/EnvironmentMetrics.kt index d09bdc8d1..b11858d60 100644 --- a/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/EnvironmentMetrics.kt +++ b/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/EnvironmentMetrics.kt @@ -15,6 +15,7 @@ * along with this program. If not, see . */ @file:Suppress("TooManyFunctions") +@file:OptIn(ExperimentalMaterial3ExpressiveApi::class) package org.meshtastic.feature.node.metrics @@ -29,6 +30,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.material3.Text diff --git a/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/HostMetricsLog.kt b/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/HostMetricsLog.kt index 2cbf008e1..d5f6ba1c5 100644 --- a/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/HostMetricsLog.kt +++ b/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/HostMetricsLog.kt @@ -15,6 +15,7 @@ * along with this program. If not, see . */ @file:Suppress("MagicNumber") +@file:OptIn(ExperimentalMaterial3ExpressiveApi::class) package org.meshtastic.feature.node.metrics @@ -36,6 +37,7 @@ import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults import androidx.compose.material3.DropdownMenu +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ProgressIndicatorDefaults diff --git a/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/MetricLogComponents.kt b/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/MetricLogComponents.kt index 92e929056..653293835 100644 --- a/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/MetricLogComponents.kt +++ b/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/MetricLogComponents.kt @@ -14,6 +14,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +@file:OptIn(ExperimentalMaterial3ExpressiveApi::class) + package org.meshtastic.feature.node.metrics import androidx.compose.foundation.BorderStroke @@ -33,6 +35,7 @@ import androidx.compose.foundation.text.selection.SelectionContainer import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text diff --git a/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/PaxMetrics.kt b/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/PaxMetrics.kt index b3b0b36e0..7d482eff6 100644 --- a/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/PaxMetrics.kt +++ b/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/PaxMetrics.kt @@ -14,6 +14,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +@file:OptIn(ExperimentalMaterial3ExpressiveApi::class) + package org.meshtastic.feature.node.metrics import androidx.compose.foundation.layout.Column @@ -26,6 +28,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable diff --git a/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/PowerMetrics.kt b/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/PowerMetrics.kt index 5a71659f8..8e4de3a09 100644 --- a/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/PowerMetrics.kt +++ b/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/PowerMetrics.kt @@ -15,6 +15,7 @@ * along with this program. If not, see . */ @file:Suppress("MagicNumber") +@file:OptIn(ExperimentalMaterial3ExpressiveApi::class) package org.meshtastic.feature.node.metrics @@ -30,6 +31,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.rememberScrollState +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.FilterChip import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text diff --git a/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/SignalMetrics.kt b/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/SignalMetrics.kt index 4931d8c59..e30046623 100644 --- a/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/SignalMetrics.kt +++ b/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/SignalMetrics.kt @@ -14,6 +14,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +@file:OptIn(ExperimentalMaterial3ExpressiveApi::class) + package org.meshtastic.feature.node.metrics import androidx.compose.foundation.layout.Arrangement @@ -29,6 +31,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable diff --git a/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/TracerouteLog.kt b/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/TracerouteLog.kt index d4d8c0d17..671dda86f 100644 --- a/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/TracerouteLog.kt +++ b/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/TracerouteLog.kt @@ -15,6 +15,7 @@ * along with this program. If not, see . */ @file:Suppress("MagicNumber") +@file:OptIn(ExperimentalMaterial3ExpressiveApi::class) package org.meshtastic.feature.node.metrics @@ -36,6 +37,7 @@ import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults import androidx.compose.material3.DropdownMenu +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 12ab9480c..60d351766 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -33,12 +33,16 @@ testRetry = "1.6.4" turbine = "1.2.1" # Compose Multiplatform -compose-multiplatform = "1.11.0-beta02" -compose-multiplatform-material3 = "1.11.0-alpha06" +# Pinned to the latest stable CMP train while we investigate the animation-freeze +# regression that first appeared on 1.11.0-beta02 (see PR #5174 / internal.60 history). +# `compose-multiplatform-material3` has no 1.10.x stable — 1.10.0-alpha05 is the +# matching pre-release that pairs with CMP 1.10.x. +compose-multiplatform = "1.10.3" +compose-multiplatform-material3 = "1.10.0-alpha05" # AndroidX Compose test/tracing artifacts share a version track with CMP but are resolved # independently by Maven. Pinning them to their own ref prevents Renovate from bumping the # CMP plugin version when a new AndroidX Compose pre-release appears. -androidx-compose = "1.11.0-rc01" +androidx-compose = "1.10.3" androidx-compose-material = "1.7.8" jetbrains-adaptive = "1.3.0-alpha06"