Skip to content

Fix protolayout warning by updating its version #14797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 24, 2025
Merged

Fix protolayout warning by updating its version #14797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89e2388
Force androidx.wear.protolayout to 1.2.1
irfano Oct 21, 2025
97ae0ce
Remove unused wear dependencies
irfano Oct 21, 2025
597f812
Update RELEASE-NOTES.txt
irfano Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
-----
Expand Down
6 changes: 6 additions & 0 deletions WooCommerce-Wear/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ->
Expand Down
7 changes: 2 additions & 5 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ 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'
Copy link
Contributor

@JorgeMucientes JorgeMucientes Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this unused?

Copy link
Contributor Author

@irfano irfano Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. 🤔 They're defined in libs.versions.toml for androidx-wear-tiles-main and androidx-wear-tiles-material, but they're not used anywhere.
Implementation for those were removed recently (https://github.com/woocommerce/woocommerce-android/pull/14710/files) but those left behind in libs.versions.toml.

androidx-wear-protolayout = '1.2.1'
androidx-wear-tooling = '1.0.0'
androidx-wear-watchface = '1.2.1'
androidx-work = '2.10.5'
Expand Down Expand Up @@ -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" }
Expand Down Expand Up @@ -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" }
Expand Down