[FEAT] Allow adding additional files with a custom Display Name and C…

…hangelog. Implements #5

gradle.properties

@@ -1,8 +1,8 @@
 version_base=2.0
-version_patch=2
+version_patch=3
 
 # Dependencies
-curse4j=1.0.9
+curse4j=1.0.10
 modrinth4j=2.2.0
 github=1.318
 mavenart=4.0.0-alpha-8

readme.md

@@ -109,12 +109,24 @@ publisher {
     // Disable the built in Fractureizer scanner
     setDisableMalwareScanner(true)
     
+    // Add supported java versions. Currently only used by CurseForge
+    setJavaVersions("Java 8", "Java 11")
+    
     // Safety check to check if the artifact contains a valid mod metadata entry,
     // which could possibly mean that the jar is empty
     setDisableEmptyJarCheck(true)
     
     // Additional files to upload. Same as artifact, this can be a task, file or string
     addAdditionalFile(jar, secondJar)
+
+    // Additional files to upload with a custom display name and changelog.
+    // Currently only supported on Curseforge
+    addAdditionalFile {
+        // File, Task or String
+        artifact jar
+        displayName "Some Name"
+        changelog "Hello Changelog"
+    }
 }
 ```
 
@@ -268,9 +280,21 @@ publisher {
     // Safety check to check if the artifact contains a valid mod metadata entry,
     // which could possibly mean that the jar is empty
     disableEmptyJarCheck.set(true)
+
+    // Add supported java versions. Currently only used by CurseForge
+    setJavaVersions("Java 8", "Java 11")
 
     // Additional files to upload. Same as artifact, this can be a task, file or string
     additionalFiles.set(listOf(tasks.jar))
+
+    // Additional files to upload with a custom display name and changelog.
+    // Currently supports CurseForge only
+    addAdditionalFile {
+        // File, Task or String
+        artifact(tasks.jar)
+        displayName("Test Name")
+        changelog("Some Changelog")
+    }
 }
 ```
 

src/main/java/com/hypherionmc/modpublisher/plugin/ModPublisherGradleExtension.java

@@ -17,7 +17,6 @@
 import org.gradle.api.provider.ListProperty;
 import org.gradle.api.provider.Property;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 
 /**
@@ -85,7 +84,7 @@ public class ModPublisherGradleExtension {
     @Getter private final Property<Boolean> useModrinthStaging;
 
     // Allow uploading additional files
-    @Getter private final ListProperty<Object> additionalFiles;
+    @Getter private final ListProperty<AdditionalFile> additionalFiles;
 
     @Getter private final ListProperty<String> javaVersions;
 
@@ -125,7 +124,7 @@ public ModPublisherGradleExtension(Project project) {
         this.disableMalwareScanner = project.getObjects().property(Boolean.class).convention(false);
         this.disableEmptyJarCheck = project.getObjects().property(Boolean.class).convention(false);
         this.useModrinthStaging = project.getObjects().property(Boolean.class).convention(false);
-        this.additionalFiles = project.getObjects().listProperty(Object.class).empty();
+        this.additionalFiles = project.getObjects().listProperty(AdditionalFile.class).empty();
     }
 
     /**
@@ -265,15 +264,31 @@ public void setReleaseType(ReleaseType type) {
      * @param file The file
      */
     public void addAdditionalFile(Object file) {
-        this.additionalFiles.add(file);
+        AdditionalFile additionalFile = new AdditionalFile();
+        additionalFile.artifact = file;
+        this.additionalFiles.add(additionalFile);
     }
 
     /**
      * Allow adding multiple additional files to be uploaded along with the main artifact
      * @param file The files
      */
     public void addAdditionalFile(Object... file) {
-        this.additionalFiles.addAll(file);
+        for (Object f : file) {
+            AdditionalFile additionalFile = new AdditionalFile();
+            additionalFile.artifact = f;
+            this.additionalFiles.add(additionalFile);
+        }
+    }
+
+    /**
+     * DSL support for adding a file with a custom display name and changelog
+     * @param file The DSL object containing the file data
+     */
+    public void addAdditionalFile(Action<AdditionalFile> file) {
+        AdditionalFile additionalFile = new AdditionalFile();
+        file.execute(additionalFile);
+        this.additionalFiles.add(additionalFile);
     }
 
     @Getter
@@ -407,5 +422,43 @@ public void embedded(String... deps) {
             embedded.addAll(deps);
         }
     }
+
+    /**
+     * Helper Class to add additional files with a custom Changelog and Display name
+     */
+    @Getter
+    public static class AdditionalFile {
+        private Object artifact;
+        private String displayName;
+        private String changelog;
+
+        public void configure(Action<AdditionalFile> action) {
+            action.execute(this);
+        }
+
+        /**
+         * Set the artifact
+         * @param file The File, Task or String
+         */
+        public void artifact(Object file) {
+            this.artifact = file;
+        }
+
+        /**
+         * Set the artifact Display Name
+         * @param displayName The display name
+         */
+        public void displayName(String displayName) {
+            this.displayName = displayName;
+        }
+
+        /**
+         * Set the artifact changelog
+         * @param changelog The changelog
+         */
+        public void changelog(String changelog) {
+            this.changelog = changelog;
+        }
+    }
 }
 

src/main/java/com/hypherionmc/modpublisher/plugin/ModPublisherPlugin.java

@@ -21,9 +21,6 @@
 
 import javax.annotation.Nonnull;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-
 import static com.hypherionmc.modpublisher.Constants.*;
 
 /**

src/main/java/com/hypherionmc/modpublisher/tasks/CurseUploadTask.java

@@ -149,8 +149,9 @@ public void upload() throws Exception {
         }
 
         if (extension.getAdditionalFiles().isPresent()) {
-            for (Object file : extension.getAdditionalFiles().get()) {
-                artifact.addAdditionalFile(CommonUtil.resolveFile(project, file));
+            for (ModPublisherGradleExtension.AdditionalFile file : extension.getAdditionalFiles().get()) {
+                String changelog = file.getChangelog() == null ? null : CommonUtil.resolveString(file.getChangelog());
+               artifact.addAdditionalFile(CommonUtil.resolveFile(project, file.getArtifact()), file.getDisplayName(), changelog);
             }
         }
 

src/main/java/com/hypherionmc/modpublisher/tasks/GithubUploadTask.java

@@ -117,8 +117,8 @@ public void upload() throws Exception {
             throw new IOException("Failed to upload release to github. No error found");
 
         if (extension.getAdditionalFiles().isPresent()) {
-            for (Object file : extension.getAdditionalFiles().get()) {
-                ghRelease.uploadAsset(CommonUtil.resolveFile(project, file), "application/octet-stream");
+            for (ModPublisherGradleExtension.AdditionalFile file : extension.getAdditionalFiles().get()) {
+                ghRelease.uploadAsset(CommonUtil.resolveFile(project, file.getArtifact()), "application/octet-stream");
             }
         }
 

src/main/java/com/hypherionmc/modpublisher/tasks/ModrinthPublishTask.java

@@ -146,8 +146,8 @@ public void upload() throws Exception {
         }
 
         if (extension.getAdditionalFiles().isPresent()) {
-            for (Object file : extension.getAdditionalFiles().get()) {
-                uploadFiles.add(CommonUtil.resolveFile(project, file));
+            for (ModPublisherGradleExtension.AdditionalFile file : extension.getAdditionalFiles().get()) {
+                uploadFiles.add(CommonUtil.resolveFile(project, file.getArtifact()));
             }
         }
         builder.files(uploadFiles);

testprojects/groovytest/build.gradle

@@ -47,6 +47,13 @@ publisher {
     setPlatformArtifact(com.hypherionmc.modpublisher.properties.Platform.MODRINTH, createDummyJar)
     setDisableEmptyJarCheck(true)
     addAdditionalFile(jar)
+    setJavaVersions("Java 8", "Java 11")
+
+    addAdditionalFile {
+        artifact jar
+        displayName "Some Name"
+        changelog "Hello Changelog"
+    }
 
     modrinthDepends {
         required "fabric-api", "craterlib"

testprojects/kotlintest/build.gradle.kts

@@ -54,7 +54,13 @@ publisher {
     artifact.set(tasks.jar)
     setPlatformArtifact("modrinth", dummyTask)
     useModrinthStaging.set(false)
-    additionalFiles.set(listOf(tasks.jar))
+    addAdditionalFile(tasks.jar)
+
+    addAdditionalFile {
+        artifact(tasks.jar)
+        displayName("Test Name")
+        changelog("Some Changelog")
+    }
 
     curseDepends {
         required("fabric-api", "craterlib")