Refactor for Gradle 9 compatibility

Use Cursor’s `claude-4-sonnet` model to replace deprecated constructs from Gradle 7 and earlier versions with their Gradle 8 and 9 equivalents to quiet deprecation warnings.

Co-Authored-By: Claude <[email protected]>
Signed-off-by: Roger Sheen <[email protected]>

Author: infotexture

build.gradle

@@ -20,9 +20,10 @@ dependencies {
 
 import com.github.eerohele.DitaOtTask
 import com.github.eerohele.SaxonXsltTask
+import org.gradle.process.ExecOperations
 
 def getPropertyOrDefault(String name, def defaultValue) {
-    hasProperty(name) ? findProperty(name) : defaultValue
+    providers.gradleProperty(name).getOrElse(defaultValue)
 }
 
 String ditaHome = getPropertyOrDefault('ditaHome', projectDir.getParent())
@@ -62,23 +63,25 @@ task extensionPoints(type: SaxonXsltTask) {
 }
 
 task generatePlatformFilter {
-    ant.condition(property: 'platform', value: 'windows') {
-        os(family: 'windows')
-    }
-
-    ant.condition(property: 'platform', value: 'mac' ) {
-        os(family: 'mac')
-    }
+    def outputFile = layout.projectDirectory.file(ditavalFile)
+    outputs.file(outputFile)
 
-    ant.condition(property: 'platform', value: 'unix' ) {
-        os(family: 'unix')
-    }
-
-    ant.echoxml(file: ditavalFile) {
-        val {
-            prop(action: 'include', att: 'platform', val: platform)
-            prop(action: 'exclude', att: 'platform')
+    doLast {
+        // Use Gradle's built-in OS detection instead of Ant
+        def platformName = 'unix'  // default
+        if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
+            platformName = 'windows'
+        } else if (org.gradle.internal.os.OperatingSystem.current().isMacOsX()) {
+            platformName = 'mac'
         }
+
+        // Generate the ditaval file using modern Gradle file operations
+        outputFile.asFile.text = """<?xml version="1.0" encoding="UTF-8"?>
+<val>
+    <prop action="include" att="platform" val="${platformName}"/>
+    <prop action="exclude" att="platform"/>
+</val>
+"""
     }
 }
 
@@ -89,7 +92,7 @@ task generatePropertiesTemplate(type: SaxonXsltTask) {
 }
 
 task autoGenerate(dependsOn: [messages, params, extensionPoints, generatePlatformFilter, generatePropertiesTemplate]) {
-    description 'Run tasks that generate content from resource files and the build environment.'
+    description = 'Run tasks that generate content from resource files and the build environment.'
 }
 
 task pdf(type: DitaOtTask, dependsOn: autoGenerate) {
@@ -141,31 +144,40 @@ task htmlhelp(type: DitaOtTask, dependsOn: autoGenerate) {
     }
 
     doLast {
-        ant.move(todir: outputDir, failonerror: 'no') {
-            fileset(dir: "${outputDir}/htmlhelp", includes: '*.chm')
+        // Move .chm files using modern Gradle file operations
+        def htmlhelpDir = file("${outputDir}/htmlhelp")
+        if (htmlhelpDir.exists()) {
+            copy {
+                from htmlhelpDir
+                into outputDir
+                include '*.chm'
+            }
+            // Clean up the htmlhelp directory
+            delete htmlhelpDir
         }
-
-        ant.delete(dir: "${outputDir}/htmlhelp")
     }
 }
 
 task cleanUp {
     doLast {
-        ant.delete(dir: outputDir)
+        delete outputDir
     }
 }
 
-def commit = new ByteArrayOutputStream()
+// Create a lazy provider for git commit that resolves at task execution time  
+def gitCommitProvider = providers.exec {
+    commandLine('git', 'rev-parse', 'HEAD')
+}.standardOutput.asText.map { it.trim() }
 
 task gitMetadata {
-  doLast {
-    exec {
-        workingDir = projectDir
-        commandLine 'git'
-        args = ['rev-parse', 'HEAD']
-        standardOutput = commit
+    // This task ensures git metadata is available when needed by other tasks
+    doLast {
+        // Force provider evaluation to ensure git command runs
+        logger.info("Git commit: ${gitCommitProvider.get()}")
     }
-  }
+
+    // Mark outputs to help with up-to-date checking
+    outputs.upToDateWhen { false } // Always run since git commit changes frequently
 }
 
 task site(type: DitaOtTask) {
@@ -177,11 +189,15 @@ task site(type: DitaOtTask) {
 
     transtype 'org.dita-ot.html'
 
+    // Evaluate the noCommitMeta flag at configuration time
+    def includeCommitMeta = !providers.gradleProperty('noCommitMeta').map { Boolean.parseBoolean(it) }.getOrElse(false)
+
     properties {
         property(name: 'args.gen.task.lbl', value: 'YES')
         property(name: 'args.rellinks', value: 'noparent')
-        if (!(project.hasProperty('noCommitMeta') && Boolean.parseBoolean(project.property('noCommitMeta')))) {
-          property(name: 'commit', value: commit)
+        if (includeCommitMeta) {
+            // Resolve the provider to get actual commit hash value
+            property(name: 'commit', value: gitCommitProvider.get())
         }
     }
 }

gradle.properties

@@ -1,2 +1,10 @@
 # Fix Java memory errors with Gradle 5.2
 org.gradle.jvmargs = -Xmx1024m
+
+# Gradle 8 features for better performance and caching
+# ↓ Not supported by eerohele/dita-ot-gradle ↓
+# org.gradle.configuration-cache=true
+# org.gradle.configuration-cache.problems=warn
+# ↑ Not supported by eerohele/dita-ot-gradle ↑
+org.gradle.parallel=true
+org.gradle.caching=true