Skip to content

Fix Shadow 9.6 Kotlin DSL receivers - #3639

Open
skrcode wants to merge 3 commits into
IntellectualSites:renovate/shadowfrom
skrcode:fix-shadow-9-6-kotlin-dsl
Open

skrcode wants to merge 3 commits into
IntellectualSites:renovate/shadowfrom
skrcode:fix-shadow-9-6-kotlin-dsl

Conversation

@skrcode

@skrcode skrcode commented Aug 31, 2026 •

Copy link
Copy Markdown

Summary

  • configure relocations on the outer ShadowJar receiver, following the structure used by WorldEdit #3010
  • keep dependency inclusion and exclusion inside the nested dependencies {} block
  • capture project and task values before entering nested Shadow DSL receivers
  • preserve all FAWE-specific relocations and dependency selections
  • keep the repair scoped to active Bukkit and CLI build scripts

This is a companion fix for #3625 and targets its Renovate branch.

Verification

  • final candidate 0807ab860dca4ace921f748c535af02338ef95d0, JDK 25: ./gradlew --no-daemon --max-workers=2 :build-logic:compileKotlin projects :worldedit-cli:shadowJar :worldedit-core:test :worldedit-bukkit:test :worldedit-cli:test — passed; core and Bukkit tests executed, while CLI has no test sources
  • git diff --check — passed
  • :worldedit-bukkit:shadowJar was attempted with Gradle launched on JDK 25 and JDK 21; the configured Java 25 toolchain stopped both runs during Paperweight adapter preparation, before Shadow packaging, because Codebook 1.0.14 rejects class-file version 69
  • JAIPilot Remote was unavailable because the monthly included compute allowance was exhausted; no source was uploaded

AI assistance

This change used JAIPilot skills:

  • jaipilot-maintainer-intent
  • jaipilot-fast-execution
  • jaipilot-review-diff

Host model: gpt-5.6-sol
Reasoning effort: xhigh
Service mode: fast
Execution mode: local

@skrcode
skrcode requested a review from a team as a code owner August 31, 2026 03:15
@SirYwell

Copy link
Copy Markdown
Member

Can you actually explain the changes here?

@skrcode

skrcode commented Aug 31, 2026

Copy link
Copy Markdown
Author

as part of shadow 9.6, we need to specify dsl receivers explicitly https://github.com/GradleUp/shadow/releases/tag/9.6.0

@SirYwell

Copy link
Copy Markdown
Member

But WorldEdit was able to resolve that more cleanly from a quick look?

Move relocation configuration onto the ShadowJar receiver and keep dependency selection inside the nested dependency filter, matching the structure used by upstream WorldEdit.

Signed-off-by: Suraj Rajan <surajkrajan95@gmail.com>
@skrcode

skrcode commented Aug 31, 2026

Copy link
Copy Markdown
Author

Oh. Thanks for pointing out - using it as reference.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot review overview

🟢 Approval recommended

The receiver-scope fixes preserve existing packaging behavior and align with Shadow 9.6’s Kotlin DSL requirements.

Review effort: Balanced
Findings: None

What changed in this PR

Updates Shadow to 9.6.1 and adapts active build scripts to its stricter Kotlin DSL receiver boundaries.

Changes:

  • Moves relocations onto ShadowJar receivers.
  • Captures project/task values before nested DSL blocks.
  • Preserves existing dependency filters and FAWE relocations.
File Description
gradle/​libs.versions.toml Upgrades Shadow to 9.6.1.
build-logic/​src/​main/​kotlin/​buildlogic.platform.gradle.kts Captures the platform name outside the dependency receiver.
worldedit-bukkit/​build.gradle.kts Restructures relocations, dependency selections, and captured values.
worldedit-cli/​build.gradle.kts Moves relocations outside dependencies.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

@renovate
renovate Bot force-pushed the renovate/shadow branch 2 times, most recently from 25621f7 to 3c1e6c5 Compare October 9, 2026 13:53
@renovate
renovate Bot force-pushed the renovate/shadow branch from 3c1e6c5 to 3d5bbe5 Compare October 13, 2026 18:06
@renovate
renovate Bot force-pushed the renovate/shadow branch from 3d5bbe5 to a600630 Compare October 26, 2026 22:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants