Merge branch 'main' into java_21

This commit is contained in:
Uwe Schindler 2024-02-25 16:39:41 +01:00 committed by GitHub
commit 0ccb119495
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 1 deletions

View File

@ -53,6 +53,7 @@ allprojects {
dependsOn sourceSets.main.compileClasspath dependsOn sourceSets.main.compileClasspath
classpath = sourceSets.main.compileClasspath classpath = sourceSets.main.compileClasspath
srcDirSet = sourceSets.main.java srcDirSet = sourceSets.main.java
releaseVersion = rootProject.minJavaVersion
outputDir = project.javadoc.destinationDir outputDir = project.javadoc.destinationDir
} }
@ -72,6 +73,7 @@ allprojects {
dependsOn sourceSets.main.compileClasspath dependsOn sourceSets.main.compileClasspath
classpath = sourceSets.main.compileClasspath classpath = sourceSets.main.compileClasspath
srcDirSet = sourceSets.main.java srcDirSet = sourceSets.main.java
releaseVersion = rootProject.minJavaVersion
relativeProjectLinks = true relativeProjectLinks = true
@ -280,6 +282,9 @@ class RenderJavadocTask extends DefaultTask {
@Input @Input
boolean relativeProjectLinks = false boolean relativeProjectLinks = false
@Input
JavaVersion releaseVersion
@Internal @Internal
Map<String, File> offlineLinks = [:] Map<String, File> offlineLinks = [:]
@ -423,7 +428,7 @@ class RenderJavadocTask extends DefaultTask {
opts << [ '-linkoffline', url, dir ] opts << [ '-linkoffline', url, dir ]
} }
opts << [ '--release', 21 ] opts << [ '--release', releaseVersion.toString() ]
opts << '-Xdoclint:all,-missing' opts << '-Xdoclint:all,-missing'
// Increase Javadoc's heap. // Increase Javadoc's heap.