git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1904908 13f79535-47bb-0310-9956-ffa450edef68tags/REL_5_2_4
@@ -213,7 +213,7 @@ subprojects { | |||
failOnError = true | |||
maxMemory = "1024M" | |||
javadocTool = javaToolchains.javadocToolFor { | |||
languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11) | |||
languageVersion = JavaLanguageVersion.of(jdkVersion) | |||
} | |||
doFirst { |
@@ -59,7 +59,7 @@ task compileJava9(type: JavaCompile) { | |||
dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar' | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11) | |||
languageVersion = JavaLanguageVersion.of(jdkVersion) | |||
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor) | |||
} | |||
@@ -69,7 +69,7 @@ task compileJava9(type: JavaCompile) { | |||
dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar' | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11) | |||
languageVersion = JavaLanguageVersion.of(jdkVersion) | |||
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor) | |||
} | |||
destinationDirectory = file(JAVA9_OUT + VERSIONS9) |
@@ -60,7 +60,7 @@ task compileJava9(type: JavaCompile) { | |||
dependsOn 'compileJava' | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11) | |||
languageVersion = JavaLanguageVersion.of(jdkVersion) | |||
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor) | |||
} | |||
destinationDirectory = file(JAVA9_OUT + VERSIONS9) |
@@ -207,7 +207,7 @@ task compileTest9(type: JavaCompile) { | |||
dependsOn 'compileTestJava', ':poi:testJar' | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11) | |||
languageVersion = JavaLanguageVersion.of(jdkVersion) | |||
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor) | |||
} | |||
destinationDirectory = file(TEST9_OUT + VERSIONS9) |
@@ -94,7 +94,7 @@ task compileJava9(type: JavaCompile) { | |||
dependsOn 'compileJava' | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11) | |||
languageVersion = JavaLanguageVersion.of(jdkVersion) | |||
} | |||
destinationDirectory = file(JAVA9_OUT + VERSIONS9) | |||
source = file(JAVA9_SRC) |