Merge branch '3.3.x' into 3.4.x
Closes gh-44130
This commit is contained in:
@@ -84,12 +84,6 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
compileJava {
|
|
||||||
if ((!project.hasProperty("toolchainVersion")) && JavaVersion.current() == JavaVersion.VERSION_1_8) {
|
|
||||||
options.compilerArgs += ['-Xlint:-sunapi', '-XDenableSunApiLintControl']
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
plugins.withType(EclipsePlugin) {
|
plugins.withType(EclipsePlugin) {
|
||||||
eclipse {
|
eclipse {
|
||||||
classpath.file { merger ->
|
classpath.file { merger ->
|
||||||
|
|||||||
Reference in New Issue
Block a user