diff --git a/bootstrap/bungeecord/build.gradle.kts b/bootstrap/bungeecord/build.gradle.kts index 3e0e9c147..4025569dd 100644 --- a/bootstrap/bungeecord/build.gradle.kts +++ b/bootstrap/bungeecord/build.gradle.kts @@ -8,6 +8,7 @@ platformRelocate("net.md_5.bungee.jni") platformRelocate("com.fasterxml.jackson") platformRelocate("io.netty.channel.kqueue") // This is not used because relocating breaks natives, but we must include it or else we get ClassDefNotFound platformRelocate("net.kyori") +platformRelocate("org.yaml") // Broken as of 1.20 // These dependencies are already present on the platform provided(libs.bungeecord.proxy) @@ -21,7 +22,6 @@ tasks.withType { dependencies { exclude(dependency("com.google.*:.*")) - exclude(dependency("org.yaml:.*")) exclude(dependency("io.netty:netty-transport-native-epoll:.*")) exclude(dependency("io.netty:netty-transport-native-unix-common:.*")) exclude(dependency("io.netty:netty-handler:.*")) @@ -32,4 +32,4 @@ tasks.withType { exclude(dependency("io.netty:netty-codec:.*")) exclude(dependency("io.netty:netty-resolver-dns:.*")) } -} \ No newline at end of file +} diff --git a/bootstrap/spigot/build.gradle.kts b/bootstrap/spigot/build.gradle.kts index 58ea763eb..85a46598c 100644 --- a/bootstrap/spigot/build.gradle.kts +++ b/bootstrap/spigot/build.gradle.kts @@ -29,6 +29,7 @@ platformRelocate("com.fasterxml.jackson") platformRelocate("net.kyori", "net.kyori.adventure.text.logger.slf4j.ComponentLogger") platformRelocate("org.objectweb.asm") platformRelocate("me.lucko.commodore") +platformRelocate("org.yaml") // Broken as of 1.20 // These dependencies are already present on the platform provided(libs.viaversion) @@ -42,7 +43,6 @@ tasks.withType { dependencies { exclude(dependency("com.google.*:.*")) - exclude(dependency("org.yaml:.*")) // We cannot shade Netty, or else native libraries will not load // Needed because older Spigot builds do not provide the haproxy module @@ -64,4 +64,4 @@ tasks.withType { // Commodore includes Brigadier exclude(dependency("com.mojang:.*")) } -} \ No newline at end of file +}