From 227858930d98dc8e89054b38edebc3b432c0a5eb Mon Sep 17 00:00:00 2001 From: Tim203 Date: Fri, 9 Jun 2023 18:32:31 +0200 Subject: [PATCH] Relocate SnakeYAML --- bungee/build.gradle.kts | 3 ++- core/build.gradle.kts | 1 - spigot/build.gradle.kts | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bungee/build.gradle.kts b/bungee/build.gradle.kts index 14683854..b438a04e 100644 --- a/bungee/build.gradle.kts +++ b/bungee/build.gradle.kts @@ -12,9 +12,10 @@ relocate("net.kyori") relocate("cloud.commandframework") // used in cloud relocate("io.leangen.geantyref") +// since 1.20 +relocate("org.yaml") // these dependencies are already present on the platform provided("com.github.SpigotMC.BungeeCord", "bungeecord-proxy", bungeeCommit) provided("com.google.code.gson", "gson", gsonVersion) provided("com.google.guava", "guava", guavaVersion) -provided("org.yaml", "snakeyaml", Versions.snakeyamlVersion) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 46b43de2..1df4ae95 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -14,7 +14,6 @@ dependencies { api("com.nukkitx.fastutil", "fastutil-int-object-maps", Versions.fastutilVersion) api("org.java-websocket", "Java-WebSocket", Versions.javaWebsocketVersion) api("cloud.commandframework", "cloud-core", Versions.cloudVersion) - api("org.yaml", "snakeyaml", Versions.snakeyamlVersion) //todo use official dependency once https://github.com/Bastian/bstats-metrics/pull/118 is merged api("com.github.Konicai.bstats-metrics", "bstats-base", Versions.bstatsVersion) diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts index 2a819ac0..c0dad7af 100644 --- a/spigot/build.gradle.kts +++ b/spigot/build.gradle.kts @@ -33,10 +33,11 @@ relocate("com.google.common") relocate("com.google.guava") // hack to make (old versions? of) Paper work relocate("it.unimi") +// since 1.20 +relocate("org.yaml") // these dependencies are already present on the platform provided("com.mojang", "authlib", authlibVersion) provided("io.netty", "netty-transport", Versions.nettyVersion) provided("io.netty", "netty-codec", Versions.nettyVersion) provided("com.google.code.gson", "gson", gsonVersion) -provided("org.yaml", "snakeyaml", Versions.snakeyamlVersion)