Skip to content

Fix compatibility issue with Gradle 7.6+ #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
big-andy-coates merged 1 commit into from
Feb 20, 2024
Merged

Fix compatibility issue with Gradle 7.6+ #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/org/javamodularity/moduleplugin/tasks/MergeClassesTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/javamodularity/moduleplugin/ModulePluginSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down