pashko/apache-poi
1
0
Fork 0
mirror of https://github.com/apache/poi.git synced 2026-02-27 20:40:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Gradle: avoid deprecated buildDir property (#838)

Browse Source 
* Gradle: avoid deprecated buildDir property

* try again
This commit is contained in:
PJ Fanning 2025-07-11 21:40:19 +01:00 committed by GitHub
parent 1eee67fb8b
commit 22d2efaf5b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -129,9 +129,9 @@ subprojects {
jdkVendor = (project.properties['jdkVendor'] ?: '') as String
JAVA9_SRC = 'src/main/java9'
JAVA9_OUT = "${buildDir}/classes/java9/main/"
JAVA9_OUT = layout.buildDirectory.dir('classes/java9/main/').get().asFile.absolutePath
TEST9_SRC = 'src/test/java9'
TEST9_OUT = "${buildDir}/classes/java9/test/"
TEST9_OUT = layout.buildDirectory.dir('classes/java9/test/').get().asFile.absolutePath
VERSIONS9 = 'META-INF/versions/9'
NO_SCRATCHPAD = (findProperty("scratchpad.ignore") == "true")
@ -621,7 +621,7 @@ tasks.register('allJavaDoc', Javadoc) {
// for possible settings see https://docs.gradle.org/current/dsl/org.gradle.api.tasks.javadoc.Javadoc.html
classpath = files(subprojects.collect { it.sourceSets.main.compileClasspath })
destinationDir = file("${buildDir}/docs/javadoc")
destinationDir = layout.buildDirectory.dir('docs/javadoc').get().asFile
maxMemory = "2048M"
// for possible options see https://docs.gradle.org/current/javadoc/org/gradle/external/javadoc/StandardJavadocDocletOptions.html

2
poi-integration/build.gradle
View File

@ -18,7 +18,7 @@ import java.util.regex.Pattern
==================================================================== */
final String TEST9_SRC = 'src/test/java9'
final String TEST9_OUT = "${buildDir}/classes/java9/test/"
final String TEST9_OUT = layout.buildDirectory.dir('classes/java9/test/').get().asFile.absolutePath
final String VERSIONS9 = 'META-INF/versions/9'
final boolean IBMVM = System.getProperty("java.vendor").contains("IBM")

4
poi-ooxml-full/build.gradle
View File

@ -18,8 +18,8 @@ import java.util.regex.Pattern
==================================================================== */
final String MODULE_NAME = 'org.apache.poi.ooxml.schemas'
final String BEANS_SRC = "${buildDir}/generated-sources"
final String BEANS_RES = "${buildDir}/generated-resources"
final String BEANS_SRC = layout.buildDirectory.dir('generated-sources').get().asFile.absolutePath
final String BEANS_RES = layout.buildDirectory.dir('generated-resources').get().asFile.absolutePath
sourceSets {
main {

8
poi-ooxml-lite/build.gradle
View File

@ -17,8 +17,8 @@ import java.util.regex.Pattern
limitations under the License.
==================================================================== */
final String BEANS_SRC = "${buildDir}/generated-sources"
final String BEANS_RES = "${buildDir}/generated-resources"
final String BEANS_SRC = layout.buildDirectory.dir('generated-sources').get().asFile.absolutePath
final String BEANS_RES = layout.buildDirectory.dir('generated-resources').get().asFile.absolutePath
sourceSets {
main {
@ -72,12 +72,12 @@ tasks.register('compileOoxmlLite', Copy) {
// (as in AlternateContentDocument$AlternateContent$Choice.class) are always stale
// copy re-/sources to modules own directory to pacify IntelliJ, which doesn't like the same source dir in multiple modules
from(project(':poi-ooxml-full').buildDir) {
from(project(':poi-ooxml-full').layout.buildDirectory.asFile) {
include 'generated-sources/**'
include 'generated-resources/**'
include 'classes/java/main/**'
}
into(buildDir)
into(layout.buildDirectory.asFile)
}
compileJava {