Fixed artifact id

Because the base name of jar can be configured by the user, we're need to configure it in deferred way.
mockito · Jul 26, 2018 · 500e647 · 500e647
1 parent 13a0b4b
commit 500e647
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/java/JavaPublishPlugin.java b/subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/java/JavaPublishPlugin.java
@@ -8,6 +8,7 @@
 import org.gradle.api.publish.maven.MavenPublication;
 import org.gradle.api.tasks.bundling.Jar;
 import org.shipkit.gradle.configuration.ShipkitConfiguration;
+import org.shipkit.internal.gradle.configuration.DeferredConfiguration;
 import org.shipkit.internal.gradle.configuration.ShipkitConfigurationPlugin;
 import org.shipkit.internal.gradle.snapshot.LocalSnapshotPlugin;
 import org.shipkit.internal.gradle.util.GradleDSLHelper;
@@ -59,7 +60,9 @@ public void apply(final Project project) {
                 publication.from(project.getComponents().getByName("java"));
                 publication.artifact(sourcesJar);
                 publication.artifact(javadocJar);
-                publication.setArtifactId(((Jar) project.getTasks().getByName("jar")).getBaseName());
+                DeferredConfiguration.deferredConfiguration(project, () -> {
+                    publication.setArtifactId(((Jar) project.getTasks().getByName("jar")).getBaseName());
+                });
                 PomCustomizer.customizePom(project, conf, publication);
             });
             LOG.info("{} - configured '{}' publication", project.getPath(), p.getArtifactId());