Skip to content

Simplify Shadow 9.6 Kotlin DSL structure #1

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
skrcode merged 1 commit into from
Aug 31, 2026
Merged

Simplify Shadow 9.6 Kotlin DSL structure #1

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
40 changes: 17 additions & 23 deletions worldedit-bukkit/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,12 +197,18 @@ tasks.named<ShadowJar>("shadowJar") {
}

tasks.withType<ShadowJar>().configureEach {
val shadowJar = this
// In tandem with not bundling log4j, we shouldn't relocate base package here.
// relocate("org.apache.logging", "com.sk89q.worldedit.log4j")
relocate("org.antlr.v4", "com.sk89q.worldedit.antlr4")
relocate("org.bstats", "com.sk89q.worldedit.bstats")
relocate("net.royawesome.jlibnoise", "com.sk89q.worldedit.jlibnoise")
relocate("org.incendo.serverlib", "com.fastasyncworldedit.serverlib")
relocate("com.intellectualsites.paster", "com.fastasyncworldedit.paster")
relocate("com.zaxxer", "com.fastasyncworldedit.core.math")
relocate("org.anarres", "com.fastasyncworldedit.core.internal.io")

val taskCoordinates = "$group:$name"
dependencies {
// In tandem with not bundling log4j, we shouldn't relocate base package here.
// relocate("org.apache.logging", "com.sk89q.worldedit.log4j")
shadowJar.relocate("org.antlr.v4", "com.sk89q.worldedit.antlr4")
exclude(dependency(taskCoordinates))

include(dependency(":worldedit-core"))
Expand All @@ -216,26 +222,14 @@ tasks.withType<ShadowJar>().configureEach {
// ZSTD does not work if relocated. https://github.com/luben/zstd-jni/issues/189 Use not latest as it can be difficult
// to obtain latest ZSTD lib
include(dependency(libs.zstd))
shadowJar.relocate("org.bstats", "com.sk89q.worldedit.bstats") {
this@dependencies.include(this@dependencies.dependency(libs.bstats.bukkit))
this@dependencies.include(this@dependencies.dependency(libs.bstats.base))
}
shadowJar.relocate("net.royawesome.jlibnoise", "com.sk89q.worldedit.jlibnoise") {
this@dependencies.include(this@dependencies.dependency("com.sk89q.lib:jlibnoise"))
}
shadowJar.relocate("org.incendo.serverlib", "com.fastasyncworldedit.serverlib") {
this@dependencies.include(this@dependencies.dependency(libs.serverlib))
}
shadowJar.relocate("com.intellectualsites.paster", "com.fastasyncworldedit.paster") {
this@dependencies.include(this@dependencies.dependency(libs.paster))
}
include(dependency(libs.bstats.bukkit))
include(dependency(libs.bstats.base))
include(dependency("com.sk89q.lib:jlibnoise"))
include(dependency(libs.serverlib))
include(dependency(libs.paster))
include(dependency(libs.lz4Java))
shadowJar.relocate("com.zaxxer", "com.fastasyncworldedit.core.math") {
this@dependencies.include(this@dependencies.dependency(libs.sparsebitset))
}
shadowJar.relocate("org.anarres", "com.fastasyncworldedit.core.internal.io") {
this@dependencies.include(this@dependencies.dependency(libs.parallelgzip))
}
include(dependency(libs.sparsebitset))
include(dependency(libs.parallelgzip))
}
project.project(":worldedit-bukkit:adapters").subprojects.forEach {
dependencies {
Expand Down
8 changes: 4 additions & 4 deletions worldedit-cli/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ dependencies {
}

tasks.named<ShadowJar>("shadowJar") {
val shadowJar = this
relocate("org.anarres", "com.fastasyncworldedit.core.internal.io")
relocate("net.jpountz", "com.fastasyncworldedit.core.jpountz")
relocate("org.lz4", "com.fastasyncworldedit.core.lz4")

dependencies {
include { true }
shadowJar.relocate("org.anarres", "com.fastasyncworldedit.core.internal.io")
shadowJar.relocate("net.jpountz", "com.fastasyncworldedit.core.jpountz")
shadowJar.relocate("org.lz4", "com.fastasyncworldedit.core.lz4")
}
//TODO Upstream doesn't include the line below so we should see if we need it or not.
archiveFileName.set(moduleIdentifier)
Expand Down