Fix release tasks

konsoletyper · Oct 24, 2023 · 80b5492 · 80b5492
1 parent 699c26c
commit 80b5492
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/build-logic/src/main/java/org/teavm/buildutil/PublishTeaVMPlugin.java b/build-logic/src/main/java/org/teavm/buildutil/PublishTeaVMPlugin.java
@@ -45,11 +45,16 @@ public void apply(Project target) {
         target.getExtensions().add(PublishTeaVMExtension.class, EXTENSION_NAME, extension);
 
         target.afterEvaluate(p -> target.getExtensions().configure(PublishingExtension.class, publishing -> {
-            publishing.publications(publications -> {
-                publications.create("java", MavenPublication.class, publication -> {
-                    customizePublication(target, publication, extension);
+            var pluginMavenPublication = publishing.getPublications().findByName("pluginMaven");
+            if (pluginMavenPublication == null) {
+                publishing.publications(publications -> {
+                    publications.create("java", MavenPublication.class, publication -> {
+                        customizePublication(target, publication, extension, true);
+                    });
                 });
-            });
+            } else {
+                customizePublication(target, (MavenPublication) pluginMavenPublication, extension, false);
+            }
             if (publish) {
                 var signing = target.getExtensions().getByType(SigningExtension.class);
                 publishing.getPublications().configureEach(signing::sign);
@@ -90,12 +95,15 @@ public void apply(Project target) {
         });
     }
 
-    private void customizePublication(Project project, MavenPublication publication, ExtensionImpl extension) {
+    private void customizePublication(Project project, MavenPublication publication, ExtensionImpl extension,
+            boolean includeComponent) {
         publication.setGroupId("org.teavm");
         if (extension.getArtifactId() != null) {
             publication.setArtifactId(extension.getArtifactId());
         }
-        publication.from(project.getComponents().getByName("java"));
+        if (includeComponent) {
+            publication.from(project.getComponents().getByName("java"));
+        }
         if (extension.packaging != null) {
             publication.getPom().setPackaging(extension.packaging);
         }