Merge branch '2.4.x'

Closes gh-25497
This commit is contained in:
Andy Wilkinson
2021-03-04 19:15:03 +00:00
9 changed files with 166 additions and 24 deletions

View File

@@ -69,7 +69,7 @@ processResources {
}
compileJava {
if ((!project.hasProperty("buildJavaHome")) && JavaVersion.current() == JavaVersion.VERSION_1_8) {
if ((!project.hasProperty("toolchainVersion")) && JavaVersion.current() == JavaVersion.VERSION_1_8) {
options.compilerArgs += ['-Xlint:-sunapi', '-XDenableSunApiLintControl']
}
}