Skip to content

Fix crash when CHANGELOG.md is present at the root of a project #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MellowArpeggiation wants to merge 4 commits into
base: master
Choose a base branch
from
+15 −6
Open

Fix crash when CHANGELOG.md is present at the root of a project #79

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ea1653
fix crash when CHANGELOG.md is present at the root of a project. Test…
MellowArpeggiation Jun 11, 2026
5b8d838
resolve handles absolute paths for us, and `isRegularFile` should sto…
MellowArpeggiation Jun 11, 2026
ad23b13
run `spotlessApply` (sorry!)
MellowArpeggiation Jun 15, 2026
86a2231
Merge branch 'master' into master
Dream-Master Jun 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions src/main/java/com/gtnewhorizons/gtnhgradle/modules/PublishingModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import java.io.File;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
Expand Down Expand Up @@ -91,7 +92,7 @@ public void apply(GTNHGradlePlugin.@NotNull GTNHExtension gtnh, @NotNull Project
}
}

final File changelogFile = new File(ObjectUtils.firstNonNull(System.getenv("CHANGELOG_FILE"), "CHANGELOG.md"));
final String changelog = getChangelog(project);

// Modrinth
final String mrToken = System.getenv("MODRINTH_TOKEN");
Expand All @@ -110,10 +111,9 @@ public void apply(GTNHGradlePlugin.@NotNull GTNHExtension gtnh, @NotNull Project
.set(modVersion);
mr.getVersionType()
.set(modVersion.map(v -> v.endsWith("-pre") ? "beta" : "release"));
if (changelogFile.exists()) {
final String contents = Files.readString(changelogFile.toPath(), StandardCharsets.UTF_8);
if (changelog != null) {
mr.getChangelog()
.set(contents);
.set(changelog);
}
mr.getUploadFile()
.set(project.provider(() -> project.property("publishableObfJar")));
Expand Down Expand Up @@ -188,9 +188,9 @@ public void apply(GTNHGradlePlugin.@NotNull GTNHExtension gtnh, @NotNull Project
task.apiToken = cfToken;
task.disableVersionDetection();
task.upload(gtnh.configuration.curseForgeProjectId, obfFile, artifact -> {
if (changelogFile.exists()) {
if (changelog != null) {
artifact.changelogType = "markdown";
artifact.changelog = changelogFile;
artifact.changelog = changelog;
}
artifact.releaseType = modVersion.map(v -> v.endsWith("-pre") ? "beta" : "release");
artifact.addGameVersion(gtnh.configuration.minecraftVersion, "Forge");
Expand Down Expand Up @@ -229,6 +229,15 @@ public void apply(GTNHGradlePlugin.@NotNull GTNHExtension gtnh, @NotNull Project
}
}

private static String getChangelog(@NotNull Project project) throws Throwable {
Path changelogPath = project.getProjectDir()
.toPath()
.resolve(ObjectUtils.firstNonNull(System.getenv("CHANGELOG_FILE"), "CHANGELOG.md"));
if (Files.isRegularFile(changelogPath)) return Files.readString(changelogPath, StandardCharsets.UTF_8);

return null;
}

private static final Set<String> VALID_MODRINTH_SCOPES = ImmutableSet
.of("required", "optional", "incompatible", "embedded");

Expand Down