mirror/WorldEdit
2
0
Fork 0
mirror of https://github.com/EngineHub/WorldEdit.git synced 2024-12-15 04:41:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix fastutil on sponge (#2099)

Browse Source 
VG excludes the wrong version, PR has been made
This commit is contained in:
Octavia Togami 2022-05-22 00:02:35 -07:00 committed by GitHub
parent 3eefaa29dd
commit 8ddd31797c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
worldedit-bukkit/build.gradle.kts
View File

@ -84,20 +84,17 @@
// 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")
include(dependency(":worldedit-core"))
// Purposefully not included, we assume (even though no API exposes it) that Log4J will be present at runtime
// If it turns out not to be true for Spigot/Paper, our only two official platforms, this can be uncommented.
// include(dependency("org.apache.logging.log4j:log4j-api"))
include(dependency("org.antlr:antlr4-runtime"))
relocate("org.bstats", "com.sk89q.worldedit.bstats") {
include(dependency("org.bstats:"))
}
relocate("io.papermc.lib", "com.sk89q.worldedit.bukkit.paperlib") {
include(dependency("io.papermc:paperlib"))
}
relocate("it.unimi.dsi.fastutil", "com.sk89q.worldedit.bukkit.fastutil") {
include(dependency("it.unimi.dsi:fastutil"))
}
include(dependency("org.bstats:"))
include(dependency("io.papermc:paperlib"))
include(dependency("it.unimi.dsi:fastutil"))
relocate("org.bstats", "com.sk89q.worldedit.bstats")
relocate("io.papermc.lib", "com.sk89q.worldedit.bukkit.paperlib")
relocate("it.unimi.dsi.fastutil", "com.sk89q.worldedit.bukkit.fastutil")
}
}

19
worldedit-sponge/build.gradle.kts
View File

@ -50,11 +50,17 @@
dependencies {
api(project(":worldedit-core"))
api(project(":worldedit-libs:sponge"))
// TODO remove after VG merges and releases my patch
// https://github.com/SpongePowered/VanillaGradle/pull/66
minecraft(minecraft.platform().get().moduleName() + ":" + minecraft.version().get()) {
exclude("it.unimi.dsi", "fastutil")
}
implementation(platform("org.apache.logging.log4j:log4j-bom:${Versions.LOG4J}") {
because("Sponge 8 (will?) provides Log4J")
})
api("org.apache.logging.log4j:log4j-api")
implementation("org.bstats:bstats-sponge:3.0.0")
implementation("it.unimi.dsi:fastutil")
testImplementation("org.mockito:mockito-core:${Versions.MOCKITO}")
}
@ -66,16 +72,13 @@
tasks.named<ShadowJar>("shadowJar") {
dependencies {
relocate("org.bstats", "com.sk89q.worldedit.sponge.bstats") {
include(dependency("org.bstats:"))
}
include(dependency(":worldedit-core"))
include(dependency("org.bstats:"))
include(dependency("org.antlr:antlr4-runtime"))
include(dependency("it.unimi.dsi:fastutil"))
relocate("org.antlr.v4", "com.sk89q.worldedit.antlr4")
include(dependency("org.antlr:antlr4-runtime"))
relocate("it.unimi.dsi.fastutil", "com.sk89q.worldedit.sponge.fastutil") {
include(dependency("it.unimi.dsi:fastutil"))
}
relocate("org.bstats", "com.sk89q.worldedit.sponge.bstats")
relocate("it.unimi.dsi.fastutil", "com.sk89q.worldedit.sponge.fastutil")
}
}
tasks.named("assemble").configure {