diff options
| author | Jose <jose@zeroc.com> | 2019-09-24 15:04:24 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-09-24 15:04:24 +0200 |
| commit | 5b925b42dc3741e0a3471967b794fa6b212808cb (patch) | |
| tree | 9c79e99d946a588b72a2dd908c67da4625d1562b /java | |
| parent | Print unexpected exception in C# Ice/slicing/objects test (diff) | |
| download | ice-5b925b42dc3741e0a3471967b794fa6b212808cb.tar.bz2 ice-5b925b42dc3741e0a3471967b794fa6b212808cb.tar.xz ice-5b925b42dc3741e0a3471967b794fa6b212808cb.zip | |
Fix DK 13 build failures
Diffstat (limited to 'java')
| -rw-r--r-- | java/build.gradle | 11 | ||||
| -rw-r--r-- | java/gradle/library.gradle | 6 |
2 files changed, 7 insertions, 10 deletions
diff --git a/java/build.gradle b/java/build.gradle index ba6e3ffaadd..1fa14b9c0a2 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -74,10 +74,13 @@ if(!System.env.ICE_BIN_DIST?.split(" ").find{ it == 'all' || it.contains('java') classpath = files(exportedProjects.collect { project(it).javadoc.classpath }) destinationDir = file("${buildDir}/docs/javadoc") - if(GradleVersion.current() >= GradleVersion.version('4.1') && JavaVersion.current() > JavaVersion.VERSION_1_10) { - // TODO: --no-module-directories is an undocumented option required for the - // generated search to work properly. Without this option, search returns - // .../undefined/... URLs. + if(GradleVersion.current() >= GradleVersion.version('4.7') && + JavaVersion.current() > JavaVersion.VERSION_1_10 && JavaVersion.current() <= JavaVersion.VERSION_11) { + // --no-module-directories is an undocumented option required for the generated search to work properly. + // Without this option, search returns ../undefined/... URLs. + // + // This option was removed on JDK 13 https://bugs.openjdk.java.net/browse/JDK-8215582 + // options.addBooleanOption('-no-module-directories', true) } options.addBooleanOption('html5', true) diff --git a/java/gradle/library.gradle b/java/gradle/library.gradle index 2fd6ceb5c84..a287dc8d939 100644 --- a/java/gradle/library.gradle +++ b/java/gradle/library.gradle @@ -77,12 +77,6 @@ javadoc { } failOnError = true options.header = project.ext.displayName - if(GradleVersion.current() >= GradleVersion.version('4.1') && JavaVersion.current() > JavaVersion.VERSION_1_10) { - // TODO: --no-module-directories is an undocumented option required for the - // generated search to work properly. Without this option, search returns - // .../undefined/... URLs. - options.addBooleanOption('-no-module-directories', true) - } } task javadocJar(type: Jar, dependsOn: javadoc) { |