git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1908515 13f79535-47bb-0310-9956-ffa450edef68tags/REL_5_2_4
@@ -51,6 +51,7 @@ final List MODULE_COMPILE_PATH = sourceSets.main.compileClasspath.findAll{ it.pa | |||
task compileJava9(type: JavaCompile) { | |||
dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar' | |||
onlyIf {jdkVersion > 8} | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) |
@@ -59,6 +59,7 @@ final String OOXML_LITE_INCLUDES = "^(com/microsoft/schemas|org/(etsi|openxmlfor | |||
task compileJava9(type: JavaCompile) { | |||
dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar' | |||
onlyIf {jdkVersion > 8} | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) | |||
@@ -76,6 +77,7 @@ task compileJava9(type: JavaCompile) { | |||
task compileTest9(type: JavaCompile) { | |||
dependsOn 'compileTestJava', ':poi-ooxml:jar', ':poi-scratchpad:jar' | |||
onlyIf {jdkVersion > 8} | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) |
@@ -92,6 +92,7 @@ final String OOXML_LITE_INCLUDES = "^(com/microsoft/schemas|org/(etsi|openxmlfor | |||
task compileTest9(type: JavaCompile) { | |||
dependsOn 'compileTestJava', ':poi-ooxml:testJar', ':poi-scratchpad:testJar', ':poi-examples:jar' | |||
onlyIf {jdkVersion > 8} | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) |
@@ -56,6 +56,7 @@ compileJava { | |||
task compileJava9(type: JavaCompile) { | |||
dependsOn 'compileJava' | |||
onlyIf {jdkVersion > 8} | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) |
@@ -38,6 +38,7 @@ java { | |||
task compileJava9(type: JavaCompile) { | |||
dependsOn 'compileJava' | |||
onlyIf {jdkVersion > 8} | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) |
@@ -90,6 +90,7 @@ processResources.dependsOn 'compileOoxmlLite' | |||
sourcesJar.dependsOn 'compileOoxmlLite' | |||
task compileJava9(type: JavaCompile, dependsOn: 'compileJava') { | |||
onlyIf {jdkVersion > 8} | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) | |||
} |
@@ -152,6 +152,7 @@ compileJava { | |||
task compileJava9(type: JavaCompile) { | |||
dependsOn 'compileJava', ':poi:jar' | |||
onlyIf {jdkVersion > 8} | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) | |||
@@ -169,6 +170,7 @@ task compileJava9(type: JavaCompile) { | |||
task compileTest9(type: JavaCompile) { | |||
dependsOn 'compileTestJava', ':poi:testJar' | |||
onlyIf {jdkVersion > 8} | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) |
@@ -55,6 +55,7 @@ final List TEST_MODULE_PATH = sourceSets.test.runtimeClasspath.findAll{ it.path | |||
task compileJava9(type: JavaCompile) { | |||
dependsOn 'compileJava', ':poi:jar' | |||
onlyIf {jdkVersion > 8} | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) | |||
@@ -72,6 +73,7 @@ task compileJava9(type: JavaCompile) { | |||
task compileTest9(type: JavaCompile) { | |||
dependsOn 'compileTestJava', ':poi:jar' | |||
onlyIf {jdkVersion > 8} | |||
javaCompiler = javaToolchains.compilerFor { | |||
languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion)) |
@@ -97,6 +97,7 @@ task compileJava9(type: JavaCompile) { | |||
'--module-path', sourceSets.main.compileClasspath.asPath | |||
] | |||
} | |||
compileJava9.onlyIf {jdkVersion > 8} | |||
task compileTest9(type: JavaCompile) { | |||
dependsOn 'compileTestJava' | |||
@@ -114,6 +115,7 @@ task compileTest9(type: JavaCompile) { | |||
] | |||
classpath = files() | |||
} | |||
compileTest9.onlyIf {jdkVersion > 8} | |||
jar { | |||
dependsOn compileJava9 |