From 22d2efaf5bd3f59f6919685422a989b4fdcfda23 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Fri, 11 Jul 2025 21:40:19 +0100
Subject: [PATCH] Gradle: avoid deprecated buildDir property (#838)

* Gradle: avoid deprecated buildDir property

* try again
---
 build.gradle                 | 6 +++---
 poi-integration/build.gradle | 2 +-
 poi-ooxml-full/build.gradle  | 4 ++--
 poi-ooxml-lite/build.gradle  | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2b252fe14d..776a5cdd1c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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
diff --git a/poi-integration/build.gradle b/poi-integration/build.gradle
index 35e588e3cc..4403eb4dc8 100644
--- a/poi-integration/build.gradle
+++ b/poi-integration/build.gradle
@@ -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")
 
diff --git a/poi-ooxml-full/build.gradle b/poi-ooxml-full/build.gradle
index 90d4a8f231..f0822c300e 100644
--- a/poi-ooxml-full/build.gradle
+++ b/poi-ooxml-full/build.gradle
@@ -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 {
diff --git a/poi-ooxml-lite/build.gradle b/poi-ooxml-lite/build.gradle
index 47aff7b4fb..e87e85344d 100644
--- a/poi-ooxml-lite/build.gradle
+++ b/poi-ooxml-lite/build.gradle
@@ -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 {