Merge pull request #12316 from woocommerce/bump_aztec_2_1_4

Bump Aztec to `2.1.4`
woocommerce · Aug 19, 2024 · 34c51ae · 34c51ae
2 parents 0698fe9 + 2f5dca0
commit 34c51ae
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,6 +1,10 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 *** 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
@@ -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
@@ -39,7 +39,7 @@ open class WCBottomSheetDialogFragment : BottomSheetDialogFragment {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         dialog?.setOnShowListener {
             val dialog = it as BottomSheetDialog
-            dialog.findViewById<View>(org.wordpress.aztec.R.id.design_bottom_sheet)?.let { sheet ->
+            dialog.findViewById<View>(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
@@ -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'