search

wordpress-mobile / WordPress-Login-Flow-Android

Pluggable WordPress login flow for Android
GNU General Public License v2.0
14 stars 3 forks source link

Merge WPAndroid and WCAndroid changes #56

Closed oguzkocer closed 2 years ago

oguzkocer commented 2 years ago

This PR merges changes from WPAndroid and WCAndroid. This is a manual process and quite a tricky one. So, I'd like reviewers to pay extra attention to this one. Here is how I've gone through this:

  1. 09ff6707be40a1f38f157b0b616aeebbc629731b copies WPAndroid's login library and accepts all changes to it (except for gradlew which is later updated through the gradle script)
  2. 96b25f296f786305c008c9059d7d93a9fe85ebf8 copies WCAndroid's login library and resolves the conflicts. This is the tricky one and without context about these changes it's very hard to know whether the conflicts were resolved correctly.
  3. 1d0f6cf3f0a94d64e08345abe050d77f76120564 updates FluxC to the latest version which fixes the lazysodium dependency issue (Bintray shutting down and lazysodium moving to mavenCentral)
  4. 0196643098faadf766567a39c69d4524cf353c45 fixes the lint issue for android:tint
  5. 78cb92fef00403eefe1346af3f2406cc75c9f904 updates gradlew.bat file by running ./gradlew wrapper --gradle-version 6.1.1 --distribution-type all

The only goal for this PR is to merge changes from both clients and not to improve anything. We'll merge these changes into both clients, so all 3 are at the same state. Once that's done, I'll go through removing the subtree from both clients so we don't have this issue again.

oguzkocer commented 2 years ago

Closed in favor of https://github.com/wordpress-mobile/WordPress-Login-Flow-Android/pull/57