Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,5 @@ dependencies {
implementation(libs.jgit)

testImplementation(libs.junit)
testRuntimeOnly("org.junit.platform", "junit-platform-launcher")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
[versions]
indra = "4.0.0"
jackson = "2.20.1"
junit = "6.0.1"
jackson = "2.22.0"
junit = "6.1.1"

[plugins]
indra = { id = "net.kyori.indra", version.ref = "indra" }
indra-git = { id = "net.kyori.indra.git", version.ref = "indra" }
indra-spotless = { id = "net.kyori.indra.licenser.spotless", version.ref = "indra" }
publish-plugin = { id = "com.gradle.plugin-publish", version = "2.0.0" }
publish-plugin = { id = "com.gradle.plugin-publish", version = "2.1.1" }

[libraries]
guava = { module = "com.google.guava:guava", version = "33.5.0-jre" }
guava = { module = "com.google.guava:guava", version = "33.6.0-jre" }
jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
jackson-datatype-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" }
jspecify = { module = "org.jspecify:jspecify", version = "1.0.0" }
mammoth = { module = "net.kyori:mammoth", version = "1.5.0" }
junit = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
jgit = "org.eclipse.jgit:org.eclipse.jgit:7.4.0.202509020913-r"
jgit = "org.eclipse.jgit:org.eclipse.jgit:7.7.0.202606012155-r"
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
}

rootProject.name = "fill-gradle"
20 changes: 13 additions & 7 deletions src/main/java/io/papermc/fill/gradle/task/PublishToFillTask.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
.build();

public PublishToFillTask() {
this.setGroup("fill");

Check warning on line 74 in src/main/java/io/papermc/fill/gradle/task/PublishToFillTask.java

View workflow job for this annotation

GitHub Actions / build (21, ubuntu-latest)

[this-escape] possible 'this' escape before subclass is fully initialized
this.setDescription("Publish to Fill");
}

Expand Down Expand Up @@ -248,7 +248,8 @@
this.logEmptyChangelogWarning(
lastCommit.sha(),
currentCommit.getName(),
"previous build commit is not present in the local repository"
"previous build commit is not present in the local repository",
false
);
return false;
}
Expand All @@ -260,29 +261,34 @@
this.logEmptyChangelogWarning(
lastCommit.sha(),
currentCommit.getName(),
"previous build commit is not an ancestor of the current HEAD"
"previous build commit is not an ancestor of the current HEAD",
false
);
return false;
}
} catch (final MissingObjectException e) {
// looks like history was squashed away, lets just use this commit as changelog
revWalk.markUninteresting(revWalk.parseCommit(currentCommit.getParent(0)));
Comment thread
MiniDigger marked this conversation as resolved.
this.logEmptyChangelogWarning(
lastCommit.sha(),
currentCommit.getName(),
"previous build commit could not be loaded from the local repository"
"previous build commit could not be loaded from the local repository",
true
);
return false;
return true;
}

revWalk.markUninteresting(revWalk.parseCommit(lastBuildObjectId));
return true;
}

private void logEmptyChangelogWarning(final String previousCommit, final String currentCommit, final String reason) {
private void logEmptyChangelogWarning(final String previousCommit, final String currentCommit, final String reason, final boolean shortChangelog) {
this.getLogger().warn(
"Unable to compute changelog: {} (previous build commit: {}, current HEAD: {}). Publishing with an empty changelog.",
"Unable to compute changelog: {} (previous build commit: {}, current HEAD: {}). {}",
reason,
previousCommit,
currentCommit
currentCommit,
shortChangelog ? "Publishing with short changelog" : "Publishing with an empty changelog."
);
Comment thread
MiniDigger marked this conversation as resolved.
}

Expand Down