Upgrade Gradle to 5.4.1 & Gradle plugin to 3.5.1 #10583

oguzkocer · 2019-10-08T18:43:11Z

This PR upgrades Gradle version to 5.4.1 and Gradle plugin version to 3.5.1. While doing this upgrade I ended up having to upgrade WellSql wordpress-mobile/wellsql#14 and FluxC wordpress-mobile/WordPress-FluxC-Android#1397. I also had a lot of different build errors related to Volley and some other dependencies, so I added/upgraded/excluded related dependencies. I aimed for the smallest set of changes for this upgrade and this was the best I could get. Let me know if any of these changes don't make sense or unnecessary.

I am opening this PR as a Draft PR since it depends on the linked FluxC PR and we'll need to update the FluxC version before we can merge this PR.

To test:
Do a clean build and make sure the app builds and works as expected.

PR submission checklist:

I have considered adding unit tests where possible.
I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

…le-to-5.4.1

peril-wordpress-mobile · 2019-10-08T18:43:16Z

	Messages
📖	This PR contains changes in the subtree `libs/login/`. It is your responsibility to ensure these changes are merged back into `wordpress-mobile/WordPress-Login-Flow-Android`. Follow these handy steps! WARNING: Make sure your git version is 2.19.x or lower - there is currently a bug in later versions that will corrupt the subtree history! `cd WordPress-Android` `git checkout issue/upgrade-gradle-to-5.4.1` `git subtree push --prefix=libs/login/ https://github.com/wordpress-mobile/WordPress-Login-Flow-Android.git merge/WordPress-Android/10583` Browse to https://github.com/wordpress-mobile/WordPress-Login-Flow-Android/pull/new/merge/WordPress-Android/10583 and open a new PR.

Generated by 🚫 dangerJS

peril-wordpress-mobile · 2019-10-08T18:53:45Z

You can test the changes on this Pull Request by downloading the APK here.

oguzkocer · 2019-10-08T21:02:20Z

@malinajirka If you have any extra time, do you think you could take a look at the test issue. I have looked into it and it looks like it's related to Robolectric version, however upgrading that creates another issue. Once I manually add the guava dependency, I get yet another issue. I tried to use a different version, but had no luck with that either.

I think this might be the last step to upgrade the Gradle version. We have some lint issues, but they seem rather straightforward to fix, although there are quite a few of them, so I am thinking we do that in a separate PR first.

malinajirka · 2019-10-09T10:55:01Z

Thanks Oguz! ;) The current change set LGTM!

I've updated Robolectric version to 4.3. When I run ./gradlew --stacktrace testVanillaRelease locally it passes. However, the CI seems to timeout - perhaps when downloading ("Downloading: org/robolectric/android-all/9-robolectric-4913185-2/android-all-9-robolectric-4913185-2.jar" - it took quite some time on my machine).

Regarding the lint issues
UseSparseArrays - I'd consider suppressing this warning at a project level or decreasing its severity to info. Sparse arrays can cause weird behavior in unit tests and imho the performance benefits aren't significant anyway. Wdyt?

StaticFieldLeak - This set of errors is pretty weird as they should be suppressed through the lint-baseline.xml. Not sure what's going on there 🤷‍♂

DefaultLocale, DiffUtilEquals - These seem like issues we should probably fix 🤔

@maxme @hypest I'm not sure how much related this is, but just to be safe. Could you please confirm these changes won't break the Gutenberg development flow. Thanks!

malinajirka · 2019-10-09T12:15:11Z

However, the CI seems to timeout - perhaps when downloading ("Downloading: org/robolectric/android-all/9-robolectric-4913185-2/android-all-9-robolectric-4913185-2.jar" - it took quite some time on my machine).

I've temporarily increased the no output timeout to 30 minutes so the CI would have enough time to download the file and store it into a cache. It seems that it worked as expected, so the only thing left is fixing the lint issues ;).

oguzkocer · 2019-10-09T19:53:18Z

Thank you for your help @malinajirka! 🙇 I've separated the lint PR #10593, let's discuss the issues there and merged it into this branch when it's ready.

…ost list

malinajirka

As mentioned in #10593 (review) I tested the changes and everything seems to be working as expected.

I'm approving this PR to speed things up but I'd feel safer if someone from the Gutenberg team verified it doesn't break their development flow.

Really great job @oguzkocer !!

mchowning · 2019-10-11T13:45:40Z

👋 @malinajirka and @oguzkocer ! This is great! Thanks for taking this on.

I am seeing a build failure from this branch when I run ./gradlew assembleWasabiDebug with wp.BUILD_GUTENBERG_FROM_SOURCE=true in gradle.properties. We use this flag for development of gutenberg to see gutenberg changes in WPAndroid. The error I'm seeing seems to be the result of it not being able to find the AppLog class for some reason.

Build error logs

> Task :react-native-gutenberg-bridge:compileDebugJavaWithJavac FAILED

/Users/matt/dev/a8c/WordPress-Android/libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java:35: error: cannot find symbol
import org.wordpress.android.util.AppLog;
                                 ^
  symbol:   class AppLog
  location: package org.wordpress.android.util

/Users/matt/dev/a8c/WordPress-Android/libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java:236: error: package AppLog does not exist
                        AppLog.d(AppLog.T.EDITOR, message);
                                       ^

/Users/matt/dev/a8c/WordPress-Android/libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java:236: error: cannot find symbol
                        AppLog.d(AppLog.T.EDITOR, message);
                        ^
  symbol: variable AppLog

/Users/matt/dev/a8c/WordPress-Android/libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java:239: error: package AppLog does not exist
                        AppLog.i(AppLog.T.EDITOR, message);
                                       ^

/Users/matt/dev/a8c/WordPress-Android/libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java:239: error: cannot find symbol
                        AppLog.i(AppLog.T.EDITOR, message);
                        ^
  symbol: variable AppLog

/Users/matt/dev/a8c/WordPress-Android/libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java:242: error: package AppLog does not exist
                        AppLog.w(AppLog.T.EDITOR, message);
                                       ^

/Users/matt/dev/a8c/WordPress-Android/libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java:242: error: cannot find symbol
                        AppLog.w(AppLog.T.EDITOR, message);
                        ^
  symbol: variable AppLog

/Users/matt/dev/a8c/WordPress-Android/libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java:245: error: package AppLog does not exist
                        AppLog.e(AppLog.T.EDITOR, message);
                                       ^

/Users/matt/dev/a8c/WordPress-Android/libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java:245: error: cannot find symbol
                        AppLog.e(AppLog.T.EDITOR, message);
                        ^
  symbol: variable AppLog

I have seen an error similar to this in a different context, so it is possible there is something going on with my setup, but I don't see this error when I build off of develop so I don't think it's just me. With that said, it wouldn't be a bad idea to verify that someone else is seeing the same issue when they build on their machine.

I am still in support rotation today, so I can't dig into this now, but I would be happy to take a closer look at this on Monday if you'd like.

…Callback

String.capitalize(Locale) call crates a lint error claiming that the default locale usage is a source of bugs. This should not happen when we are already passing a locale to it. In order to get around this issue, a wrapper extension method is introduced so we can suppress the lint warning in a single place, document the reason for it and make it easy to remove it in the future.

mchowning · 2019-10-16T19:06:24Z

Following up on the issue with building gutenberg from source enabled. I merged a fix for that that will be included in the gutenberg-mobile release that should get merged into the develop branches for both WPAndroid and mogile-gutenberg this Friday. After that, we will be able to build gutenberg from source with this PR.

If you would like to merge this sooner (i.e., this week), just let me know. I'll just need to do two quick things to make that possible:

Update the gutenberg-mobile submodule ref in this PR so that my fix from gutenberg-mobile is included (may also need to merge in the latest changes from develop into this PR in order to avoid a merge conflict with my change to the submodule ref); and
Merge my fix into the gutenberg-mobile develop branch so that anyone doing development this week has my fix.

…rrors Fixing Gradle 5.4.1 lint errors

peril-wordpress-mobile · 2019-10-17T16:02:27Z

You can test the changes on this Pull Request by downloading the APK here.

…le-to-5.4.1

mchowning

Building gutenberg from source is working great for me now. Thanks @oguzkocer !

shiki

Did a quick review of the code and tested the app randomly as well. LGTM! Thank you, everyone.

maxme · 2019-10-21T14:35:59Z

Thanks for checking the gutenberg flow @mchowning, and thanks @oguzkocer for doing this change.

oguzkocer added 2 commits October 7, 2019 14:57

Upgrade Gradle to 5.4.1, gradle plugin to 3.5.1 and fix various errors

d7117dd

Merge remote-tracking branch 'origin/develop' into issue/upgrade-grad…

19bf5a3

…le-to-5.4.1

oguzkocer added the [Type] Enhancement label Oct 8, 2019

oguzkocer added this to the 13.5 milestone Oct 8, 2019

oguzkocer requested a review from malinajirka October 8, 2019 18:43

oguzkocer requested a review from jkmassel October 8, 2019 18:43

Build scan properties updated for scan plugin 1.12

71b2877

oguzkocer mentioned this pull request Oct 8, 2019

Upgrade Gradle to 5.4.1, gradle plugin to 3.5.1 and WellSql to 1.5.0 wordpress-mobile/WordPress-FluxC-Android#1397

Merged

Bump Robolectric version to 4.3

d2e5646

Fix locale lint errors by passing correct Locale to necessary methods

41593d6

oguzkocer mentioned this pull request Oct 9, 2019

Fixing Gradle 5.4.1 lint errors #10593

Merged

2 tasks

oguzkocer added 4 commits October 9, 2019 16:02

Add @ExperimentalStdlibApi to MostPopularInsightsUseCaseTest's setup

52f683b

Context.currentLocale extension uses ConfigurationCompat

eb8a8f7

DateUtils.getWeekDay uses localManagerWrapper locale instead of ROOT

7bcf135

Use sparse arrrays for featured image and upload status tracking of p…

1febc41

…ost list

malinajirka approved these changes Oct 11, 2019

View reviewed changes

malinajirka and others added 3 commits October 11, 2019 13:05

Fix staticFieldLeak errors in lint-baseline.xml

d7d6770

Implement specific comparison for LocalOrRemoteId in PostListDiffItem…

50c0f60

…Callback

khaykov mentioned this pull request Oct 14, 2019

Fix/9905 crash inflate exception binary xml file line #10279

Closed

1 task

marecar3 self-requested a review October 15, 2019 09:38

mchowning mentioned this pull request Oct 15, 2019

Expose WordPressUtils for consumption by react-native-gutenberg-bridge wordpress-mobile/gutenberg-mobile#1451

Merged

1 task

Merge pull request #10593 from wordpress-mobile/issue/gradle-5-lint-e…

adf7d79

…rrors Fixing Gradle 5.4.1 lint errors

oguzkocer added 2 commits October 17, 2019 12:15

Merge remote-tracking branch 'origin/develop' into issue/upgrade-grad…

ae5f666

…le-to-5.4.1

Merge remote-tracking branch 'origin/develop' into issue/upgrade-grad…

d6c887a

…le-to-5.4.1

mchowning approved these changes Oct 17, 2019

View reviewed changes

Change FluxC hash to 1.5.1-beta-2

68b6879

oguzkocer marked this pull request as ready for review October 17, 2019 21:44

shiki approved these changes Oct 17, 2019

View reviewed changes

shiki merged commit efed73c into develop Oct 17, 2019

shiki deleted the issue/upgrade-gradle-to-5.4.1 branch October 17, 2019 22:00

oguzkocer mentioned this pull request Oct 18, 2019

Merge from WPAndroid: Gradle 5.4.1 upgrade wordpress-mobile/WordPress-Login-Flow-Android#28

Merged

jkmassel mentioned this pull request Oct 24, 2019

Fix gradle bundle naming #10696

Merged

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade Gradle to 5.4.1 & Gradle plugin to 3.5.1 #10583

Upgrade Gradle to 5.4.1 & Gradle plugin to 3.5.1 #10583

oguzkocer commented Oct 8, 2019

peril-wordpress-mobile bot commented Oct 8, 2019

peril-wordpress-mobile bot commented Oct 8, 2019 •

edited

Loading

oguzkocer commented Oct 8, 2019

malinajirka commented Oct 9, 2019 •

edited

Loading

malinajirka commented Oct 9, 2019

oguzkocer commented Oct 9, 2019

malinajirka left a comment

mchowning commented Oct 11, 2019

mchowning commented Oct 16, 2019

peril-wordpress-mobile bot commented Oct 17, 2019 •

edited

Loading

mchowning left a comment

shiki left a comment

maxme commented Oct 21, 2019

Upgrade Gradle to 5.4.1 & Gradle plugin to 3.5.1 #10583

Upgrade Gradle to 5.4.1 & Gradle plugin to 3.5.1 #10583

Conversation

oguzkocer commented Oct 8, 2019

peril-wordpress-mobile bot commented Oct 8, 2019

peril-wordpress-mobile bot commented Oct 8, 2019 • edited Loading

oguzkocer commented Oct 8, 2019

malinajirka commented Oct 9, 2019 • edited Loading

malinajirka commented Oct 9, 2019

oguzkocer commented Oct 9, 2019

malinajirka left a comment

Choose a reason for hiding this comment

mchowning commented Oct 11, 2019

mchowning commented Oct 16, 2019

peril-wordpress-mobile bot commented Oct 17, 2019 • edited Loading

mchowning left a comment

Choose a reason for hiding this comment

shiki left a comment

Choose a reason for hiding this comment

maxme commented Oct 21, 2019

peril-wordpress-mobile bot commented Oct 8, 2019 •

edited

Loading

malinajirka commented Oct 9, 2019 •

edited

Loading

peril-wordpress-mobile bot commented Oct 17, 2019 •

edited

Loading