Merge pull request #14836 from woocommerce/merge/release-23.5-into-trunk

Merge release/23.5 into trunk

Author: JorgeMucientes

RELEASE-NOTES.txt

@@ -13,6 +13,7 @@
 -----
 - [Internal][Wear] Remove unused dependencies and optimize dependency scopes [https://github.com/woocommerce/woocommerce-android/pull/14710]
 - [Internal] Remove unused dependencies and optimize dependency scopes [https://github.com/woocommerce/woocommerce-android/pull/14710]
+- [Internal][Wear] Override Horologist’s transitive protolayout-expression dependency to fix known issues [https://github.com/woocommerce/woocommerce-android/pull/14797]
 - [*] 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]
 - [*] Fixed a rare media upload error [https://github.com/woocommerce/woocommerce-android/pull/14813]

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 ->

gradle/libs.versions.toml

@@ -34,7 +34,7 @@ androidx-test-orchestrator = '1.6.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'
 androidx-work = '2.10.5'
@@ -177,8 +177,7 @@ 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" }
 androidx-work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidx-work" }
@@ -220,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" }

version.properties

@@ -1,2 +1,2 @@
-versionName=23.5-rc-1
-versionCode=700
+versionName=23.5-rc-2
+versionCode=701