Skip to content

Update to Gradle 4.10.3/Android Gradle plugin 3.2.1 #9044

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

Merged
jtreanor merged 5 commits into from
Jan 25, 2019
Merged

Update to Gradle 4.10.3/Android Gradle plugin 3.2.1 #9044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
56a97f2
Update to Gradle 4.10.3/Android Gradle plugin 3.2.1
jtreanor Jan 23, 2019
e37c1a8
Use explicit version of Fabric Gradle plugin to avoid unexptected errors
jtreanor Jan 23, 2019
748d5e4
Update okio to 1.14.0 to avoid conflict
jtreanor Jan 23, 2019
1fe7cb2
Fixed lint errors from Gradle/Gradle plugin update
jtreanor Jan 23, 2019
0277f36
Compatibility with Gradle 5 API: don't use Task.execute()
jtreanor Jan 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ android:
- extra-android-support
- platform-tools
- tools
- build-tools-27.0.3
- build-tools-28.0.3
- android-27

env:
Expand Down
36 changes: 10 additions & 26 deletions WordPress/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'io.fabric.tools:gradle:1.+'
classpath 'io.fabric.tools:gradle:1.27.0'
classpath 'com.google.gms:google-services:3.2.0'
}
}
Expand Down Expand Up @@ -39,7 +39,7 @@ android {
}

compileSdkVersion 27
buildToolsVersion '27.0.3'
buildToolsVersion '28.0.3'

defaultConfig {
applicationId "org.wordpress.android"
Expand Down Expand Up @@ -161,7 +161,7 @@ dependencies {
implementation 'org.wordpress:graphview:3.4.0'
implementation 'org.wordpress:persistentedittext:1.0.2'
implementation 'org.wordpress:emailchecker2:1.1.0'
implementation 'com.squareup.okio:okio:1.13.0'
implementation 'com.squareup.okio:okio:1.14.0'
implementation 'org.apache.commons:commons-text:1.1'
implementation 'com.airbnb.android:lottie:2.0.0-rc2'
implementation 'com.facebook.shimmer:shimmer:0.3.0'
Expand All @@ -185,7 +185,7 @@ dependencies {
androidTestImplementation 'org.objenesis:objenesis:2.1'
androidTestImplementation 'org.mockito:mockito-core:1.10.19'
androidTestImplementation 'com.squareup.okhttp:mockwebserver:2.7.5'
androidTestImplementation 'com.squareup.okio:okio:1.13.0'
androidTestImplementation 'com.squareup.okio:okio:1.14.0'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2', {
exclude group: 'com.android.support', module: 'support-annotations'
}
Expand Down Expand Up @@ -250,18 +250,6 @@ configurations.all {
exclude group: 'org.wordpress', module: 'analytics'
}

task copyGoogleServicesExampleFile(type: Copy) {
from('.')
into('.')
include('google-services.json-example')
rename('google-services.json-example', 'google-services.json')
}

task copyGoogleServicesBuddybuildFile(type: Copy) {
from(file(System.getenv("BUDDYBUILD_SECURE_FILES") + "/google-services.json"))
into('.')
}

task generateCrashlyticsConfig(group: "generate", description: "Generate Crashlytics config") {
def outputFile = new File("${rootDir}/WordPress/crashlytics.properties")
def inputFile = checkGradlePropertiesFile()
Expand Down Expand Up @@ -300,11 +288,11 @@ android.buildTypes.all { buildType ->
// If Google services file doesn't exist...
if (!file("google-services.json").exists()) {
// ... copy example file.
if (!file(System.getenv("BUDDYBUILD_SECURE_FILES") + "/google-services.json").exists()) {
tasks.copyGoogleServicesExampleFile.execute()
// ... copy Buddybuild file.
} else {
tasks.copyGoogleServicesBuddybuildFile.execute()
copy {
from(".")
into(".")
include("google-services.json-example")
rename('google-services.json-example', 'google-services.json')
}
}

Expand All @@ -317,11 +305,7 @@ android.buildTypes.all { buildType ->
def checkGradlePropertiesFile() {
def inputFile = file("${rootDir}/gradle.properties")
if (!inputFile.exists()) {
// Try the BuddyBuild provided file if it's there
inputFile = file(System.getenv("BUDDYBUILD_SECURE_FILES") + "/gradle.properties")
if (!inputFile.exists()) {
throw new StopActionException("Build configuration file gradle.properties doesn't exist, follow README instructions")
}
throw new StopActionException("Build configuration file gradle.properties doesn't exist, follow README instructions")
}
return inputFile
}
Expand Down
54 changes: 8 additions & 46 deletions WordPress/lint-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="4" by="lint 3.1.3">

<issue

@aforcier aforcier Jan 24, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@jtreanor Could you explain the reasons for dropping some these entries from lint-baseline.xml? On the face of it it's not clear why they belong in this PR, but I'm not too familiar with their background.

@jtreanor jtreanor Jan 25, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Lint gave a bunch of warnings about issues in lint-baseline.xml (such as the Gradle upgrade warnings) were no longer matching lint results. Some of these warnings may not have been new but I removed the ones that I saw.

Would you prefer if I didn't remove the rules that are not directly related to this PR?

@aforcier aforcier Jan 25, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@jtreanor looks like they were present in develop as well - I don't see any harm in dropping them, so let's just leave those changes in 👍 Just wanted to be clear on any background there might have been.

id="DefaultLocale"
message="Implicitly using the default locale is a common source of bugs: Use `toUpperCase(Locale)` instead. For strings meant to be internal use `Locale.ROOT`, otherwise `Locale.getDefault()`."
errorLine1=" matched.appendReplacement(sb, matched.group(1).toUpperCase());"
errorLine2=" ~~~~~~~~~~~">
<location
file="src/main/java/com/horcrux/svg/RenderableShadowNode.java"
line="400"
column="60"/>
</issue>

<issue
id="WrongCall"
message="Suspicious method call; should probably call &quot;`layout`&quot; rather than &quot;`onLayout`&quot;"
errorLine1=" onLayout(false, getLeft(), getTop(), getRight(), getBottom());"
errorLine2=" ~~~~~~~~">
<location
file="src/main/java/com/github/godness84/RNRecyclerViewList/RecyclerViewBackedScrollView.java"
line="364"
column="21"/>
</issue>

<issue
id="ClickableViewAccessibility"
message="Custom view ``EditTextWithKeyBackListener`` has `setOnTouchListener` called on it but does not override `performClick`"
Expand Down Expand Up @@ -192,31 +170,15 @@
column="97"/>
</issue>

<issue
id="ManifestOrder"
severity="Warning"
message="`&lt;uses-permission>` tag appears after `&lt;application>` tag"
category="Correctness"
priority="5"
summary="Incorrect order of elements in manifest"
explanation="The &lt;application> tag should appear after the elements which declare which version you need, which features you need, which libraries you need, and so on. In the past there have been subtle bugs (such as themes not getting applied correctly) when the `&lt;application>` tag appears before some of these other elements, so it&apos;s best to order your manifest in the logical dependency order."
errorLine1=" &lt;uses-permission android:name=&quot;android.permission.DISABLE_KEYGUARD&quot;/>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../WordPress/src/debug/AndroidManifest.xml"
line="18"
column="5"/>
</issue>

<issue
id="GradleDependency"
severity="Warning"
message="A newer version of com.android.tools.build:gradle than 3.1.2 is available: 3.2.1"
message="A newer version of com.android.tools.build:gradle than 3.2.1 is available: 3.3.0"
category="Correctness"
priority="4"
summary="Obsolete Gradle Dependency"
explanation="This detector looks for usages of libraries where the version you are using is not the current stable release. Using older versions is fine, and there are cases where you deliberately want to stick with an older version. However, you may simply not be aware that a more recent version is available, and that is what this lint check helps find."
errorLine1=" classpath &apos;com.android.tools.build:gradle:3.1.2&apos;"
errorLine1=" classpath &apos;com.android.tools.build:gradle:3.2.1&apos;"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
quickfix="studio">
<location
Expand All @@ -228,12 +190,12 @@
<issue
id="GradleDependency"
severity="Warning"
message="A newer version of com.android.tools.build:gradle than 3.1.2 is available: 3.2.1"
message="A newer version of com.android.tools.build:gradle than 3.2.1 is available: 3.3.0"
category="Correctness"
priority="4"
summary="Obsolete Gradle Dependency"
explanation="This detector looks for usages of libraries where the version you are using is not the current stable release. Using older versions is fine, and there are cases where you deliberately want to stick with an older version. However, you may simply not be aware that a more recent version is available, and that is what this lint check helps find."
errorLine1=" classpath &apos;com.android.tools.build:gradle:3.1.2&apos;"
errorLine1=" classpath &apos;com.android.tools.build:gradle:3.2.1&apos;"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
quickfix="studio">
<location
Expand All @@ -245,12 +207,12 @@
<issue
id="GradleDependency"
severity="Warning"
message="A newer version of com.android.tools.build:gradle than 3.1.2 is available: 3.2.1"
message="A newer version of com.android.tools.build:gradle than 3.2.1 is available: 3.3.0"
category="Correctness"
priority="4"
summary="Obsolete Gradle Dependency"
explanation="This detector looks for usages of libraries where the version you are using is not the current stable release. Using older versions is fine, and there are cases where you deliberately want to stick with an older version. However, you may simply not be aware that a more recent version is available, and that is what this lint check helps find."
errorLine1=" classpath &apos;com.android.tools.build:gradle:3.1.2&apos;"
errorLine1=" classpath &apos;com.android.tools.build:gradle:3.2.1&apos;"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
quickfix="studio">
<location
Expand All @@ -262,12 +224,12 @@
<issue
id="GradleDependency"
severity="Warning"
message="A newer version of com.android.tools.build:gradle than 3.1.3 is available: 3.2.1"
message="A newer version of com.android.tools.build:gradle than 3.2.1 is available: 3.3.0"
category="Correctness"
priority="4"
summary="Obsolete Gradle Dependency"
explanation="This detector looks for usages of libraries where the version you are using is not the current stable release. Using older versions is fine, and there are cases where you deliberately want to stick with an older version. However, you may simply not be aware that a more recent version is available, and that is what this lint check helps find."
errorLine1=" classpath &apos;com.android.tools.build:gradle:3.1.3&apos;"
errorLine1=" classpath &apos;com.android.tools.build:gradle:3.2.1&apos;"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
quickfix="studio">
<location
Expand Down
4 changes: 0 additions & 4 deletions WordPress/lint.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,6 @@
<ignore regexp="java-common-1.13.jar" />
</issue>

<issue id="IconLauncherFormat">
<ignore path="src/main/res/mipmap-anydpi-v26/app_icon.xml" />
</issue>

@jtreanor jtreanor Jan 25, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Its worth mentioning that I removed this because I got this error after upgrading:

Errors found:

/Users/james/src/tmp/WordPress-Android/WordPress: Error: Unknown issue id "IconLauncherFormat", found in /Users/james/src/tmp/WordPress-Android/WordPress/lint.xml [LintError]

So it is not necessary to ignore this issue anymore.


<issue id="UnusedResources" severity="error">
<ignore path="**/WordPressEditor/**" />
<ignore path="**/WordPressLoginFlow/**" />
Expand Down
4 changes: 4 additions & 0 deletions ...n/java/org/wordpress/android/util/analytics/service/InstallationReferrerServiceLogic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ public void onInstallReferrerSetupFinished(int responseCode) {
// if this is retried but the error persists
AppLog.i(T.UTILS, "installation referrer: service unavailable");
break;
case InstallReferrerResponse.DEVELOPER_ERROR:
break;
case InstallReferrerResponse.SERVICE_DISCONNECTED:
break;
}

stopService();
Expand Down
2 changes: 1 addition & 1 deletion WordPress/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1395,7 +1395,7 @@
<!-- Error Messages -->
<!-- The following messages can\'t be factorized due to i18n -->
<string name="error_refresh_posts">Posts couldn\'t be refreshed at this time</string>
<string name="error_refresh_pages">Pages couldn\'t be refreshed at this time</string>
<string name="error_refresh_pages" tools:ignore="UnusedResources">Pages couldn\'t be refreshed at this time</string>

@aforcier aforcier Jan 24, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

If this is unused can we just get rid of the string res?

@jtreanor jtreanor Jan 25, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

It is not unused, but lint is falsely failing with an unused resources error. I don't know of another way to fix the error.

WordPress-Android/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt

Line 184 in ea8da23

showSnackbar(SnackbarMessageHolder(string.error_refresh_pages))

@aforcier aforcier Jan 25, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Oh I see - that's pretty odd. At first I thought the direct import of R.string in that file was tripping up the parser, but lint still fails for that string even if I change it. Fair enough 👍

<string name="error_refresh_comments">Comments couldn\'t be refreshed at this time</string>
<string name="error_refresh_comments_showing_older">Comments couldn\'t be refreshed at this time - showing older comments</string>
<string name="error_refresh_stats">Stats couldn\'t be refreshed at this time</string>
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.automattic.android:fetchstyle:1.1'
}
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Mar 28 12:21:02 CEST 2018
#Tue Jan 22 14:59:58 GMT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
4 changes: 2 additions & 2 deletions libs/analytics/WordPressAnalytics/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.novoda:bintray-release:0.8.1'
}
}
Expand All @@ -27,7 +27,7 @@ dependencies {

android {
compileSdkVersion 27
buildToolsVersion "27.0.3"
buildToolsVersion "28.0.3"

defaultConfig {
versionName "1.3.0"
Expand Down
2 changes: 1 addition & 1 deletion libs/editor/.travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ android:
- extra-android-support
- platform-tools
- tools
- build-tools-27.0.3
- build-tools-28.0.3
- android-27

env:
Expand Down
6 changes: 4 additions & 2 deletions libs/editor/WordPressEditor/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'com.android.tools.build:gradle:3.2.1'
}
}

Expand All @@ -26,7 +26,7 @@ apply from: 'https://gist.githubusercontent.com/hypest/f526fe0775dedce0ce0133f14

android {
compileSdkVersion 27
buildToolsVersion '27.0.3'
buildToolsVersion '28.0.3'

defaultConfig {
versionCode 13
Expand Down Expand Up @@ -66,12 +66,14 @@ dependencies {
if (rootProject.ext.buildGutenbergFromSource) {
implementation (project(':react-native-gutenberg-bridge')) {
exclude group: 'com.squareup.okhttp3'
exclude group: 'com.google.code.findbugs'
}
} else {
implementation (waitJitpack('com.github.wordpress-mobile', 'gutenberg-mobile', submoduleGitHash('../../../', 'libs/gutenberg-mobile'))) {
// Inheriting RN's okhttp version can interfere with FluxC SSL handling
// See https://github.com/wordpress-mobile/WordPress-Android/issues/9032 and https://github.com/wordpress-mobile/WordPress-FluxC-Android/issues/919
exclude group: 'com.squareup.okhttp3'
exclude group: 'com.google.code.findbugs'
}
}

Expand Down
2 changes: 1 addition & 1 deletion libs/editor/example/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'com.android.tools.build:gradle:3.2.1'
}
}

Expand Down
2 changes: 1 addition & 1 deletion libs/login/.travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ android:
- extra-android-support
- platform-tools
- tools
- build-tools-27.0.3
- build-tools-28.0.3
- android-27

env:
Expand Down
4 changes: 2 additions & 2 deletions libs/login/WordPressLoginFlow/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.android.tools.build:gradle:3.2.1'
}
}

Expand All @@ -18,7 +18,7 @@ repositories {

android {
compileSdkVersion 27
buildToolsVersion "27.0.3"
buildToolsVersion "28.0.3"

defaultConfig {
minSdkVersion 16
Expand Down
4 changes: 2 additions & 2 deletions libs/networking/WordPressNetworking/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'com.android.tools.build:gradle:3.2.1'
}
}

Expand All @@ -19,7 +19,7 @@ apply plugin: 'maven'

android {
compileSdkVersion 27
buildToolsVersion '27.0.3'
buildToolsVersion '28.0.3'

defaultConfig {
minSdkVersion 14
Expand Down
2 changes: 1 addition & 1 deletion libs/utils/.travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ android:
- extra-android-support
- platform-tools
- tools
- build-tools-27.0.3
- build-tools-28.0.3
- android-27

env:
Expand Down
4 changes: 2 additions & 2 deletions libs/utils/WordPressUtils/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.novoda:bintray-release:0.8.1'
}
}
Expand All @@ -31,7 +31,7 @@ android {
useLibrary 'org.apache.http.legacy'

compileSdkVersion 27
buildToolsVersion '27.0.3'
buildToolsVersion '28.0.3'

defaultConfig {
versionName "1.22"
Expand Down