Skip to content
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.

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

Bump Aztec to 2.1.4 #12316

Merged
merged 3 commits into from
Aug 19, 2024
Merged

Bump Aztec to 2.1.4 #12316

merged 3 commits into from
Aug 19, 2024

Conversation

wzieba
Copy link
Contributor

@wzieba wzieba commented Aug 13, 2024

Fixes: https://github.com/woocommerce/woocommerce-android/security/dependabot/91

Description

This PR bumps Aztec to 2.1.4 to address vulnerabilities of transitive dependencies.

Testing information

Open editor (e.g. product description) and perform a few basic text edit operations.

  • I have considered adding unit tests for this change. If I decided not to add them, I have provided a brief explanation below (optional):
  • I have considered if this change warrants release notes and have added them to RELEASE-NOTES.txt if necessary. Use the "[Internal]" label for non-user-facing changes.

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)
@@ -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 ->
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Referencing to org.wordpress.aztec was added in this commit: 4057a88 which looks like a mistake/unwanted changed rather than specifically reference design_bottom_sheet (3rd party xml file) from Aztec library.

Copy link
Contributor

Choose a reason for hiding this comment

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

Makes sense, thanks for updating it! 🥇

@wpmobilebot
Copy link
Collaborator

wpmobilebot commented Aug 13, 2024

📲 You can test the changes from this Pull Request in WooCommerce-Wear Android by scanning the QR code below to install the corresponding build.
App Name WooCommerce-Wear Android
Platform⌚️ Wear OS
FlavorJalapeno
Build TypeDebug
Commit2f5dca0
Direct Downloadwoocommerce-wear-prototype-build-pr12316-2f5dca0.apk

@wpmobilebot
Copy link
Collaborator

wpmobilebot commented Aug 13, 2024

📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.

App Name WooCommerce Android
Platform📱 Mobile
FlavorJalapeno
Build TypeDebug
Commit2f5dca0
Direct Downloadwoocommerce-prototype-build-pr12316-2f5dca0.apk

@codecov-commenter
Copy link

codecov-commenter commented Aug 13, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 40.06%. Comparing base (0698fe9) to head (2f5dca0).
Report is 4 commits behind head on trunk.

Additional details and impacted files
@@            Coverage Diff            @@
##              trunk   #12316   +/-   ##
=========================================
  Coverage     40.06%   40.06%           
  Complexity     5600     5600           
=========================================
  Files          1220     1220           
  Lines         69316    69316           
  Branches       9513     9513           
=========================================
  Hits          27771    27771           
  Misses        39011    39011           
  Partials       2534     2534           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@wzieba wzieba added this to the 20.0 milestone Aug 14, 2024
@wzieba wzieba marked this pull request as ready for review August 14, 2024 09:02
@wzieba wzieba requested a review from ParaskP7 August 14, 2024 09:02
@ThomazFB ThomazFB modified the milestones: 20.0, 20.1 Aug 16, 2024
Copy link
Contributor

@ParaskP7 ParaskP7 left a comment

Choose a reason for hiding this comment

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

👋 @wzieba !

I have reviewed and tested this PR as per the instructions, everything works as expected, good job! 🌟

@wpmobilebot
Copy link
Collaborator

Found 1 violations:

The PR caused the following dependency changes:

expand

-+--- com.github.wordpress-mobile.WordPress-Aztec-Android:aztec:v1.3.45
-|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.11 -> 1.9.25 (*)
-|    +--- org.ccil.cowan.tagsoup:tagsoup:1.2.1
-|    +--- org.jsoup:jsoup:1.11.3
-|    +--- androidx.legacy:legacy-support-v4:1.0.0
-|    |    +--- androidx.core:core:1.0.0 -> 1.13.1 (*)
-|    |    +--- androidx.media:media:1.0.0
-|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
-|    |    |    +--- androidx.core:core:1.0.0 -> 1.13.1 (*)
-|    |    |    \--- androidx.versionedparcelable:versionedparcelable:1.0.0 -> 1.1.1 (*)
-|    |    +--- androidx.legacy:legacy-support-core-utils:1.0.0 (*)
-|    |    +--- androidx.legacy:legacy-support-core-ui:1.0.0
-|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
-|    |    |    +--- androidx.core:core:1.0.0 -> 1.13.1 (*)
-|    |    |    +--- androidx.legacy:legacy-support-core-utils:1.0.0 (*)
-|    |    |    +--- androidx.customview:customview:1.0.0 -> 1.1.0 (*)
-|    |    |    +--- androidx.viewpager:viewpager:1.0.0 (*)
-|    |    |    +--- androidx.coordinatorlayout:coordinatorlayout:1.0.0 -> 1.1.0 (*)
-|    |    |    +--- androidx.drawerlayout:drawerlayout:1.0.0 -> 1.1.1 (*)
-|    |    |    +--- androidx.slidingpanelayout:slidingpanelayout:1.0.0 -> 1.2.0 (*)
-|    |    |    +--- androidx.interpolator:interpolator:1.0.0 (*)
-|    |    |    +--- androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -> 1.1.0 (*)
-|    |    |    +--- androidx.asynclayoutinflater:asynclayoutinflater:1.0.0
-|    |    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
-|    |    |    |    \--- androidx.core:core:1.0.0 -> 1.13.1 (*)
-|    |    |    \--- androidx.cursoradapter:cursoradapter:1.0.0 (*)
-|    |    \--- androidx.fragment:fragment:1.0.0 -> 1.8.2 (*)
-|    +--- com.google.android.material:material:1.0.0 -> 1.12.0 (*)
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0 -> 1.8.1 (*)
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.0 -> 1.8.1 (*)
-|    \--- org.apache.commons:commons-lang3:3.8.1 -> 3.12.0
-\--- com.github.wordpress-mobile.WordPress-Aztec-Android:glide-loader:v1.3.45
-     +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.11 -> 1.9.25 (*)
-     +--- com.github.wordpress-mobile.WordPress-Aztec-Android:aztec:v1.3.45 (*)
-     \--- com.github.bumptech.glide:glide:4.10.0 -> 4.16.0 (*)
++--- org.wordpress:aztec:v2.1.4
+|    +--- org.ccil.cowan.tagsoup:tagsoup:1.2.1
+|    +--- org.jsoup:jsoup:1.15.3
+|    +--- androidx.legacy:legacy-support-v4:1.0.0
+|    |    +--- androidx.core:core:1.0.0 -> 1.13.1 (*)
+|    |    +--- androidx.media:media:1.0.0
+|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
+|    |    |    +--- androidx.core:core:1.0.0 -> 1.13.1 (*)
+|    |    |    \--- androidx.versionedparcelable:versionedparcelable:1.0.0 -> 1.1.1 (*)
+|    |    +--- androidx.legacy:legacy-support-core-utils:1.0.0 (*)
+|    |    +--- androidx.legacy:legacy-support-core-ui:1.0.0
+|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
+|    |    |    +--- androidx.core:core:1.0.0 -> 1.13.1 (*)
+|    |    |    +--- androidx.legacy:legacy-support-core-utils:1.0.0 (*)
+|    |    |    +--- androidx.customview:customview:1.0.0 -> 1.1.0 (*)
+|    |    |    +--- androidx.viewpager:viewpager:1.0.0 (*)
+|    |    |    +--- androidx.coordinatorlayout:coordinatorlayout:1.0.0 -> 1.1.0 (*)
+|    |    |    +--- androidx.drawerlayout:drawerlayout:1.0.0 -> 1.1.1 (*)
+|    |    |    +--- androidx.slidingpanelayout:slidingpanelayout:1.0.0 -> 1.2.0 (*)
+|    |    |    +--- androidx.interpolator:interpolator:1.0.0 (*)
+|    |    |    +--- androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -> 1.1.0 (*)
+|    |    |    +--- androidx.asynclayoutinflater:asynclayoutinflater:1.0.0
+|    |    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
+|    |    |    |    \--- androidx.core:core:1.0.0 -> 1.13.1 (*)
+|    |    |    \--- androidx.cursoradapter:cursoradapter:1.0.0 (*)
+|    |    \--- androidx.fragment:fragment:1.0.0 -> 1.8.2 (*)
+|    +--- com.google.android.material:material:1.0.0 -> 1.12.0 (*)
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 -> 1.8.1 (*)
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.8.1 (*)
+|    +--- org.apache.commons:commons-lang3:3.8.1 -> 3.12.0
+|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.24 -> 1.9.25 (*)
+\--- org.wordpress.aztec:glide-loader:v2.1.4
+     +--- org.wordpress:aztec:v2.1.4 (*)
+     +--- com.github.bumptech.glide:glide:4.10.0 -> 4.16.0 (*)
+     \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.24 -> 1.9.25 (*)

Please review and act accordingly

@wzieba wzieba enabled auto-merge August 19, 2024 12:41
@wzieba wzieba merged commit 34c51ae into trunk Aug 19, 2024
14 checks passed
@wzieba wzieba deleted the bump_aztec_2_1_4 branch August 19, 2024 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants