aboutsummaryrefslogtreecommitdiffstats
path: root/poi/build.gradle
diff options
context:
space:
mode:
Diffstat (limited to 'poi/build.gradle')
-rw-r--r--poi/build.gradle17
1 files changed, 6 insertions, 11 deletions
diff --git a/poi/build.gradle b/poi/build.gradle
index b411b99dc5..6bf2fa7180 100644
--- a/poi/build.gradle
+++ b/poi/build.gradle
@@ -94,9 +94,11 @@ task compileJava9(type: JavaCompile) {
dependsOn 'compileJava'
javaCompiler = javaToolchains.compilerFor {
- languageVersion = JavaLanguageVersion.of(jdkVersion)
+ languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
}
+ sourceCompatibility = 1.9
+ targetCompatibility = 1.9
destinationDirectory = file(JAVA9_OUT + VERSIONS9)
source = file(JAVA9_SRC)
classpath = files()
@@ -104,10 +106,6 @@ task compileJava9(type: JavaCompile) {
'--patch-module', "${MODULE_NAME}=${sourceSets.main.output.classesDirs.asPath}",
'--module-path', sourceSets.main.compileClasspath.asPath
]
-
- onlyIf {
- jdkVersion > 8
- }
}
task cacheJava9(type: Copy) {
@@ -121,10 +119,11 @@ task compileTest9(type: JavaCompile) {
dependsOn 'compileTestJava'
javaCompiler = javaToolchains.compilerFor {
- languageVersion = JavaLanguageVersion.of(jdkVersion)
+ languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
}
-
+ sourceCompatibility = 1.9
+ targetCompatibility = 1.9
destinationDirectory = file(TEST9_OUT + VERSIONS9)
source = file(TEST9_SRC)
options.compilerArgs = [
@@ -132,10 +131,6 @@ task compileTest9(type: JavaCompile) {
'--module-path', files(MODULE_PATH).asPath
]
classpath = files()
-
- onlyIf {
- jdkVersion > 8
- }
}