Skip to content

try to rebuild module-info classes even when java 8 is used #410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pjfanning wants to merge 1 commit into from
Closed

try to rebuild module-info classes even when java 8 is used #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions poi-examples/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,18 @@ task compileJava9(type: JavaCompile) {
dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar'

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()
options.compilerArgs = [
'--patch-module', "${MODULE_NAME}=${sourceSets.main.output.classesDirs.asPath}",
'--module-path', files(MODULE_COMPILE_PATH).asPath
]


onlyIf {
jdkVersion > 8
}
}

task cacheJava9(type: Copy) {
Expand Down
16 changes: 6 additions & 10 deletions poi-excelant/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,18 @@ task compileJava9(type: JavaCompile) {
dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar'

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()
options.compilerArgs = [
'--patch-module', "${MODULE_NAME}=${sourceSets.main.output.classesDirs.asPath}",
'--module-path', files(MAIN_MODULE_PATH).asPath
]

onlyIf {
jdkVersion > 8
}
}

task cacheJava9(type: Copy) {
Expand All @@ -96,20 +94,18 @@ task compileTest9(type: JavaCompile) {
dependsOn 'compileTestJava', ':poi-ooxml:jar', ':poi-scratchpad:jar'

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 = [
'--patch-module', "${MODULE_NAME}=${(sourceSets.main.output.classesDirs + sourceSets.test.output.classesDirs).asPath}",
'--module-path', files(TEST_MODULE_PATH).asPath
]
classpath = files()

onlyIf {
jdkVersion > 8
}
}


Expand Down
8 changes: 3 additions & 5 deletions poi-integration/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,20 +107,18 @@ task compileTest9(type: JavaCompile) {
dependsOn 'compileTestJava', ':poi-ooxml:testJar', ':poi-scratchpad:testJar', ':poi-examples:jar'

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 = [
'--patch-module', "${MODULE_NAME}=${(sourceSets.main.output.classesDirs + sourceSets.test.output.classesDirs).asPath}",
'--module-path', files(MODULE_COMPILE_PATH).asPath
]
classpath = files()

onlyIf {
jdkVersion > 8
}
}


Expand Down
8 changes: 3 additions & 5 deletions poi-ooxml-full/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,20 +60,18 @@ 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()
options.compilerArgs = [
'--patch-module', "${MODULE_NAME}=${sourceSets.main.output.asPath}",
'--module-path', files(MAIN_MODULE_PATH).asPath
]

onlyIf {
jdkVersion > 8
}
}

task cacheJava9(type: Copy) {
Expand Down
8 changes: 3 additions & 5 deletions poi-ooxml-lite-agent/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,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()
Expand All @@ -54,10 +56,6 @@ task compileJava9(type: JavaCompile) {
'--module-path', sourceSets.main.compileClasspath.asPath
]
}

onlyIf {
jdkVersion > 8
}
}

task cacheJava9(type: Copy) {
Expand Down
8 changes: 3 additions & 5 deletions poi-ooxml-lite/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,11 @@ sourcesJar.dependsOn 'compileOoxmlLite'

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()
Expand All @@ -113,10 +115,6 @@ task compileJava9(type: JavaCompile, dependsOn: 'compileJava') {
'--module-path', files(MAIN_MODULE_PATH).asPath
]
}

onlyIf {
jdkVersion > 8
}
}

task cacheJava9(type: Copy, dependsOn: 'compileJava9') {
Expand Down
16 changes: 6 additions & 10 deletions poi-ooxml/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,20 +180,18 @@ task compileJava9(type: JavaCompile) {
dependsOn 'compileJava', ':poi:jar'

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()
options.compilerArgs = [
'--patch-module', "${MODULE_NAME}=${sourceSets.main.output.classesDirs.asPath}",
'--module-path', files(MAIN_MODULE_PATH).asPath
]

onlyIf {
jdkVersion > 8
}
}

task cacheJava9(type: Copy) {
Expand All @@ -207,20 +205,18 @@ task compileTest9(type: JavaCompile) {
dependsOn 'compileTestJava', ':poi:testJar'

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 = [
'--patch-module', "${MODULE_NAME}=${(sourceSets.main.output.classesDirs + sourceSets.test.output.classesDirs).asPath}",
'--module-path', files(TEST_MODULE_PATH).asPath
]
classpath = files()

onlyIf {
jdkVersion > 8
}
}


Expand Down
16 changes: 6 additions & 10 deletions poi-scratchpad/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,20 +65,18 @@ task compileJava9(type: JavaCompile) {
dependsOn 'compileJava', ':poi:jar'

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()
options.compilerArgs = [
'--patch-module', "${MODULE_NAME}=${sourceSets.main.output.classesDirs.asPath}",
'--module-path', files(MAIN_MODULE_PATH).asPath
]

onlyIf {
jdkVersion > 8
}
}

task cacheJava9(type: Copy) {
Expand All @@ -92,20 +90,18 @@ task compileTest9(type: JavaCompile) {
dependsOn 'compileTestJava', ':poi:jar'

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 = [
'--patch-module', "${MODULE_NAME}=${(sourceSets.main.output.classesDirs + sourceSets.test.output.classesDirs).asPath}",
'--module-path', files(TEST_MODULE_PATH).asPath
]
classpath = files()

onlyIf {
jdkVersion > 8
}
}


Expand Down
17 changes: 6 additions & 11 deletions poi/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,20 +94,18 @@ 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()
options.compilerArgs = [
'--patch-module', "${MODULE_NAME}=${sourceSets.main.output.classesDirs.asPath}",
'--module-path', sourceSets.main.compileClasspath.asPath
]

onlyIf {
jdkVersion > 8
}
}

task cacheJava9(type: Copy) {
Expand All @@ -121,21 +119,18 @@ 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 = [
'--patch-module', "${MODULE_NAME}=${(sourceSets.main.output.classesDirs + sourceSets.test.output.classesDirs).asPath}",
'--module-path', files(MODULE_PATH).asPath
]
classpath = files()

onlyIf {
jdkVersion > 8
}
}


Expand Down
Binary file modified poi/src/main/java9/module-info.class
View file
Open in desktop
Binary file not shown.
Binary file modified poi/src/test/java9/module-info.class
View file
Open in desktop
Binary file not shown.