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 dagger version to v2.22.1 #9890

Merged
merged 4 commits into from
May 21, 2019
Merged

Update dagger version to v2.22.1 #9890

merged 4 commits into from
May 21, 2019

Conversation

malinajirka
Copy link
Contributor

@malinajirka malinajirka commented May 21, 2019 •
edited
Loading

Fixes #9889

Updates Dagger to v2.22.1 as preparation for AndroidX migration.

Merge instructions:

  1. Review and merge issue/fluxc-dagger-upgrade in FluxC's repo
  2. Update FluxC's hash
  3. Review and merge this PR

To test:

  1. Build and run the app
  2. Walk through the basic flows at least - login, reader, notifications, create a post

Update release notes:

  • There are no user facing changes

@malinajirka malinajirka changed the title Update dagger version to v2.22.1 WIP: Update dagger version to v2.22.1 May 21, 2019
@malinajirka malinajirka added this to the 12.6 milestone May 21, 2019
@malinajirka malinajirka changed the title WIP: Update dagger version to v2.22.1 Update dagger version to v2.22.1 May 21, 2019
@malinajirka malinajirka requested review from planarvoid and removed request for nbradbury May 21, 2019 12:33
@aforcier
Copy link
Contributor

@malinajirka I don't see a PR for issue/fluxc-dagger-upgrade in the FluxC repo, and we probably need to hold off a bit on merging that into FluxC anyway as AFAIK @nbradbury is still working on Dagger 2.22.+ support for WooAndroid.

It's possible I'm just out of the loop 😅 But otherwise perhaps this should either target a feature branch or be a draft PR so we don't merge it prematurely?

This was referenced May 21, 2019
Merged
Merged
@malinajirka
Copy link
Contributor Author

malinajirka commented May 21, 2019 •
edited
Loading

It's possible I'm just out of the loop 😅 But otherwise perhaps this should either target a feature branch or be a draft PR so we don't merge it prematurely?

I should have created a draft PR, you are right. I though adding Merge instructions: would be enough.

Either case the FluxC's PR is ready - wordpress-mobile/WordPress-FluxC-Android#1266. We just need to sync also with WooAndroid's PR so we merge all three PRs (FluxC, WPAndroid,WCAndroid) within a short period of time.

@nbradbury nbradbury self-assigned this May 21, 2019
@nbradbury nbradbury self-requested a review May 21, 2019 18:47
nbradbury
nbradbury approved these changes May 21, 2019
View reviewed changes
Copy link
Contributor

@nbradbury nbradbury left a comment

Choose a reason for hiding this comment

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

I went through the various flows on a couple devices and everything works great. I'll update the FluxC hash once the related FluxC PR is merged and then merge this one.

@nbradbury nbradbury merged commit ed75634 into develop May 21, 2019
@nbradbury nbradbury deleted the update-dagger-version-to-v2.22.1 branch May 21, 2019 19:23
AmandaRiu added a commit that referenced this pull request Jul 3, 2019
@AmandaRiu
Squashed 'libs/login/' changes from 78c5307f7a..979ddf4aec
43aef95 
979ddf4aec Merge commit '827a47189094a6bc7800eaccc3ed069841251373' into sync-login-lib
df3c11ed09 added textAlignment property to secondary button in login
da783ea3c7 Login screens: added textAlignment property to labels
6d486bbf6b Merge pull request #21 from wordpress-mobile/merge-wpa-develop
57a2d00b14 Update login lib standalone FluxC hash
0ea2405def Merge commit 'ad485b27b26ffb38b8718940b0b7556b902dc28c' into sync-login-lib
6df15ab86b Update 2FA unavailable API error message
eefd72f317 Show error and continue login on OAuth client 2FA error
ca3b68e817 Merge branch 'amanda/signin-has-woo' into amanda/signin-tracks-events
4755048046 Remove part of login site error msg and add help button
3cc4f31b3b Refresh branch with AndroidX changes in develop
76c40f3034 Fixed incorrect ordering of imports in login library
08a9f0c65a First pass at AndroidX migration. Used the migration wizard then did far too much cleanup.
a46ceeb96b Track connected site info requests, success, and failures
47528a1c33 Special handling for atomic sites
578dca7f29 Update androidx dependencies
1d09d1536d Fix AndroidX import order
48df84638f Fix import ordering for androidx
d3dc35035a Migrate to AndroidX
e9e219db2f Add logic to get connected site info for woo login mode.
873db9b385 Add new logic to change the label to show the site logging into
9f442e9a2f Add new WOO_LOGIN_MODE
309eeda212 Add new string to handle non-WordPress site error
dfc6991275 Revert "Add new loginMode for woo and update related error strings"
9b44d78d3e Add debug property to populate site address during login
45ae481c03 Add new loginMode for woo and update related error strings
91731b6196 Add a way to hide the option to login by site address
4d6c83f111 Merge pull request #9890 from wordpress-mobile/update-dagger-version-to-v2.22.1
9cbf3f17ff Merge pull request #9885 from wordpress-mobile/update-login-library
0ddf4dcdbd Update Glide version to 4.9.0
f7860b9861 Updated Dagger in the login library
1c311d430c Updated Dagger in the login library
79dd984392 Updated login library to Glide 4.9.0
e995e12f02 Revert sdk change for login library
954e7ddebc Updated targetSdkVersion to 28
7ee1e1c003 Added another catch block to handle NoActivityFoundException
804225d94f Merge commit 'a9cf59e44590548a123efeb521f9ff99b3277072' into update-login-lib

git-subtree-dir: libs/login
git-subtree-split: 979ddf4aec664cf9afafa1cdf7d99599488f1eee
AmandaRiu added a commit that referenced this pull request Jul 4, 2019
@AmandaRiu
Squashed 'libs/login/' changes from 78c5307f7a..979ddf4aec
5fb1a22 
979ddf4aec Merge commit '827a47189094a6bc7800eaccc3ed069841251373' into sync-login-lib
df3c11ed09 added textAlignment property to secondary button in login
da783ea3c7 Login screens: added textAlignment property to labels
6d486bbf6b Merge pull request #21 from wordpress-mobile/merge-wpa-develop
57a2d00b14 Update login lib standalone FluxC hash
0ea2405def Merge commit 'ad485b27b26ffb38b8718940b0b7556b902dc28c' into sync-login-lib
6df15ab86b Update 2FA unavailable API error message
eefd72f317 Show error and continue login on OAuth client 2FA error
ca3b68e817 Merge branch 'amanda/signin-has-woo' into amanda/signin-tracks-events
4755048046 Remove part of login site error msg and add help button
3cc4f31b3b Refresh branch with AndroidX changes in develop
76c40f3034 Fixed incorrect ordering of imports in login library
08a9f0c65a First pass at AndroidX migration. Used the migration wizard then did far too much cleanup.
a46ceeb96b Track connected site info requests, success, and failures
47528a1c33 Special handling for atomic sites
578dca7f29 Update androidx dependencies
1d09d1536d Fix AndroidX import order
48df84638f Fix import ordering for androidx
d3dc35035a Migrate to AndroidX
e9e219db2f Add logic to get connected site info for woo login mode.
873db9b385 Add new logic to change the label to show the site logging into
9f442e9a2f Add new WOO_LOGIN_MODE
309eeda212 Add new string to handle non-WordPress site error
dfc6991275 Revert "Add new loginMode for woo and update related error strings"
9b44d78d3e Add debug property to populate site address during login
45ae481c03 Add new loginMode for woo and update related error strings
91731b6196 Add a way to hide the option to login by site address
4d6c83f111 Merge pull request #9890 from wordpress-mobile/update-dagger-version-to-v2.22.1
9cbf3f17ff Merge pull request #9885 from wordpress-mobile/update-login-library
0ddf4dcdbd Update Glide version to 4.9.0
f7860b9861 Updated Dagger in the login library
1c311d430c Updated Dagger in the login library
79dd984392 Updated login library to Glide 4.9.0
e995e12f02 Revert sdk change for login library
954e7ddebc Updated targetSdkVersion to 28
7ee1e1c003 Added another catch block to handle NoActivityFoundException
804225d94f Merge commit 'a9cf59e44590548a123efeb521f9ff99b3277072' into update-login-lib

git-subtree-dir: libs/login
git-subtree-split: 979ddf4aec664cf9afafa1cdf7d99599488f1eee
AmandaRiu added a commit that referenced this pull request Aug 1, 2019
@AmandaRiu
Squashed 'libs/login/' changes from 5a21797a03..69e488759c
2338a63 
69e488759c Fix tracks connected info property naming
REVERT: 5a21797a03 Merge pull request #23 from wordpress-mobile/merge/woocommerce-android/1224-amanda-new
REVERT: 3b1db07c38 Merge commit '615ebab45e1bc3d0cdd3a9da060026fef704d3a8' into amanda/test_git_subtree
REVERT: 43ac7e9468 Merge pull request #22 from wordpress-mobile/merge-wca
REVERT: d4d717cf16 Send redirectUrl to listener and strip protocol before saving
REVERT: 979ddf4aec Merge commit '827a47189094a6bc7800eaccc3ed069841251373' into sync-login-lib
REVERT: df3c11ed09 added textAlignment property to secondary button in login
REVERT: da783ea3c7 Login screens: added textAlignment property to labels
REVERT: 6d486bbf6b Merge pull request #21 from wordpress-mobile/merge-wpa-develop
REVERT: 57a2d00b14 Update login lib standalone FluxC hash
REVERT: 0ea2405def Merge commit 'ad485b27b26ffb38b8718940b0b7556b902dc28c' into sync-login-lib
REVERT: 6df15ab86b Update 2FA unavailable API error message
REVERT: eefd72f317 Show error and continue login on OAuth client 2FA error
REVERT: 578dca7f29 Update androidx dependencies
REVERT: 1d09d1536d Fix AndroidX import order
REVERT: 48df84638f Fix import ordering for androidx
REVERT: d3dc35035a Migrate to AndroidX
REVERT: 78c5307f7a Merge pull request #16 from wordpress-mobile/fix_crash_in_login_email_fragment
REVERT: 4d6c83f111 Merge pull request #9890 from wordpress-mobile/update-dagger-version-to-v2.22.1
REVERT: edd8684ec4 Merge pull request #18 from wordpress-mobile/new-wpandroid-changes
REVERT: 9cbf3f17ff Merge pull request #9885 from wordpress-mobile/update-login-library
REVERT: 71729e5e76 Merge pull request #17 from wordpress-mobile/issue/glide-4.9
REVERT: 0ddf4dcdbd Update Glide version to 4.9.0
REVERT: f7860b9861 Updated Dagger in the login library
REVERT: aabdedf672 Merge commit '099b5a011d32283eb6c79b0e599b5272a597e849' into update-login-library
REVERT: 1eb7f4f156 Updated Glide to 4.9.0
REVERT: a32cc8c09d Add crash fix to SignupEmailFragment
REVERT: 08109fa90f Adds non-null check to onActivityResult
REVERT: 664b67f62d Fix  #9826: make sure we Play Services are available before running the email hint picker
REVERT: 94a0ae2a39 Merge pull request #9743 from wordpress-mobile/feature/manage_insights_readonly
REVERT: 7cad17e264 Fix a few ContentDescription lint errors
REVERT: 9f171b55d0 Merge branch 'feature/manage_insights_readonly' into issue/9464-manage-insights
REVERT: 663a168903 Add the missing drawable resources

git-subtree-dir: libs/login
git-subtree-split: 69e488759c04a9ffae4f39183d3a526501f1ed8b
AmandaRiu added a commit that referenced this pull request Aug 1, 2019
@AmandaRiu
Squashed 'libs/login/' changes from 69e488759c..fc60b518d7
db8d333 
fc60b518d7 Merge branch 'develop' into merge/woocommerce-android/1287
38737cef3b Merge pull request #25 from wordpress-mobile/merge-wpa
d035db2384 Merge commit 'eb8270b278800a6804a2fce6bb63111c0dfa789a' into update-login-lib
4e66d2a380 Move signedin tracking to the google fragment
a1e403a879 Track signed in event on sign up
d983da8c98 Merge pull request #10232 from wordpress-mobile/amanda/login-lib-redirect-support
3bf6e99f15 Merge pull request #24 from wordpress-mobile/merge/WordPress-Android/10255
895ece8fc4 Merge commit '3a2393c33fe8f1f1448591580fc0054a732fac9b' into amanda/login-lib-redirect-support
5a21797a03 Merge pull request #23 from wordpress-mobile/merge/woocommerce-android/1224-amanda-new
8fee8b3660 Updated login and editor libraries to remove right/left attributes when a start/end attribute already exists
2289f9707b Merge commit '43ac7e9468ada491ccd1fcd63cfa1ef0616bd791' into issue/9720-login-subtree-update
b5ac63f082 Fix redundancy in R.string.enter_site_address
bc3903bd29 Update login_invalid_site_url
5d1b930343 Add tests for LoginSiteAddressValidator
ae203df2ec Delete unused R.string.login_empty_site_url
763eeb9490 Replace login_invalid_site_url
1032574f3f Do not report an error if the text is empty
1fa189853a Site Address: Show an error message after 2 sec
e869735555 Do not react to keyboard enter if site is invalid
8d50ab92c6 Move LoginSiteAddress validation to a class
3a9a5c8566 Merge commit 'e3144c2c11b0c982eadb2478cf6926aa40c127e6' into amanda/login-lib-redirect-support
3b1db07c38 Merge commit '615ebab45e1bc3d0cdd3a9da060026fef704d3a8' into amanda/test_git_subtree
a8f234de25 Merge pull request #10150 from wordpress-mobile/amanda/woo-login-test-wp-2
43ac7e9468 Merge pull request #22 from wordpress-mobile/merge-wca
d4d717cf16 Send redirectUrl to listener and strip protocol before saving
6dbf72672a Updated login and editor libraries to remove right/left attributes when a start/end attribute already exists
979ddf4aec Merge commit '827a47189094a6bc7800eaccc3ed069841251373' into sync-login-lib
df3c11ed09 added textAlignment property to secondary button in login
da783ea3c7 Login screens: added textAlignment property to labels
6d486bbf6b Merge pull request #21 from wordpress-mobile/merge-wpa-develop
57a2d00b14 Update login lib standalone FluxC hash
0ea2405def Merge commit 'ad485b27b26ffb38b8718940b0b7556b902dc28c' into sync-login-lib
6df15ab86b Update 2FA unavailable API error message
eefd72f317 Show error and continue login on OAuth client 2FA error
578dca7f29 Update androidx dependencies
1d09d1536d Fix AndroidX import order
48df84638f Fix import ordering for androidx
d3dc35035a Migrate to AndroidX
78c5307f7a Merge pull request #16 from wordpress-mobile/fix_crash_in_login_email_fragment
4d6c83f111 Merge pull request #9890 from wordpress-mobile/update-dagger-version-to-v2.22.1
edd8684ec4 Merge pull request #18 from wordpress-mobile/new-wpandroid-changes
9cbf3f17ff Merge pull request #9885 from wordpress-mobile/update-login-library
71729e5e76 Merge pull request #17 from wordpress-mobile/issue/glide-4.9
0ddf4dcdbd Update Glide version to 4.9.0
f7860b9861 Updated Dagger in the login library
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: fc60b518d7c72864f6df54546d640d0e2fbb8673
wzieba pushed a commit that referenced this pull request Sep 27, 2024
@nbradbury
Merge pull request #9890 from wordpress-mobile/update-dagger-version-…
c50941c 
…to-v2.22.1

Update dagger version to v2.22.1
wzieba pushed a commit that referenced this pull request Oct 21, 2024
@nbradbury
Merge pull request #9890 from wordpress-mobile/update-dagger-version-…
349bf97 
…to-v2.22.1

Update dagger version to v2.22.1
wzieba pushed a commit that referenced this pull request Oct 21, 2024
@nbradbury
Merge pull request #9890 from wordpress-mobile/update-dagger-version-…
6b81891 
…to-v2.22.1

Update dagger version to v2.22.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nbradbury nbradbury nbradbury approved these changes

@maxme maxme Awaiting requested review from maxme

@aforcier aforcier Awaiting requested review from aforcier

@planarvoid planarvoid Awaiting requested review from planarvoid

Assignees

@nbradbury nbradbury

Labels
Tech Debt
Projects
None yet
Milestone
12.6
Development

Successfully merging this pull request may close these issues.

Upgrade to Dagger 2.22.1
3 participants
@malinajirka @aforcier @nbradbury