From 89e2388392721d912368ffe2b729c2a40a837aa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Irfan=20=C3=96m=C3=BCr?= Date: Tue, 21 Oct 2025 20:41:07 +0300 Subject: [PATCH 1/3] Force androidx.wear.protolayout to 1.2.1 Upgrades `androidx.wear.protolayout` to version `1.2.1` to resolve known issues present in the version previously used by Horologist. --- WooCommerce-Wear/build.gradle | 6 ++++++ gradle/libs.versions.toml | 2 ++ 2 files changed, 8 insertions(+) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index c068bfd69b76..6c2253995291 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -191,6 +191,12 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' exclude group: 'com.android.support', module: 'support-core-utils' } + + constraints { + implementation(libs.androidx.wear.protolayout.expression) { + because("Horologist 0.7.15 uses Wear ProtoLayout 1.0.0-beta01, which has known issues.") + } + } } android.buildTypes.all { buildType -> diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7fe580363946..cf2c4d2f6967 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -35,6 +35,7 @@ androidx-test-uiautomator = '2.3.0' androidx-transition = '1.6.0' androidx-wear-compose = '1.4.0' androidx-wear-tiles = '1.3.0' +androidx-wear-protolayout = '1.2.1' androidx-wear-tooling = '1.0.0' androidx-wear-watchface = '1.2.1' androidx-work = '2.10.5' @@ -179,6 +180,7 @@ androidx-wear-compose-material = { group = "androidx.wear.compose", name = "comp androidx-wear-compose-foundation = { group = "androidx.wear.compose", name = "compose-foundation", version.ref = "androidx-wear-compose" } androidx-wear-tiles-main = { group = "androidx.wear.tiles", name = "tiles", version.ref = "androidx-wear-tiles" } androidx-wear-tiles-material = { group = "androidx.wear.tiles", name = "tiles-material", version.ref = "androidx-wear-tiles" } +androidx-wear-protolayout-expression = { group = "androidx.wear.protolayout", name = "protolayout-expression", version.ref = "androidx-wear-protolayout" } androidx-wear-tooling-preview = { group = "androidx.wear", name = "wear-tooling-preview", version.ref = "androidx-wear-tooling" } androidx-wear-watchface-complications-data-source-ktx = { group = "androidx.wear.watchface", name = "watchface-complications-data-source-ktx", version.ref = "androidx-wear-watchface" } androidx-work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidx-work" } From 97ae0ce5b589ecf13da01af0b56f7b4c5a464aa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Irfan=20=C3=96m=C3=BCr?= Date: Tue, 21 Oct 2025 20:49:22 +0300 Subject: [PATCH 2/3] Remove unused wear dependencies --- gradle/libs.versions.toml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cf2c4d2f6967..baf79856d7b1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -34,7 +34,6 @@ androidx-test-orchestrator = '1.5.1' androidx-test-uiautomator = '2.3.0' androidx-transition = '1.6.0' androidx-wear-compose = '1.4.0' -androidx-wear-tiles = '1.3.0' androidx-wear-protolayout = '1.2.1' androidx-wear-tooling = '1.0.0' androidx-wear-watchface = '1.2.1' @@ -178,8 +177,6 @@ androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiaut androidx-transition = { group = "androidx.transition", name = "transition", version.ref = "androidx-transition" } androidx-wear-compose-material = { group = "androidx.wear.compose", name = "compose-material", version.ref = "androidx-wear-compose" } androidx-wear-compose-foundation = { group = "androidx.wear.compose", name = "compose-foundation", version.ref = "androidx-wear-compose" } -androidx-wear-tiles-main = { group = "androidx.wear.tiles", name = "tiles", version.ref = "androidx-wear-tiles" } -androidx-wear-tiles-material = { group = "androidx.wear.tiles", name = "tiles-material", version.ref = "androidx-wear-tiles" } androidx-wear-protolayout-expression = { group = "androidx.wear.protolayout", name = "protolayout-expression", version.ref = "androidx-wear-protolayout" } androidx-wear-tooling-preview = { group = "androidx.wear", name = "wear-tooling-preview", version.ref = "androidx-wear-tooling" } androidx-wear-watchface-complications-data-source-ktx = { group = "androidx.wear.watchface", name = "watchface-complications-data-source-ktx", version.ref = "androidx-wear-watchface" } @@ -222,8 +219,6 @@ google-firebase-messaging = { group = "com.google.firebase", name = "firebase-me google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "google-gson" } google-guava = { group = "com.google.guava", name = "guava", version.ref = "google-guava" } google-horologist-compose-layout = { group = "com.google.android.horologist", name = "horologist-compose-layout", version.ref = "google-horologist" } -google-horologist-compose-tools = { group = "com.google.android.horologist", name = "horologist-compose-tools", version.ref = "google-horologist" } -google-horologist-tiles = { group = "com.google.android.horologist", name = "horologist-tiles", version.ref = "google-horologist" } google-material = { group = "com.google.android.material", name = "material", version.ref = "google-material" } google-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "google-compose-material3" } google-mlkit-barcode-scanning = { group = "com.google.mlkit", name = "barcode-scanning", version.ref = "google-mlkit-barcode-scanning" } From 597f812ca4f5b54613443a0b932cd697e877c52c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Irfan=20=C3=96m=C3=BCr?= Date: Tue, 21 Oct 2025 21:34:52 +0300 Subject: [PATCH 3/3] Update RELEASE-NOTES.txt --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index c072baac7a82..efded6733380 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -11,6 +11,7 @@ - [Internal] Remove unused dependencies and optimize dependency scopes [https://github.com/woocommerce/woocommerce-android/pull/14710] - [*] Fix a rare crash in order refund flow [https://github.com/woocommerce/woocommerce-android/pull/14742] - [*] Fix customer name display when filtering orders from order details [https://github.com/woocommerce/woocommerce-android/pull/14761] +- [Internal][Wear] Override Horologist’s transitive protolayout-expression dependency to fix known issues [https://github.com/woocommerce/woocommerce-android/pull/14797] 23.4 -----