aboutsummaryrefslogtreecommitdiff
path: root/android-interop-testing
diff options
context:
space:
mode:
authorEric Anderson <ejona@google.com>2017-07-12 10:53:50 -0700
committerEric Anderson <ejona@google.com>2018-07-30 10:51:54 -0700
commit8188a3eb925fc1a2a769ef1ede565c512a5c73de (patch)
tree8827c799599c5821552e1ccc6fe4d5049164ec62 /android-interop-testing
parent6ef5742b42c9c54d3d9261e0a7f469bdb892889b (diff)
downloadgrpc-grpc-java-8188a3eb925fc1a2a769ef1ede565c512a5c73de.tar.gz
gradle: Use config_loc in checkstyle
We previously passed a custom variable to the checkstyle configuration. In Gradle 4.0 config_loc was added for the same purpose. The default configDir is $projectDir/config/checkstyle which is different for each project; we need to override it to always point to the root project.
Diffstat (limited to 'android-interop-testing')
-rw-r--r--android-interop-testing/build.gradle3
1 files changed, 1 insertions, 2 deletions
diff --git a/android-interop-testing/build.gradle b/android-interop-testing/build.gradle
index 5017248dd..929c7a6a3 100644
--- a/android-interop-testing/build.gradle
+++ b/android-interop-testing/build.gradle
@@ -26,13 +26,12 @@ subprojects {
apply plugin: "checkstyle"
checkstyle {
- configFile = file("$rootDir/../buildscripts/checkstyle.xml")
+ configDir = file("$rootDir/../buildscripts")
toolVersion = "6.17"
ignoreFailures = false
if (rootProject.hasProperty("checkstyle.ignoreFailures")) {
ignoreFailures = rootProject.properties["checkstyle.ignoreFailures"].toBoolean()
}
- configProperties["rootDir"] = "$rootDir/../"
}
// Checkstyle doesn't run automatically with android