zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-04-30 03:57:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Some more changes to make it possible to use Java 11 to compile (#732)

Browse source 
Add the class paths of the source files generated by annotation processors to
the javadoc task's class path so that it doesn't complain about missing
Dagger classes.

Also remove empty <p> tags in all generated source files, because jaxb
genrerates files in multiple locations.

Lastly, for unkown reasons when the source level is set to > 8, the core
subproject throws a warning about a Gradle internal annotator processor
that only supports up to Java 8 and cause the Java compliation to fail because
we set -Werror on all java compliation tasks. I don't think there is a
strong reason that we set -Werror anyway, so this commit removes it.
This commit is contained in:
Lai Jiang 2020-07-31 17:21:28 -04:00 • committed by GitHub
parent 0d857f8291
commit d6cc43277e
4 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build.gradle
View file

@ -308,9 +308,14 @@ subprojects {
} }
} }
// No need to produce javadoc for the docs subproject, which has no APIs to
// expose to users.
if (project.name != 'docs') {
javadocSource << project.sourceSets.main.allJava javadocSource << project.sourceSets.main.allJava
javadocClasspath << project.sourceSets.main.compileClasspath javadocClasspath << project.sourceSets.main.compileClasspath
javadocClasspath << "${buildDir}/generated/sources/annotationProcessor/java/main"
javadocDependentTasks << project.tasks.compileJava javadocDependentTasks << project.tasks.compileJava
}
} }
// If "-P verboseTestOutput=true" is passed in, configure all subprojects to dump all of their // If "-P verboseTestOutput=true" is passed in, configure all subprojects to dump all of their

4
core/build.gradle
View file

@ -404,7 +404,9 @@ task jaxbToJava {
} }
} }
} }
execInBash('find . -name *.java -exec sed -i /\\<p\\>\\$/d {} +', outputDir) execInBash(
'find . -name *.java -exec sed -i /\\*\\ \\<p\\>\\$/d {} +',
generatedDir)
} }
} }

12
docs/build.gradle
View file

@ -45,12 +45,16 @@ task flowDocsTool(type: JavaExec) {
} }
tasks.compileJava { tasks.compileJava {
options.compilerArgs = ["--add-exports", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED", options.compilerArgs = ["--add-exports",
"--add-exports", "jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
"--add-exports", "jdk.javadoc/jdk.javadoc.internal.tool=ALL-UNNAMED"] "--add-exports",
"jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
"--add-exports",
"jdk.javadoc/jdk.javadoc.internal.tool=ALL-UNNAMED"]
} }
tasks.test { tasks.test {
jvmArgs = ['--add-exports', 'jdk.javadoc/jdk.javadoc.internal.tool=ALL-UNNAMED'] jvmArgs = ['--add-exports',
'jdk.javadoc/jdk.javadoc.internal.tool=ALL-UNNAMED']
} }

6
java_common.gradle
View file

@ -100,7 +100,11 @@ tasks.withType(JavaCompile).configureEach {
// The -Werror flag causes Intellij to fail on deprecated api use. // The -Werror flag causes Intellij to fail on deprecated api use.
// Allow IDE user to turn off this flag by specifying a Gradle VM // Allow IDE user to turn off this flag by specifying a Gradle VM
// option from inside the IDE. // option from inside the IDE.
if (System.getProperty('no_werror') != 'true') { if (System.getProperty('no_werror') != 'true' &&
// The core project throws an warning about Gradle annotation processor
// not compatible with Java source version > 8. Re-assess once the
// warning is fixed.
getProject().name != 'core') {
options.compilerArgs << "-Werror" options.compilerArgs << "-Werror"
} }
options.errorprone.disableWarningsInGeneratedCode = true options.errorprone.disableWarningsInGeneratedCode = true