Skip to content

Commit 4992587

Browse files
committed
convention: Try to correct manifest attribute priority
1 parent 42bb2f9 commit 4992587

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

convention/src/main/groovy/org/spongepowered/gradle/convention/SpongeConventionPlugin.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,15 @@ public void apply(final Project target) {
9797
target.getPlugins().withType(SigningPlugin.class, $ ->
9898
target.afterEvaluate(p -> this.configureSigning(p.getExtensions().getByType(SigningExtension.class))));
9999

100+
final Manifest manifest = sponge.sharedManifest();
101+
this.project.getTasks().withType(Jar.class).configureEach(task -> task.getManifest().from(manifest));
100102
target.afterEvaluate(proj -> {
101103
// Only configure manifest after evaluate so we can capture project version properly
102-
this.configureJarTasks(sponge, proj.getExtensions().getByType(IndraGitExtension.class));
104+
this.configureJarTasks(manifest, proj.getExtensions().getByType(IndraGitExtension.class));
103105
});
104106
}
105107

106-
private void configureJarTasks(final SpongeConventionExtension sponge, final IndraGitExtension git) {
107-
final Manifest manifest = sponge.sharedManifest();
108-
this.project.getTasks().withType(Jar.class).configureEach(task -> task.getManifest().from(manifest));
109-
108+
private void configureJarTasks(final Manifest manifest, final IndraGitExtension git) {
110109
// Add some standard attributes
111110
final Map<String, Object> attributes = new HashMap<>();
112111
attributes.put("Specification-Title", this.project.getName());

0 commit comments

Comments
 (0)