diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 23dd8bd0285..7a55198c1b0 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,6 +1,10 @@ *** PLEASE FOLLOW THIS FORMAT: [] [] *** Use [*****] to indicate smoke tests of all critical flows should be run on the final APK before release (e.g. major library or targetSdk updates). *** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too. +20.1 +----- +- [*****] [Internal] Update Aztec from v1.3.45 to v2.1.4 [https://github.com/woocommerce/woocommerce-android/pull/12316] + 20.0 ----- - [*] Fixed missing pictures in card reader tutorial on tablets [https://github.com/woocommerce/woocommerce-android/pull/12274] @@ -10,7 +14,6 @@ - [*] [Internal] [Login] Switched back to using the `/token` endpoint for WordPress.com authentication, this fixes an issue where the SMS OTP is not triggered automatically after submitting the password [https://github.com/woocommerce/woocommerce-android/pull/12319] - [*] [Internal] [WEAR] Introduces Sentry support to the Wear app - 19.9 ----- - [*] Added subtotal and taxes fields to each refund item on the refund screen. [https://github.com/woocommerce/woocommerce-android/pull/12235] 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 8250f739661..1758c77b79a 100644 --- a/build.gradle +++ b/build.gradle @@ -110,7 +110,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'