diff --git a/build.gradle.kts b/build.gradle.kts index 930326a321..cce2a91f72 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ import kotlin.io.path.* plugins { java `maven-publish` - id("io.papermc.paperweight.core") version "1.7.6" + id("io.papermc.paperweight.core") version "1.7.7" } allprojects { diff --git a/patches/api/Adventure.patch b/patches/api/Adventure.patch index c2cc35f1f9..5c4a58981f 100644 --- a/patches/api/Adventure.patch +++ b/patches/api/Adventure.patch @@ -41,8 +41,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + // Paper - adventure api("org.yaml:snakeyaml:2.2") - api("org.joml:joml:1.10.8") - // Paper start + api("org.joml:joml:1.10.8") { + isTransitive = false // https://github.com/JOML-CI/JOML/issues/352 @@ -0,0 +0,0 @@ dependencies { isTransitive = false // includes junit } diff --git a/patches/api/Build-system-changes.patch b/patches/api/Build-system-changes.patch index cd48481b33..691c0fa546 100644 --- a/patches/api/Build-system-changes.patch +++ b/patches/api/Build-system-changes.patch @@ -9,9 +9,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -0,0 +0,0 @@ dependencies { - api("net.md-5:bungeecord-chat:$bungeeCordChatVersion") - api("org.yaml:snakeyaml:2.2") - api("org.joml:joml:1.10.8") + api("org.joml:joml:1.10.8") { + isTransitive = false // https://github.com/JOML-CI/JOML/issues/352 + } + // Paper start + api("com.googlecode.json-simple:json-simple:1.1.1") { + isTransitive = false // includes junit diff --git a/patches/api/Convert-project-to-Gradle.patch b/patches/api/Convert-project-to-Gradle.patch index cdc8708da0..adb1f799df 100644 --- a/patches/api/Convert-project-to-Gradle.patch +++ b/patches/api/Convert-project-to-Gradle.patch @@ -50,7 +50,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + api("com.google.code.gson:gson:2.11.0") + api("net.md-5:bungeecord-chat:$bungeeCordChatVersion") + api("org.yaml:snakeyaml:2.2") -+ api("org.joml:joml:1.10.8") ++ api("org.joml:joml:1.10.8") { ++ isTransitive = false // https://github.com/JOML-CI/JOML/issues/352 ++ } + + compileOnly("org.apache.maven:maven-resolver-provider:3.9.6") + compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18") diff --git a/settings.gradle.kts b/settings.gradle.kts index 7b0716497a..cdd32ab6ef 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,7 +8,7 @@ pluginManagement { } plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0" } if (!file(".git").exists()) {