From ec803eb6b5836dce00680842c38b6efa34198cf1 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Thu, 25 Dec 2025 22:04:04 +0100 Subject: [PATCH 1/3] Update lz4 to 1.10.2 Signed-off-by: Alexander Brandes --- gradle/libs.versions.toml | 4 ++-- worldedit-bukkit/build.gradle.kts | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9309d7d81a..a9e5ed3301 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -32,7 +32,7 @@ antlr4 = "4.13.2" json-simple = "1.1.1" jlibnoise = "1.0.0" jchronic = "0.2.4a" -lz4-java = "1.8.0" +lz4-java = "1.10.2" lz4-stream = "1.0.0" commons-cli = "1.11.0" paperLib = "1.0.8" @@ -108,7 +108,7 @@ antlr4-runtime = { group = "org.antlr", name = "antlr4-runtime", version.ref = " json-simple = { group = "com.googlecode.json-simple", name = "json-simple", version.ref = "json-simple" } jlibnoise = { group = "com.sk89q.lib", name = "jlibnoise", version.ref = "jlibnoise" } jchronic = { group = "com.sk89q", name = "jchronic", version.ref = "jchronic" } -lz4Java = { group = "org.lz4", name = "lz4-java", version.ref = "lz4-java" } +lz4Java = { group = "at.yawk.lz4", name = "lz4-java", version.ref = "lz4-java" } lz4JavaStream = { group = "net.jpountz", name = "lz4-java-stream", version.ref = "lz4-stream" } commonsCli = { group = "commons-cli", name = "commons-cli", version.ref = "commons-cli" } paperLib = { group = "io.papermc", name = "paperlib", version.ref = "paperLib" } diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts index 78ac0e4a2c..1ef5855c2a 100644 --- a/worldedit-bukkit/build.gradle.kts +++ b/worldedit-bukkit/build.gradle.kts @@ -79,6 +79,21 @@ val adaptersReobf = configurations.create("adaptersReobf") { extendsFrom(adapters) } +allprojects { + configurations.configureEach { + resolutionStrategy { + capabilitiesResolution { + withCapability("org.lz4:lz4-java") { + select(candidates.first { + (it.id as org.gradle.api.artifacts.component.ModuleComponentIdentifier).group == "at.yawk.lz4" + }) + } + } + } + } +} + + dependencies { api(project(":worldedit-core")) api(project(":worldedit-libs:bukkit")) From fe5966e76fbc35fbc7dd0df97f96df8f7c54b8b6 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Thu, 25 Dec 2025 22:06:53 +0100 Subject: [PATCH 2/3] Formatting Signed-off-by: Alexander Brandes --- worldedit-bukkit/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts index 1ef5855c2a..b22c6f15b4 100644 --- a/worldedit-bukkit/build.gradle.kts +++ b/worldedit-bukkit/build.gradle.kts @@ -93,7 +93,6 @@ allprojects { } } - dependencies { api(project(":worldedit-core")) api(project(":worldedit-libs:bukkit")) From 9d05aca3871fb7bb7bb1a2f48ec340abdb627a0d Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Thu, 25 Dec 2025 22:09:46 +0100 Subject: [PATCH 3/3] Cleanup old resolution strategy Signed-off-by: Alexander Brandes --- .../adapters/adapter-1_21_11/build.gradle.kts | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/worldedit-bukkit/adapters/adapter-1_21_11/build.gradle.kts b/worldedit-bukkit/adapters/adapter-1_21_11/build.gradle.kts index 1a9765af08..d61b503251 100644 --- a/worldedit-bukkit/adapters/adapter-1_21_11/build.gradle.kts +++ b/worldedit-bukkit/adapters/adapter-1_21_11/build.gradle.kts @@ -4,18 +4,6 @@ plugins { id("buildlogic.adapter") } -configurations { - all { - resolutionStrategy { - capabilitiesResolution { - withCapability("org.lz4:lz4-java") { - selectHighestVersion() - } - } - } - } -} - dependencies { // https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/ the().paperDevBundle("1.21.11-R0.1-20251223.192256-16")