From a2b29a6cb890c53e87fdc2ad046cc437ddb0f120 Mon Sep 17 00:00:00 2001
From: Scott Palmer <swpalmer@gmail.com>
Date: Fri, 13 Jan 2023 17:04:03 -0500
Subject: [PATCH] Avoid reference to deprecated property. (#221)

---
 .../moduleplugin/tasks/MergeClassesHelper.java              | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/org/javamodularity/moduleplugin/tasks/MergeClassesHelper.java b/src/main/java/org/javamodularity/moduleplugin/tasks/MergeClassesHelper.java
index d87cc6f..f44bd4f 100644
--- a/src/main/java/org/javamodularity/moduleplugin/tasks/MergeClassesHelper.java
+++ b/src/main/java/org/javamodularity/moduleplugin/tasks/MergeClassesHelper.java
@@ -12,6 +12,7 @@
 import org.gradle.api.tasks.compile.AbstractCompile;
 import org.gradle.api.tasks.compile.JavaCompile;
 import org.gradle.jvm.tasks.Jar;
+import org.gradle.util.GradleVersion;
 import org.javamodularity.moduleplugin.JavaProjectHelper;
 import org.javamodularity.moduleplugin.extensions.CompileModuleOptions;
 import org.javamodularity.moduleplugin.internal.StreamHelper;
@@ -128,6 +129,11 @@ public Task getTask() {
 
         @Override
         public File getDestinationDir() {
+            if (GradleVersion.current().compareTo(GradleVersion.version("6.1")) >= 0) {
+                // AbstractCompile#getDestinationDirectory() is supported from Gradle 6.1
+                // https://docs.gradle.org/6.1/javadoc/org/gradle/api/tasks/compile/AbstractCompile.html#getDestinationDirectory--
+                return task.getDestinationDirectory().get().getAsFile();
+            }
             return task.getDestinationDir();
         }