From 69ab04bfa2c0e450f318be8b7c0f90c75d015ea9 Mon Sep 17 00:00:00 2001 From: MiniDigger | Martin Date: Fri, 3 Jul 2026 20:40:28 +0200 Subject: [PATCH 1/2] fix: don't die if last commit has been squashed away fixup! chore: update deps --- .../fill/gradle/task/PublishToFillTask.java | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/java/io/papermc/fill/gradle/task/PublishToFillTask.java b/src/main/java/io/papermc/fill/gradle/task/PublishToFillTask.java index 339c37f..be4d7f7 100644 --- a/src/main/java/io/papermc/fill/gradle/task/PublishToFillTask.java +++ b/src/main/java/io/papermc/fill/gradle/task/PublishToFillTask.java @@ -248,7 +248,8 @@ private boolean tryMarkPreviousBuildCommit(final Git git, final RevWalk revWalk, 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; } @@ -260,29 +261,34 @@ private boolean tryMarkPreviousBuildCommit(final Git git, final RevWalk revWalk, 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))); 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." ); } From dff7c2836aaeb62a75d4006fcee65fc0c6f6cf63 Mon Sep 17 00:00:00 2001 From: MiniDigger | Martin Date: Fri, 3 Jul 2026 20:02:02 +0200 Subject: [PATCH 2/2] chore: update deps --- build.gradle.kts | 2 +- gradle/libs.versions.toml | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 286e4e4..1bb1aa3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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") } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d44a243..f069fd4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c61a118..a351597 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/settings.gradle.kts b/settings.gradle.kts index 447a5ea..803787b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -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"