Skip to content

Commit 6938bbf

Browse files
committed
No longer user 'afterEvaluate' starting with 8.6
1 parent cbcb13e commit 6938bbf

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

src/main/java/org/gradlex/javamodule/dependencies/JavaModuleVersionsPlugin.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.gradle.api.plugins.JavaPlatformPlugin;
2626
import org.gradle.api.plugins.JavaPlugin;
2727
import org.gradle.api.tasks.SourceSetContainer;
28+
import org.gradle.util.GradleVersion;
2829
import org.gradlex.javamodule.dependencies.dsl.ModuleVersions;
2930

3031
import static org.gradle.api.attributes.Usage.JAVA_RUNTIME;
@@ -61,8 +62,12 @@ private void setupForJavaProject(Project project) {
6162
c.getAttributes().attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.class, JAVA_RUNTIME));
6263
});
6364

64-
// https://github.com/gradle/gradle/issues/26163
65-
project.afterEvaluate(p -> platformElements.getOutgoing().capability(project.getGroup() + ":" + project.getName() + "-platform:" + project.getVersion()));
65+
if (GradleVersion.current().compareTo(GradleVersion.version("8.6")) < 0) {
66+
// https://github.com/gradle/gradle/issues/26163
67+
project.afterEvaluate(p -> platformElements.getOutgoing().capability(project.getGroup() + ":" + project.getName() + "-platform:" + project.getVersion()));
68+
} else {
69+
platformElements.getOutgoing().capability(project.provider(() -> project.getGroup() + ":" + project.getName() + "-platform:" + project.getVersion()));
70+
}
6671

6772
setupVersionsDSL(project, versions);
6873
}

0 commit comments

Comments
 (0)