From c9ed2f74a090f91bd28471a7e4af4ccb7b70d8ec Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Sat, 11 Mar 2023 12:05:02 -0500 Subject: [PATCH] Clean up patches --- patches/api/0002-Bump-Dependencies.patch | 7 +++---- patches/server/0003-Bump-Dependencies.patch | 11 +++++------ patches/server/0037-Fix-build-system-issues.patch | 9 +++------ 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/patches/api/0002-Bump-Dependencies.patch b/patches/api/0002-Bump-Dependencies.patch index b2398846..aa8ac639 100644 --- a/patches/api/0002-Bump-Dependencies.patch +++ b/patches/api/0002-Bump-Dependencies.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies diff --git a/build.gradle.kts b/build.gradle.kts -index 1f8ce35cbc0802917d6fb166fe276a22b03835ed..359050a6f125e16787b4f712aaea463d0014dc63 100644 +index 1f8ce35cbc0802917d6fb166fe276a22b03835ed..c9c032ff0ff898cd28de231843c2b98f9843cb8b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -24,14 +24,16 @@ configurations.api { @@ -82,11 +82,10 @@ index 1f8ce35cbc0802917d6fb166fe276a22b03835ed..359050a6f125e16787b4f712aaea463d options.isDocFilesSubDirs = true options.links( - "https://guava.dev/releases/31.0.1-jre/api/docs/", -- "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/", -- "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations + // Leaf - Bump Dependencies + "https://guava.dev/releases/31.1-jre/api/docs/", -+ "https://javadoc.io/doc/org.yaml/snakeyaml/2.0/", + "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/", +- "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations + "https://javadoc.io/doc/org.jetbrains/annotations/24.0.1/", // Paper - we don't want Java 5 annotations + // Leaf end // Paper start diff --git a/patches/server/0003-Bump-Dependencies.patch b/patches/server/0003-Bump-Dependencies.patch index 8637ca07..41983730 100644 --- a/patches/server/0003-Bump-Dependencies.patch +++ b/patches/server/0003-Bump-Dependencies.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies diff --git a/build.gradle.kts b/build.gradle.kts -index c745122af630d0f79bed7f0c03baa66eeb2e5da0..3401058ba444cc18691cb5eb1e324a739ea14bc4 100644 +index c745122af630d0f79bed7f0c03baa66eeb2e5da0..1b4d00c5b5794b065737f0ca2e61ec8a79a5fa48 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { @@ -17,7 +17,7 @@ index c745122af630d0f79bed7f0c03baa66eeb2e5da0..3401058ba444cc18691cb5eb1e324a73 implementation("net.minecrell:terminalconsoleappender:1.3.0") /* Required to add the missing Log4j2Plugins.dat file from log4j-core -@@ -25,29 +25,36 @@ dependencies { +@@ -25,29 +25,35 @@ dependencies { all its classes to check if they are plugins. Scanning takes about 1-2 seconds so adding this speeds up the server start. */ @@ -53,13 +53,12 @@ index c745122af630d0f79bed7f0c03baa66eeb2e5da0..3401058ba444cc18691cb5eb1e324a73 + // Leaf start - Bump Dependencies + runtimeOnly("org.xerial:sqlite-jdbc:3.41.0.0") + runtimeOnly("com.mysql:mysql-connector-j:8.0.32") -+ // Leaf end ++ runtimeOnly("com.lmax:disruptor:3.4.4") // Paper - runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5") - runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") - runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") -+ // Leaf start - Bump Dependencies + runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.0") + runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.6") + runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.6") @@ -67,7 +66,7 @@ index c745122af630d0f79bed7f0c03baa66eeb2e5da0..3401058ba444cc18691cb5eb1e324a73 // Pufferfish start implementation("org.yaml:snakeyaml:1.33") -@@ -56,11 +63,13 @@ dependencies { +@@ -56,11 +62,13 @@ dependencies { } // Pufferfish end @@ -84,7 +83,7 @@ index c745122af630d0f79bed7f0c03baa66eeb2e5da0..3401058ba444cc18691cb5eb1e324a73 } val craftbukkitPackageVersion = "1_19_R2" // Paper -@@ -228,3 +237,6 @@ tasks.registerRunTask("runDev") { +@@ -228,3 +236,6 @@ tasks.registerRunTask("runDev") { description = "Spin up a non-relocated Mojang-mapped test server" classpath(sourceSets.main.map { it.runtimeClasspath }) } diff --git a/patches/server/0037-Fix-build-system-issues.patch b/patches/server/0037-Fix-build-system-issues.patch index 42619f0e..9c3cdd07 100644 --- a/patches/server/0037-Fix-build-system-issues.patch +++ b/patches/server/0037-Fix-build-system-issues.patch @@ -1,17 +1,14 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Sat, 11 Mar 2023 04:28:34 -0500 -Subject: [PATCH] =?UTF-8?q?=E2=80=9C=C3=A2Fix=20build=20system=20issues?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +Subject: [PATCH] Fix build system issues diff --git a/build.gradle.kts b/build.gradle.kts -index 3401058ba444cc18691cb5eb1e324a739ea14bc4..86812efc78480170a4a8d490b41f9a7e3c1cd29e 100644 +index 1b4d00c5b5794b065737f0ca2e61ec8a79a5fa48..4edfa9998d160026765a35806fad2d959ce84de4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -199,15 +199,14 @@ fun TaskContainer.registerRunTask( +@@ -198,15 +198,14 @@ fun TaskContainer.registerRunTask( systemProperty("gale.detect.thread.blocks", true) // Gale - base thread pool - watch for blocking base threads val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2")