Skip to content

Commit

Permalink
Re enable full build with jdk17
Browse files Browse the repository at this point in the history
  • Loading branch information
pderop committed Apr 16, 2024
1 parent 493f172 commit a2d6a80
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ subprojects {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(8)
languageVersion = JavaLanguageVersion.of(name == "docs" ? 17 : 8)
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/setup.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
import org.gradle.util.VersionNumber

if (project.name == 'reactor-netty-examples' || project.name == 'reactor-netty-graalvm-smoke-tests') {
if (project.name == 'reactor-netty-examples' || project.name == 'reactor-netty-graalvm-smoke-tests' || project.name == 'docs') {
return
}

Expand Down
20 changes: 11 additions & 9 deletions reactor-netty/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,14 @@ task docsZip(type: Zip) {
archiveClassifier = 'docs'
duplicatesStrategy "fail"

if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
logger.lifecycle("Adding dependency on :docs:antora (JDK version is >= 17)")
dependsOn(':docs:antora')
}

def docsDir = file('../docs/build/site')
def isSnapshot = project.version.endsWith('-SNAPSHOT')
def version = isSnapshot ? project.version.takeWhile { it != '-' } : project.version
def pdfFile = file("../docs/build/assembler/reactor-netty/${version}/reactor-netty-reference-guide.pdf")
boolean forcePdf = project.hasProperty('forcePdf')

doFirst {
Expand All @@ -63,14 +67,12 @@ task docsZip(type: Zip) {
into 'docs'
}

if (pdfFile.exists()) {
if (!isSnapshot || forcePdf) {
logger.lifecycle("pdf ${pdfFile} included in docs zip")

from(pdfFile) {
rename { fileName ->
"docs/reactor-netty-reference-guide-${project.version}.pdf"
}
if (!isSnapshot || forcePdf) {
def pdfFile = file("../docs/build/assembler/reactor-netty/${version}/reactor-netty-reference-guide.pdf")
logger.lifecycle("${pdfFile} will be included in docs zip")
from(pdfFile) {
rename { fileName ->
"docs/reactor-netty-reference-guide-${project.version}.pdf"
}
}
}
Expand Down

0 comments on commit a2d6a80

Please sign in to comment.