diff options
author | zpencer <spencerfang@google.com> | 2018-07-19 13:35:27 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-19 13:35:27 -0700 |
commit | 37e6f5f7757899a9026ffa9a72a805ce8179f18e (patch) | |
tree | 0d2e944d62ac5237ad5ec52144a47b3b8b8b6666 /build.gradle | |
parent | 499f95d3ec2b5bdce29062de7d8c5b3e2cebfefc (diff) | |
download | grpc-grpc-java-37e6f5f7757899a9026ffa9a72a805ce8179f18e.tar.gz |
Fix jdk10 support in travis (#4653)
For jdk10: disable errorprone and fix javadoc warnings
Diffstat (limited to 'build.gradle')
-rw-r--r-- | build.gradle | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/build.gradle b/build.gradle index 5a01e6e1a..46b8c2ca2 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,9 @@ subprojects { apply plugin: "com.google.osdetector" // The plugin only has an effect if a signature is specified apply plugin: "ru.vyarus.animalsniffer" - if (!rootProject.hasProperty('errorProne') || rootProject.errorProne.toBoolean()) { + // jdk10 not supported by errorprone: https://github.com/google/error-prone/issues/860 + if (!JavaVersion.current().isJava10Compatible() && + rootProject.properties.get('errorProne', true)) { apply plugin: "net.ltgt.errorprone" apply plugin: "net.ltgt.apt" @@ -281,6 +283,15 @@ subprojects { } } + // For jdk10 we must explicitly choose between html4 and html5, otherwise we get a warning + if (JavaVersion.current().isJava10Compatible()) { + allprojects { + tasks.withType(Javadoc) { + options.addBooleanOption('html4', true) + } + } + } + checkstyle { configFile = file("$rootDir/buildscripts/checkstyle.xml") toolVersion = "6.17" |