Skip to content

Conversation

@wpmobilebot
Copy link
Collaborator

Merging release/2.36 into trunk.

Via intermediate branch merge/release-2.36-into-trunk, to help fix conflicts if any:

                            release/2.36  ----o-- - - -
                                               \
           merge/release-2.36-into-trunk        `---.
                                                     \
                                   trunk  ------------x- - -

wpmobilebot and others added 11 commits August 9, 2025 04:26
FYI: As part of the below PR#1678, the author most probably copy-pasted
an app module's 'build.gradle' configuration into this library module.
And with that, the author also copy-pasted this 'buildTypes.release'
related configuration by an oversight. 'PasscodeLock-Android' never had
such a configuration to begin with, and it being a library, it actually
didn't need it.

PasscodeLock-Android: https://github.com/wordpress-mobile/
PasscodeLock-Android
Related: [Lib] Migrate passcodelock directly into simplenote as a
library module. #1678
- #1678

PS: An alternative would have been to add a 'consumer-rules.pro' file to
have some extra ProGuard configuration for this library. But again,
'PasscodeLock-Android' never had such a need.
@dangermattic
Copy link
Collaborator

1 Message
📖 This PR has the Releases label: some checks will be skipped.

Generated by 🚫 Danger

@wpmobilebot
Copy link
Collaborator Author

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

App NameSimplenote Android
Build TypeDebug
Commitc53a5ea
Direct Downloadsimplenote-android-prototype-build-pr1759-c53a5ea-019899e3-8b9e-4e57-a22c-050992eeabb6.apk

Copy link
Contributor

@mzorz mzorz left a comment

Choose a reason for hiding this comment

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

LGTM! There's this warning about visualization on GH itself
image
but showing them up I checked and I don't see a particular problem there.
image
:shipit:

@mzorz mzorz merged commit 1a592cb into trunk Aug 14, 2025
22 checks passed
@mzorz mzorz deleted the merge/release-2.36-into-trunk branch August 14, 2025 09:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants