From b5a31b7f42ee02527d64888a1e4c66b71baf1957 Mon Sep 17 00:00:00 2001
From: Big Andy <8012398+big-andy-coates@users.noreply.github.com>
Date: Tue, 20 Feb 2024 12:51:23 +0000
Subject: [PATCH] Fix compatibility issue with Gradle 7.6+

fixes: https://github.com/java9-modularity/gradle-modules-plugin/issues/258
---
 README.md                                           | 13 +++++++------
 .../moduleplugin/tasks/MergeClassesTask.java        |  5 ++++-
 .../moduleplugin/ModulePluginSmokeTest.java         |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 64fcad4..0fb6476 100644
--- a/README.md
+++ b/README.md
@@ -37,22 +37,23 @@ Compatability
 
 The plugin is compatible with the following Gradle versions:
 
-| Gradle version | Min plugin version                                                                     | Max plugin version |
-|----------------|----------------------------------------------------------------------------------------|--------------------|
-| 5.* -> 7.5.+   | 1.+                                                                                    |                    |
-| 7.6+           | See [issue #258](https://github.com/java9-modularity/gradle-modules-plugin/issues/258) |                    |
+| Gradle version | Min plugin version                                                                     |
+|----------------|----------------------------------------------------------------------------------------|
+| 5.* -> 7.5.+   | 1.+                                                                                    |
+| 7.6+           | 1.8.14                                                                                 |
+| 8.+            | See [issue #260](https://github.com/java9-modularity/gradle-modules-plugin/issues/260) |
 
 The plugin is compatible with the following Java versions:
 
 | Java version | Min plugin version |
 |--------------|--------------------|
-| 11+          | 1.0.0              |
+| 11+          | 1.+                |
 
 The plugin is compatible with the following Kotlin versions:
 
 | Kotlin version | Min plugin version |
 |----------------|--------------------|
-| 1.0.* -> 1.6.* | 1.0.0              |
+| 1.0.* -> 1.6.* | 1.+                |
 | 1.7+           | 1.8.12             |
 
 Setup
diff --git a/src/main/java/org/javamodularity/moduleplugin/tasks/MergeClassesTask.java b/src/main/java/org/javamodularity/moduleplugin/tasks/MergeClassesTask.java
index b4ff12f..ed7e956 100644
--- a/src/main/java/org/javamodularity/moduleplugin/tasks/MergeClassesTask.java
+++ b/src/main/java/org/javamodularity/moduleplugin/tasks/MergeClassesTask.java
@@ -38,7 +38,10 @@ public void configureMergeClassesAfterEvaluate() {
         mergeClasses.into(helper().getMergedDir());
         mergeClasses.onlyIf(task -> mergeClassesHelper().isMergeRequired());
 
-        Stream.of(ApplicationPlugin.TASK_RUN_NAME, JavaPlugin.TEST_TASK_NAME, JavaProjectHelper.COMPILE_TEST_FIXTURES_JAVA_TASK_NAME)
+        Stream.of(ApplicationPlugin.TASK_RUN_NAME,
+                        JavaPlugin.TEST_TASK_NAME,
+                        JavaPlugin.COMPILE_TEST_JAVA_TASK_NAME,
+                        JavaProjectHelper.COMPILE_TEST_FIXTURES_JAVA_TASK_NAME)
                 .map(helper()::findTask)
                 .flatMap(Optional::stream)
                 .forEach(task -> task.dependsOn(mergeClasses));
diff --git a/src/test/java/org/javamodularity/moduleplugin/ModulePluginSmokeTest.java b/src/test/java/org/javamodularity/moduleplugin/ModulePluginSmokeTest.java
index 6491099..48efadb 100644
--- a/src/test/java/org/javamodularity/moduleplugin/ModulePluginSmokeTest.java
+++ b/src/test/java/org/javamodularity/moduleplugin/ModulePluginSmokeTest.java
@@ -32,7 +32,7 @@ class ModulePluginSmokeTest {
     private enum GradleVersion {
         v5_1, v5_6,
         v6_3, v6_4_1, v6_5_1, v6_8_3,
-        v7_0, v7_5_1
+        v7_0, v7_6_4
         ;
 
         @Override