Skip to content

Commit

Permalink
Use spigot library feature for ZSTD
Browse files Browse the repository at this point in the history
  • Loading branch information
SirYwell committed Nov 21, 2023
1 parent 46dd71e commit 623e14a
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 5 deletions.
1 change: 0 additions & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"com.google.code.gson:gson",
"net.fabricmc:fabric-loader",
"net.fabricmc.fabric-api:fabric-api",
"com.github.luben:zstd-jni",
"org.jetbrains.kotlin.jvm",
"log4j",
"org.apache.logging.log4j:log4j-api",
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ truezip = "6.8.4"
auto-value = "1.10.4"
findbugs = "3.0.2"
rhino-runtime = "1.7.14"
zstd-jni = "1.4.8-1" # Not latest as it can be difficult to obtain latest ZSTD libs
zstd-jni = "1.5.5-10"
antlr4 = "4.13.1"
json-simple = "1.1.1"
jlibnoise = "1.0.0"
Expand Down
3 changes: 0 additions & 3 deletions worldedit-bukkit/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,6 @@ tasks.named<ShadowJar>("shadowJar") {
// 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"))
// 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("com.github.luben:zstd-jni:1.4.8-1"))
relocate("org.bstats", "com.sk89q.worldedit.bstats") {
include(dependency("org.bstats:"))
}
Expand Down
2 changes: 2 additions & 0 deletions worldedit-bukkit/src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ description: Blazingly fast world manipulation for builders, large networks and
authors: [ Empire92, MattBDev, IronApollo, dordsor21, NotMyFault ]
loadbefore: [ WorldGuard, PlotSquared ]
database: false
libraries:
- "com.github.luben:zstd-jni:1.5.5-10"
permissions:
fawe.plotsquared:
default: true
Expand Down

0 comments on commit 623e14a

Please sign in to comment.