-
Notifications
You must be signed in to change notification settings - Fork 313
Merge release/2.36 into trunk #1759
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
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
Collaborator
Generated by 🚫 Danger |
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.
|
mzorz
approved these changes
Aug 14, 2025
Contributor
mzorz
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.


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