OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 15:30:19 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix broken joml metadata resulting in kotlin being included on compile/runtime classpath (#11712)

Browse source
This commit is contained in:
Jason Penilla 2024-12-05 15:10:10 -07:00
parent 640db1bea9
commit 41f4119eb0
5 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle.kts
View file

@ -11,7 +11,7 @@ import kotlin.io.path.*
plugins { plugins {
java java
`maven-publish` `maven-publish`
id("io.papermc.paperweight.core") version "1.7.6" id("io.papermc.paperweight.core") version "1.7.7"
} }
allprojects { allprojects {

4
patches/api/Adventure.patch
View file

@ -41,8 +41,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+ // Paper - adventure + // Paper - adventure
api("org.yaml:snakeyaml:2.2") api("org.yaml:snakeyaml:2.2")
api("org.joml:joml:1.10.8") api("org.joml:joml:1.10.8") {
// Paper start isTransitive = false // https://github.com/JOML-CI/JOML/issues/352
@@ -0,0 +0,0 @@ dependencies { @@ -0,0 +0,0 @@ dependencies {
isTransitive = false // includes junit isTransitive = false // includes junit
} }

6
patches/api/Build-system-changes.patch
View file

@ -9,9 +9,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -0,0 +0,0 @@ dependencies { @@ -0,0 +0,0 @@ dependencies {
api("net.md-5:bungeecord-chat:$bungeeCordChatVersion") api("org.joml:joml:1.10.8") {
api("org.yaml:snakeyaml:2.2") isTransitive = false // https://github.com/JOML-CI/JOML/issues/352
api("org.joml:joml:1.10.8") }
+ // Paper start + // Paper start
+ api("com.googlecode.json-simple:json-simple:1.1.1") { + api("com.googlecode.json-simple:json-simple:1.1.1") {
+ isTransitive = false // includes junit + isTransitive = false // includes junit

4
patches/api/Convert-project-to-Gradle.patch
View file

@ -50,7 +50,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ api("com.google.code.gson:gson:2.11.0") + api("com.google.code.gson:gson:2.11.0")
+ api("net.md-5:bungeecord-chat:$bungeeCordChatVersion") + api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
+ api("org.yaml:snakeyaml:2.2") + 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:maven-resolver-provider:3.9.6")
+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18") + compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")

2
settings.gradle.kts
View file

@ -8,7 +8,7 @@ pluginManagement {
} }
plugins { 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()) { if (!file(".git").exists()) {