Skip to content

Update to Gradle 9.8.0, bump Crankcase #3025

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

Merged
octylFractal merged 1 commit into from
Sep 27, 2026
Merged

Update to Gradle 9.8.0, bump Crankcase #3025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions config/checkstyle/checkstyle-suppression.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"https://checkstyle.org/dtds/suppressions_1_2.dtd">

<suppressions>
<!-- TODO: Apply these Checkstyle rules -->
<suppress files=".*" checks="UnusedLocalVariable|UnusedCatchParameterShouldBeUnnamed|UnusedLambdaParameterShouldBeUnnamed|UnusedTryResourceShouldBeUnnamed"/>
<suppress files=".*DataFixer\.java" checks="MethodName|FallThrough|EmptyStatement|UseEnhancedSwitch"/>
<suppress files=".*DataConverters\.java"
checks="MethodName|FallThrough|EmptyStatement|UseEnhancedSwitch|DefaultComesLast|JavadocParagraph"/>
Expand Down
5 changes: 2 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cuiProtocol = "4.0.3"

errorprone = "2.48.0"

crankcase = "0.1.0"
crankcase = "0.1.3"

fabric-api = "0.161.0+26.3"

Expand Down Expand Up @@ -54,14 +54,13 @@ japicmp = "me.champeau.gradle:japicmp-gradle-plugin:0.4.6"
shadow = "com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:9.6.1"
jfrog-buildinfo = "org.jfrog.buildinfo:build-info-extractor-gradle:6.0.4"

errorprone-gradle-plugin = "net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:5.1.0"
errorprone-core = { module = "com.google.errorprone:error_prone_core", version.ref = "errorprone" }
errorprone-annotations = { module = "com.google.errorprone:error_prone_annotations", version.ref = "errorprone" }

# https://maven.fabricmc.net/net/fabricmc/sponge-mixin/
fabric-mixin = "net.fabricmc:sponge-mixin:0.17.4+mixin.0.8.7"

paperweight = "io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:2.0.0-beta.21"
paperweight = "io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:2.0.0-beta.24"

linBus-bom = "org.enginehub.lin-bus:lin-bus-bom:0.2.0"
linBus-common.module = "org.enginehub.lin-bus:lin-bus-common"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
distributionSha256Sum=bafd5ce9cfaea0fbccfdc8439a1ac42fbd4cd9c89dc9a988228d8a2639a58e6c
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
52 changes: 41 additions & 11 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions worldedit-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,9 @@ tasks.compileJava {
}

tasks.generateGrammarSource {
val pkg = "com.sk89q.worldedit.antlr"
outputDirectory = file("build/generated-src/antlr/main/${pkg.replace('.', '/')}")
arguments = listOf(
"-visitor", "-package", pkg,
"-Xexact-output-dir"
)
outputDirectory = file("build/generated-src/antlr/main")
packageName = "com.sk89q.worldedit.antlr"
arguments = listOf("-visitor", "-Xexact-output-dir")
}

tasks.withType<Checkstyle>().configureEach {
Expand Down
2 changes: 1 addition & 1 deletion worldedit-core/src/main/java/com/sk89q/worldedit/internal/anvil/ChunkDeleter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public final class ChunkDeleter {
public static final String DELCHUNKS_FILE_NAME = "delete_chunks.json";
private static final Logger LOGGER = LogManagerCompat.getLogger();

private static final Comparator<BlockVector2> chunkSorter = Comparator.comparing(
private static final Comparator<BlockVector2> chunkSorter = Comparator.comparingInt(
pos -> (pos.x() & 31) + (pos.z() & 31) * 32
);

Expand Down
2 changes: 1 addition & 1 deletion worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public class SpongePlayer extends AbstractPlayerActor {

protected SpongePlayer(ServerPlayer player) {
this.player = player;
ThreadSafeCache.getInstance().getOnlineIds().add(getUniqueId());
ThreadSafeCache.getInstance().getOnlineIds().add(player.uniqueId());
}

@Override
Expand Down
Loading