Simplify changelog definition

CyclopsMC · Aug 18, 2024 · 76a86c7 · 76a86c7
1 parent 856bbc5
commit 76a86c7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/buildSrc/src/main/groovy/multiloader-common.gradle b/buildSrc/src/main/groovy/multiloader-common.gradle
@@ -50,7 +50,7 @@ def getModrinthKey() {
 def getChangelog() {
     def path = "../resources/changelog/${project.minecraft_version}-${project.version}.txt";
     if (new File(path).exists()) {
-        return path;
+        return file(path).readText();
     }
     return "";
 }

diff --git a/loader-fabric/build.gradle b/loader-fabric/build.gradle
@@ -29,7 +29,7 @@ task publishCurseForge(type: TaskPublishCurseForge) {
     def mainFile = upload(project.curseforge_project_id, remapJar)
     mainFile.releaseType = secrets.build_number.equals("RELEASE") ? Constants.RELEASE_TYPE_RELEASE : Constants.RELEASE_TYPE_BETA
     mainFile.changelogType = "text"
-    mainFile.changelog = secrets.changelog ? file(secrets.changelog) : ""
+    mainFile.changelog = secrets.changelog
     mainFile.addJavaVersion("Java ${project.java_version}")
     mainFile.addGameVersion(project.minecraft_version)
     mainFile.addModLoader("Fabric")
@@ -48,9 +48,7 @@ modrinth {
     uploadFile = remapJar
     gameVersions = [ project.minecraft_version ]
     loaders = ["fabric", "quilt"]
-    if (secrets.changelog) {
-        changelog = provider { file(secrets.changelog).readText() }
-    }
+    changelog = provider { secrets.changelog }
 
     dependencies {
         required.project "Z9DM0LJ4" // Cyclops Core

diff --git a/loader-forge/build.gradle b/loader-forge/build.gradle
@@ -21,7 +21,7 @@ task publishCurseForge(type: TaskPublishCurseForge) {
     def mainFile = upload(project.curseforge_project_id, jar)
     mainFile.releaseType = secrets.build_number.equals("RELEASE") ? Constants.RELEASE_TYPE_RELEASE : Constants.RELEASE_TYPE_BETA
     mainFile.changelogType = "text"
-    mainFile.changelog = secrets.changelog ? file(secrets.changelog) : ""
+    mainFile.changelog = secrets.changelog
     mainFile.addJavaVersion("Java ${project.java_version}")
     mainFile.addGameVersion(project.minecraft_version)
     mainFile.addModLoader("Forge")
@@ -37,9 +37,7 @@ modrinth {
     versionType = secrets.build_number.equals("RELEASE") ? "release" : "beta"
     uploadFile = jar
     gameVersions = [ project.minecraft_version ]
-    if (secrets.changelog) {
-        changelog = provider { file(secrets.changelog).readText() }
-    }
+    changelog = provider { secrets.changelog }
 
     dependencies {
         required.project "Z9DM0LJ4" // Cyclops Core

diff --git a/loader-neoforge/build.gradle b/loader-neoforge/build.gradle
@@ -20,7 +20,7 @@ task publishCurseForge(type: TaskPublishCurseForge) {
     def mainFile = upload(project.curseforge_project_id, jar)
     mainFile.releaseType = secrets.build_number.equals("RELEASE") ? Constants.RELEASE_TYPE_RELEASE : Constants.RELEASE_TYPE_BETA
     mainFile.changelogType = "text"
-    mainFile.changelog = secrets.changelog ? file(secrets.changelog) : ""
+    mainFile.changelog = secrets.changelog
     mainFile.addJavaVersion("Java ${project.java_version}")
     mainFile.addGameVersion(project.minecraft_version)
     mainFile.addModLoader("NeoForge")
@@ -36,9 +36,7 @@ modrinth {
     versionType = secrets.build_number.equals("RELEASE") ? "release" : "beta"
     uploadFile = jar
     gameVersions = [ project.minecraft_version ]
-    if (secrets.changelog) {
-        changelog = provider { file(secrets.changelog).readText() }
-    }
+    changelog = provider { secrets.changelog }
 
     dependencies {
         required.project "Z9DM0LJ4" // Cyclops Core