Fix RespawnPacket import order to unblock the Velocity-CTD sync build - #24
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves #23.
The automated Velocity-CTD
libdeflatesync mergedabfbb372de41480b93cb31b2400c7a304998083dcleanly, but./gradlew buildfailed on the merged tree, so no pull request was opened.Cause
The merge only carried three dependency bumps in
gradle/libs.versions.toml— no code changes:8.9.0→8.10.013.10.0→13.11.033.6.0-jre→33.7.0-jreThe failing task is
:velocity-proxy:checkstyleMain, which reports twoCustomImportOrderCheckwarnings inBackendPlaySessionHandler.java. Becausevelocity-checkstyle.gradle.ktssetsmaxWarnings = 0, those warnings fail the build:The
RespawnPacketimport was added ahead of theResourcePack*imports. That is the wrong slot —Respsorts afterResoin ASCII — and checkstyle 13.11.0 tightenedCustomImportOrderCheckso it now flags what 13.10.0 let through. The defect is onmain; the sync merge only exposed it.Fix
Move the
RespawnPacketimport belowResourcePackResponsePacket. One line, no behaviour change.Verification
./gradlew buildon this branch (checkstyle 13.10.0): BUILD SUCCESSFUL,:velocity-proxy:checkstyleMainexecuted fresh../gradlew buildonmain+ thelibdeflatemerge + this fix (checkstyle 13.11.0): BUILD SUCCESSFUL,:velocity-proxy:checkstyleMainand:velocity-proxy:testboth executed fresh.Once this lands on
main, the nextupstream-syncrun should mergelibdeflateand open its pull request normally.