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.

Sign up for GitHub

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

Jump to bottom

Update login library subtree #10047

Merged
merged 3 commits into from
Jun 17, 2019
Merged

Update login library subtree #10047

merged 3 commits into from
Jun 17, 2019

Conversation

aforcier
Copy link
Contributor

@aforcier aforcier commented Jun 14, 2019 •
edited
Loading

subtree pulls the latest change from the login library. Also a single commit updating the standalone FluxC hash for the login library - this is the hash used when building the library on its own, for example from CircleCI in the login lib repo.

Here's a draft PR in the login lib repo with the result of subtree push from this branch, which also includes the AndroidX changes: wordpress-mobile/WordPress-Login-Flow-Android#20.

Once this current PR is merged into WPAndroid develop, I'll subtree push again from WPAndroid develop this time and open a fresh PR in the login lib.

To test:

Not much to do for this PR, but give wordpress-mobile/WordPress-Login-Flow-Android#20 a look and verify the changes make sense.

Update release notes:

  • If there are user facing changes, I have added an item to RELEASE-NOTES.txt.

(Not applicable)

aforcier added 3 commits June 14, 2019 11:31
@aforcier
Squashed 'libs/login/' changes from f52c56b481..78c5307f7a
ad485b2 
78c5307f7a Merge pull request #16 from wordpress-mobile/fix_crash_in_login_email_fragment
edd8684ec4 Merge pull request #18 from wordpress-mobile/new-wpandroid-changes
71729e5e76 Merge pull request #17 from wordpress-mobile/issue/glide-4.9
aabdedf672 Merge commit '099b5a011d32283eb6c79b0e599b5272a597e849' into update-login-library
1eb7f4f156 Updated Glide to 4.9.0
a32cc8c09d Add crash fix to SignupEmailFragment
08109fa90f Adds non-null check to onActivityResult
664b67f62d Fix  #9826: make sure we Play Services are available before running the email hint picker
94a0ae2a39 Merge pull request #9743 from wordpress-mobile/feature/manage_insights_readonly
7cad17e264 Fix a few ContentDescription lint errors
9f171b55d0 Merge branch 'feature/manage_insights_readonly' into issue/9464-manage-insights
663a168903 Add the missing drawable resources

git-subtree-dir: libs/login
git-subtree-split: 78c5307f7a8a15cae1a164e4cbb0b7b924a37d37
@aforcier
Merge commit 'ad485b27b26ffb38b8718940b0b7556b902dc28c' into sync-log…
eb4f831 
…in-lib
@aforcier
Update login lib standalone FluxC hash
283108f
@aforcier aforcier added the Login label Jun 14, 2019
@aforcier aforcier added this to the 12.7 milestone Jun 14, 2019
malinajirka
malinajirka approved these changes Jun 17, 2019
View reviewed changes
Copy link
Contributor

@malinajirka malinajirka left a comment

Choose a reason for hiding this comment

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

Thanks @aforcier! LGTM

Note: I'm not sure if CircleCI in the Login repo automatically updates its gradle.properties or we need to do it manually. It worked automatically in WPAndroid, but we had to update it manually in FluxC 🤷‍♂.

@malinajirka malinajirka merged commit 9654710 into develop Jun 17, 2019
@peril-wordpress-mobile
Copy link

Warnings
⚠️

This PR contains changes in the subtree libs/login/. It is your responsibility to ensure these changes are merged back into WordPress-Login-Flow-Android. Follow these handy steps!

  1. cd WordPress-Android
  2. git checkout sync-login-lib
  3. git subtree push --prefix=libs/login/ https://github.com/wordpress-mobile/WordPress-Login-Flow-Android.git merge/WordPress-Android/10047
  4. Browse to https://github.com/wordpress-mobile/WordPress-Login-Flow-Android/pull/new/merge/WordPress-Android/10047 and open a new PR.

Generated by 🚫 dangerJS

@aforcier
Copy link
Contributor Author

Note: I'm not sure if CircleCI in the Login repo automatically updates its gradle.properties or we need to do it manually. It worked automatically in WPAndroid, but we had to update it manually in FluxC 🤷‍♂.

The login library just copies over the gradle.properties-example file - FluxC has some secrets needed for the tests in gradle.properties so the extra steps are needed.

@aforcier aforcier deleted the sync-login-lib branch June 17, 2019 12:00
@malinajirka
Copy link
Contributor

ohh I see, thanks for the clarification! ;)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@malinajirka malinajirka malinajirka approved these changes

@nbradbury nbradbury Awaiting requested review from nbradbury

Assignees
No one assigned
Labels
Login
Projects
None yet
Milestone
12.7
Development

Successfully merging this pull request may close these issues.
2 participants
@aforcier @malinajirka