From 351bb339e8662def29b45f296c35b93cf76c405e Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Tue, 27 Aug 2024 22:37:46 -0400 Subject: [PATCH] Bump dependencies --- patches/api/0006-Bump-Dependencies.patch | 35 ++++++++++--------- patches/server/0016-Bump-Dependencies.patch | 18 +++++----- .../0049-Linear-region-file-format.patch | 6 ++-- 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/patches/api/0006-Bump-Dependencies.patch b/patches/api/0006-Bump-Dependencies.patch index 65f96563..8297881d 100644 --- a/patches/api/0006-Bump-Dependencies.patch +++ b/patches/api/0006-Bump-Dependencies.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Bump Dependencies TODO - Dreeam: Bump & test dependencies, impl new features? diff --git a/build.gradle.kts b/build.gradle.kts -index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..391e05b63663331a4404514bdb6ab30707fd8b49 100644 +index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..f09c49218be12bc36723bf90b0b9b68a65f5e8f4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,8 +12,10 @@ java { @@ -16,7 +16,7 @@ index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..391e05b63663331a4404514bdb6ab307 -val slf4jVersion = "2.0.9" -val log4jVersion = "2.17.1" +// Leaf start - Bump Dependencies -+val slf4jVersion = "2.0.13" ++val slf4jVersion = "2.0.16" +val log4jVersion = "2.23.1" +// Leaf end - Bump Dependencies val apiAndDocs: Configuration by configurations.creating { @@ -28,7 +28,7 @@ index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..391e05b63663331a4404514bdb6ab307 // api dependencies are listed transitively to API consumers - api("com.google.guava:guava:32.1.2-jre") - api("com.google.code.gson:gson:2.10.1") -+ api("com.google.guava:guava:33.2.1-jre") // Leaf - Bump Dependencies ++ api("com.google.guava:guava:33.3.0-jre") // Leaf - Bump Dependencies + api("com.google.code.gson:gson:2.11.0") // Leaf - Bump Dependencies // Paper start - adventure api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.18") { @@ -37,13 +37,13 @@ index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..391e05b63663331a4404514bdb6ab307 // Paper - adventure api("org.yaml:snakeyaml:2.2") - api("org.joml:joml:1.10.5") -+ api("org.joml:joml:1.10.5") // Leaf - Bump Dependencies // Dreeam TODO - Waiting update to 1.10.7 ++ api("org.joml:joml:1.10.8") // Leaf - Bump Dependencies // Paper start api("com.googlecode.json-simple:json-simple:1.1.1") { isTransitive = false // includes junit } - api("it.unimi.dsi:fastutil:8.5.6") -+ api("it.unimi.dsi:fastutil:8.5.13") // Leaf - Bump Dependencies ++ api("it.unimi.dsi:fastutil:8.5.14") // Leaf - Bump Dependencies apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion")) apiAndDocs("net.kyori:adventure-api") apiAndDocs("net.kyori:adventure-text-minimessage") @@ -52,7 +52,7 @@ index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..391e05b63663331a4404514bdb6ab307 api("org.apache.logging.log4j:log4j-api:$log4jVersion") api("org.slf4j:slf4j-api:$slf4jVersion") - api("io.sentry:sentry:5.4.0") // Pufferfish -+ api("io.sentry:sentry:7.12.0") // Pufferfish // Leaf - Bump Dependencies // Dreeam TODO - Update to 8.0.0 ++ api("io.sentry:sentry:8.0.0-alpha.4") // Pufferfish // Leaf - Bump Dependencies implementation("org.ow2.asm:asm:9.7") implementation("org.ow2.asm:asm-commons:9.7") @@ -62,9 +62,9 @@ index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..391e05b63663331a4404514bdb6ab307 - compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18") - compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18") + // Leaf start - Bump Dependencies -+ api("org.apache.maven:maven-resolver-provider:3.9.8") // Paper - make API dependency for Paper Plugins -+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.21") // Dreeam TODO - Update to 2.0.0 -+ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.21") ++ api("org.apache.maven:maven-resolver-provider:3.9.9") // Paper - make API dependency for Paper Plugins ++ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.22") // Dreeam TODO - Update to 2.0.1 ++ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.22") // Dreeam TODO - Update to 2.0.1 + // Leaf end - Bump Dependencies val annotations = "org.jetbrains:annotations:$annotationsVersion" // Paper - we don't want Java 5 annotations... @@ -73,26 +73,27 @@ index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..391e05b63663331a4404514bdb6ab307 // Paper start - add checker - val checkerQual = "org.checkerframework:checker-qual:3.33.0" -+ val checkerQual = "org.checkerframework:checker-qual:3.45.0" // Leaf - Bump Dependencies ++ val checkerQual = "org.checkerframework:checker-qual:3.46.0" // Leaf - Bump Dependencies compileOnlyApi(checkerQual) testCompileOnly(checkerQual) // Paper end - testImplementation("org.apache.commons:commons-lang3:3.12.0") - testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") -+ // Leaf start - Bump Dependencies -+ testImplementation("org.apache.commons:commons-lang3:3.15.0") -+ testImplementation("org.junit.jupiter:junit-jupiter:5.11.0-M2") -+ // Leaf end - Bump Dependencies - testImplementation("org.hamcrest:hamcrest:2.2") +- testImplementation("org.hamcrest:hamcrest:2.2") - testImplementation("org.mockito:mockito-core:5.11.0") -+ testImplementation("org.mockito:mockito-core:5.12.0") // Leaf - Bump Dependencies ++ // Leaf start - Bump Dependencies ++ testImplementation("org.apache.commons:commons-lang3:3.16.0") ++ testImplementation("org.junit.jupiter:junit-jupiter:5.11.0") ++ testImplementation("org.hamcrest:hamcrest:3.0") ++ testImplementation("org.mockito:mockito-core:5.12.0") ++ // Leaf end - Bump Dependencies testImplementation("org.ow2.asm:asm-tree:9.7") + + // Leaf - Bump Dependencies + // commons-lang3 is removed in maven-resolver-provider since 3.9.8 + // Add this because bukkit api still need it. -+ implementation("org.apache.commons:commons-lang3:3.15.0") ++ implementation("org.apache.commons:commons-lang3:3.16.0") } // Paper start diff --git a/patches/server/0016-Bump-Dependencies.patch b/patches/server/0016-Bump-Dependencies.patch index 50ca760f..d19c0cc0 100644 --- a/patches/server/0016-Bump-Dependencies.patch +++ b/patches/server/0016-Bump-Dependencies.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Bump Dependencies TODO - Dreeam: Bump & test dependencies, impl new features? diff --git a/build.gradle.kts b/build.gradle.kts -index d64cc6915139d276487880c05714b5570a2ee94c..86cb48c55ed915fb2c9d166730adf1f81ed1a75a 100644 +index d64cc6915139d276487880c05714b5570a2ee94c..098ffb515bd6994817da5335993cb16f1d7e7ca7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { @@ -38,9 +38,10 @@ index d64cc6915139d276487880c05714b5570a2ee94c..86cb48c55ed915fb2c9d166730adf1f8 implementation("org.ow2.asm:asm-commons:9.7") implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files implementation("commons-lang:commons-lang:2.6") - runtimeOnly("org.xerial:sqlite-jdbc:3.46.0.0") +- runtimeOnly("org.xerial:sqlite-jdbc:3.46.0.0") - runtimeOnly("com.mysql:mysql-connector-j:8.4.0") - runtimeOnly("com.lmax:disruptor:3.4.4") // Paper ++ runtimeOnly("org.xerial:sqlite-jdbc:3.46.1.0") // Leaf - Bump Dependencies + runtimeOnly("com.mysql:mysql-connector-j:8.4.0") // Dreeam TODO - Update to 9.0.0 + runtimeOnly("com.lmax:disruptor:3.4.4") // Paper // Leaf - Bump Dependencies // Dreeam TODO - Waiting Log4j 3.x to support disruptor 4.0.0 // Paper start - Use Velocity cipher @@ -54,9 +55,9 @@ index d64cc6915139d276487880c05714b5570a2ee94c..86cb48c55ed915fb2c9d166730adf1f8 - runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18") - runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18") + // Leaf start - Bump Dependencies -+ runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.8") -+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.21") // Dreeam TODO - Update to 2.0.0 -+ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.21") ++ runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.9") ++ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.22") // Dreeam TODO - Update to 2.0.1 ++ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.22") // Dreeam TODO - Update to 2.0.1 + // Leaf end // Purpur start @@ -67,10 +68,11 @@ index d64cc6915139d276487880c05714b5570a2ee94c..86cb48c55ed915fb2c9d166730adf1f8 - testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test - testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") -+ testImplementation("io.github.classgraph:classgraph:4.8.174") // Paper - mob goal test // Leaf - Bump Dependencies -+ testImplementation("org.junit.jupiter:junit-jupiter:5.11.0-M2") // Leaf - Bump Dependencies - testImplementation("org.hamcrest:hamcrest:2.2") +- testImplementation("org.hamcrest:hamcrest:2.2") - testImplementation("org.mockito:mockito-core:5.11.0") ++ testImplementation("io.github.classgraph:classgraph:4.8.175") // Paper - mob goal test // Leaf - Bump Dependencies ++ testImplementation("org.junit.jupiter:junit-jupiter:5.11.0") // Leaf - Bump Dependencies ++ testImplementation("org.hamcrest:hamcrest:3.0") + testImplementation("org.mockito:mockito-core:5.12.0") // Leaf - Bump Dependencies testImplementation("org.ow2.asm:asm-tree:9.7") testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest diff --git a/patches/server/0049-Linear-region-file-format.patch b/patches/server/0049-Linear-region-file-format.patch index ec392830..61388759 100644 --- a/patches/server/0049-Linear-region-file-format.patch +++ b/patches/server/0049-Linear-region-file-format.patch @@ -12,7 +12,7 @@ This format saves about 50% of disk space. Documentation: https://github.com/xymb-endcrystalme/LinearRegionFileFormatTools diff --git a/build.gradle.kts b/build.gradle.kts -index f07c5a0be9d734684592e4fbef189be6bfd8e770..57b524c602751e6b8be9052b15a7cee6e1447e7e 100644 +index 098ffb515bd6994817da5335993cb16f1d7e7ca7..af9ebf010b7c88671e8f9870e976cff278e97611 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,6 +21,11 @@ dependencies { @@ -20,7 +20,7 @@ index f07c5a0be9d734684592e4fbef189be6bfd8e770..57b524c602751e6b8be9052b15a7cee6 // Leaf end - Leaf Config + // LinearPaper start -+ implementation("com.github.luben:zstd-jni:1.5.6-3") ++ implementation("com.github.luben:zstd-jni:1.5.6-4") + implementation("org.lz4:lz4-java:1.8.0") + // LinearPaper end + @@ -137,7 +137,7 @@ index cb39c629af1827078f35904a373d35a63fea17ff..dc41c7c4616fa925427cd5a862f3923c } diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java -index 6d864396f72220d9c92733a38ff6f2fd235238f5..66fadf8b6e01624272bcf303979687f9d9418402 100644 +index b0ef7d56d736353722dcb92442a43c07be290cf1..280e39f2ae3dacc398453c7aac345acb4312addb 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java @@ -28,7 +28,7 @@ import net.minecraft.nbt.NbtIo; // Paper