From 61d7f5590e79909caba55e9f00cefdd51006d015 Mon Sep 17 00:00:00 2001 From: granny Date: Mon, 16 Jun 2025 22:05:39 -0700 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@39203a65 [ci/skip] Publish PR API and dev bundles (#12672) --- gradle.properties | 2 +- purpur-api/build.gradle.kts.patch | 26 +------------------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/gradle.properties b/gradle.properties index 54db9641c..75b9e08cd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.21.5-R0.1-SNAPSHOT mcVersion = 1.21.5 -paperCommit = ba7fb23ddd2376079951d1e22f9204d1ed691585 +paperCommit = 39203a65e017bf83d83924d8e79c0af4a69232d5 org.gradle.configuration-cache = true org.gradle.caching = true diff --git a/purpur-api/build.gradle.kts.patch b/purpur-api/build.gradle.kts.patch index 7dc5f4924..755a5bb4e 100644 --- a/purpur-api/build.gradle.kts.patch +++ b/purpur-api/build.gradle.kts.patch @@ -28,7 +28,7 @@ } } } -@@ -165,16 +_,18 @@ +@@ -165,8 +_,10 @@ val services = objects.newInstance() tasks.withType { @@ -40,30 +40,6 @@ options.use() options.isDocFilesSubDirs = true options.links( - "https://guava.dev/releases/33.3.1-jre/api/docs/", -- "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/", -- "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", -- "https://javadoc.io/doc/org.joml/joml/1.10.8/", -- "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0", -+ // "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/", -+ // "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", -+ // "https://javadoc.io/doc/org.joml/joml/1.10.8/", -+ // "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0", - "https://jspecify.dev/docs/api/", - "https://jd.advntr.dev/api/$adventureVersion/", - "https://jd.advntr.dev/key/$adventureVersion/", -@@ -183,9 +_,9 @@ - "https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/", - "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/", - "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/", -- "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/", -+ // "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/", - "https://logging.apache.org/log4j/2.x/javadoc/log4j-api/", -- "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3", -+ // "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3", - ) - options.tags("apiNote:a:API Note:") - @@ -199,11 +_,11 @@ }