From 96aec1263a765c7e8860100c6a91f342ef92c448 Mon Sep 17 00:00:00 2001 From: Wojtek Zieba Date: Tue, 13 Aug 2024 15:09:53 +0200 Subject: [PATCH 1/2] Bump Aztec to `2.1.4` Adjust artifact coordinates, use `design_bottom_sheet` from `material` library (instead of referencing to aztec's file, which I'm guessing was added by a mistake) --- WooCommerce/build.gradle | 5 +++-- .../android/widgets/WCBottomSheetDialogFragment.kt | 2 +- build.gradle | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 4595c250350..20f1c7292de 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -72,6 +72,7 @@ repositories { includeGroup "com.automattic" includeGroup "com.automattic.tracks" includeGroup "com.gravatar" + includeGroup "org.wordpress.aztec" } } maven { @@ -281,13 +282,13 @@ dependencies { exclude group: "org.wordpress", module: "fluxc" } - implementation("com.github.wordpress-mobile.WordPress-Aztec-Android:aztec:$aztecVersion") { + implementation("org.wordpress:aztec:$aztecVersion") { exclude group: "com.android.volley" exclude group: "com.android.support" exclude group: "org.wordpress", module: "utils" } - implementation("com.github.wordpress-mobile.WordPress-Aztec-Android:glide-loader:$aztecVersion") { + implementation("org.wordpress.aztec:glide-loader:$aztecVersion") { exclude group: "com.android.volley" exclude group: "com.android.support" exclude group: "org.wordpress", module: "utils" diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/widgets/WCBottomSheetDialogFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/widgets/WCBottomSheetDialogFragment.kt index 6ba95364494..a8a8b572dc6 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/widgets/WCBottomSheetDialogFragment.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/widgets/WCBottomSheetDialogFragment.kt @@ -39,7 +39,7 @@ open class WCBottomSheetDialogFragment : BottomSheetDialogFragment { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { dialog?.setOnShowListener { val dialog = it as BottomSheetDialog - dialog.findViewById(org.wordpress.aztec.R.id.design_bottom_sheet)?.let { sheet -> + dialog.findViewById(com.google.android.material.R.id.design_bottom_sheet)?.let { sheet -> // if device height is 32dp bigger than sheet height, show full sheet val heightPixels = view.context.resources.displayMetrics.heightPixels val topPadding = DisplayUtils.dpToPx(context, TOP_OFFSET_BEFORE_SHOWING_FULL_SHEET_DP) diff --git a/build.gradle b/build.gradle index 7447b47f3a4..5d3020b0d23 100644 --- a/build.gradle +++ b/build.gradle @@ -109,7 +109,7 @@ ext { googlePlayWearableVersion = '18.1.0' coroutinesVersion = '1.8.1' lifecycleVersion = '2.7.0' - aztecVersion = 'v1.3.45' + aztecVersion = 'v2.1.4' flipperVersion = '0.176.1' stateMachineVersion = '0.2.0' coreKtxVersion = '1.13.1' From 8498241840d995455472d309feac03761160363a Mon Sep 17 00:00:00 2001 From: Wojtek Zieba Date: Wed, 14 Aug 2024 11:05:06 +0200 Subject: [PATCH 2/2] Add release notes --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 0fcff6dcd11..e756c3904df 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -3,6 +3,7 @@ *** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too. 20.0 ----- +- [*****] [Internal] Update Aztec from v1.3.45 to v2.1.4 [https://github.com/woocommerce/woocommerce-android/pull/12316] 19.9