From ba7094caa924d0e62631f0b9ae3ead3b2a27ae0d Mon Sep 17 00:00:00 2001 From: MiniDigger | Martin Date: Fri, 18 Jun 2021 16:34:30 +0200 Subject: [PATCH] downgrade snakeyaml to fix issues with comments this was done by upstream, but got missed. Thanks @mrfloris for pointing this out. --- patches/api/Add-FastUtil-to-Bukkit.patch | 2 +- patches/api/Adventure.patch | 2 +- patches/api/Build-system-changes.patch | 2 +- patches/api/Convert-project-to-Gradle.patch | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/api/Add-FastUtil-to-Bukkit.patch b/patches/api/Add-FastUtil-to-Bukkit.patch index 4a25bbe2e4..53950d2083 100644 --- a/patches/api/Add-FastUtil-to-Bukkit.patch +++ b/patches/api/Add-FastUtil-to-Bukkit.patch @@ -11,7 +11,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +++ b/build.gradle.kts @@ -0,0 +0,0 @@ dependencies { api("net.md-5:bungeecord-chat:1.16-R0.4") - api("org.yaml:snakeyaml:1.29") + api("org.yaml:snakeyaml:1.28") api("com.googlecode.json-simple:json-simple:1.1.1") // Paper + api("it.unimi.dsi:fastutil:8.2.2") diff --git a/patches/api/Adventure.patch b/patches/api/Adventure.patch index 3e4c252de3..884656f5d7 100644 --- a/patches/api/Adventure.patch +++ b/patches/api/Adventure.patch @@ -11,7 +11,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -0,0 +0,0 @@ dependencies { - api("org.yaml:snakeyaml:1.29") + api("org.yaml:snakeyaml:1.28") api("com.googlecode.json-simple:json-simple:1.1.1") // Paper api("it.unimi.dsi:fastutil:8.2.2") + api(platform("net.kyori:adventure-bom:4.8.1")) diff --git a/patches/api/Build-system-changes.patch b/patches/api/Build-system-changes.patch index 3ad242cff8..ae9db1df45 100644 --- a/patches/api/Build-system-changes.patch +++ b/patches/api/Build-system-changes.patch @@ -11,7 +11,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ dependencies { api("com.google.code.gson:gson:2.8.0") api("net.md-5:bungeecord-chat:1.16-R0.4") - api("org.yaml:snakeyaml:1.29") + api("org.yaml:snakeyaml:1.28") + api("com.googlecode.json-simple:json-simple:1.1.1") // Paper compileOnly("org.apache.maven:maven-resolver-provider:3.8.1") diff --git a/patches/api/Convert-project-to-Gradle.patch b/patches/api/Convert-project-to-Gradle.patch index a6ab454b53..03d10d2ea0 100644 --- a/patches/api/Convert-project-to-Gradle.patch +++ b/patches/api/Convert-project-to-Gradle.patch @@ -41,7 +41,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + api("com.google.guava:guava:21.0") + api("com.google.code.gson:gson:2.8.0") + api("net.md-5:bungeecord-chat:1.16-R0.4") -+ api("org.yaml:snakeyaml:1.29") ++ api("org.yaml:snakeyaml:1.28") + + compileOnly("org.apache.maven:maven-resolver-provider:3.8.1") + compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")