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 (Take 2) #57

Closed oguzkocer closed 2 years ago

oguzkocer commented 2 years ago

This is my second attempt at merging changes to the library from WPAndroid and WCAndroid. Here is the first one: https://github.com/wordpress-mobile/WordPress-Login-Flow-Android/pull/56. I've had to manually track down every single line of change to compose this PR, so to say it's error prone would be an understatement. I think the best way to review these changes is to review the client PRs. The reason is, this PR merges changes from WPAndroid and WCAndroid, however clients PRs (in theory) should only change each other's changes, so it's easier to refer where that change has been made.

  1. 5315e370a1d5d88573de8b8238504add4151d725 copies WCAndroid's login library and only accepts changes made in WCAndroid. WPAndroid devs have been keeping this library mostly up to date, so copying WCAndroid would show up a lot of removed code that WPAndroid devs have added.
  2. 5f159e7a1adebee3bedd56437fd004c14575efe2 copies WPAndroid's login library and only accepts changes made in WPAndroid. Since WPAndroid devs were mostly keeping the library up to date (and they actually pinged me while trying to update the library again) this contains changes made recently.
  3. ebfd8768c7099107ecd8fb07218a94f1be1594f7 updates default FluxC version to the latest version which fixes the lazysodium dependency issue (Bintray shutting down and lazysodium moving to mavenCentral)
  4. 5e642dd9dcee59e2f241b493d435d2f7569d9427 fixes the lint issue for android:tint
  5. 79b786cfaa9e6b3a7e2a6b215da21a6e27f1705f updates gradlew.bat file by running ./gradlew wrapper --gradle-version 6.1.1 --distribution-type all