Bump dependencies

Winds-Studio · Jan 8, 2025 · 822da78 · 822da78
1 parent 3fd1e88
commit 822da78
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 41 deletions.
diff --git a/patches/api/0006-Bump-Dependencies.patch b/patches/api/0006-Bump-Dependencies.patch
@@ -5,33 +5,34 @@ Subject: [PATCH] Bump Dependencies
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 5fac022f2373105df7f9cfb292642c4a399c7db4..0758acfb5ad6793e5ffd1feb6bb321536a43b4d6 100644
+index 5fac022f2373105df7f9cfb292642c4a399c7db4..4cc608d0a5dc80e2ef492756c7637644fd4a3821 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -9,11 +9,13 @@ java {
      withJavadocJar()
  }
 
 -val annotationsVersion = "24.1.0"
-+val annotationsVersion = "26.0.1" // Leaf - Bump Dependencies
++// Leaf start - Bump Dependencies
++val annotationsVersion = "26.0.1"
  val bungeeCordChatVersion = "1.20-R0.2"
- val adventureVersion = "4.17.0"
+-val adventureVersion = "4.17.0"
 -val slf4jVersion = "2.0.9"
 -val log4jVersion = "2.17.1"
-+// Leaf start - Bump Dependencies
++val adventureVersion = "4.18.0"
 +val slf4jVersion = "2.0.16"
-+val log4jVersion = "2.24.2"
++val log4jVersion = "2.24.3"
 +// Leaf end - Bump Dependencies
  val apiAndDocs: Configuration by configurations.creating {
      attributes {
          attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
-@@ -41,20 +43,20 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider {
+@@ -41,20 +43,24 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider {
  dependencies {
      api("com.mojang:brigadier:1.2.9") // Paper - Brigadier command api
      // 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.3.1-jre") // Leaf - Bump Dependencies
++    api("com.google.guava:guava:33.4.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") {
@@ -41,7 +42,11 @@ index 5fac022f2373105df7f9cfb292642c4a399c7db4..0758acfb5ad6793e5ffd1feb6bb32153
 -    api("org.yaml:snakeyaml:2.2")
 -    api("org.joml:joml:1.10.5")
 +    api("org.yaml:snakeyaml:2.3")
-+    api("org.joml:joml:1.10.5") // Leaf - Bump Dependencies // Dreeam TODO - Waiting update to 1.10.8, Dont bump
++    // Leaf start - Bump Dependencies
++    api("org.joml:joml:1.10.8") {
++        isTransitive = false // https://github.com/JOML-CI/JOML/issues/352
++    }
++    // Leaf end - Bump Dependencies
      // Paper start
      api("com.googlecode.json-simple:json-simple:1.1.1") {
          isTransitive = false // includes junit
@@ -51,12 +56,12 @@ index 5fac022f2373105df7f9cfb292642c4a399c7db4..0758acfb5ad6793e5ffd1feb6bb32153
      apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
      apiAndDocs("net.kyori:adventure-api")
      apiAndDocs("net.kyori:adventure-text-minimessage")
-@@ -64,33 +66,42 @@ dependencies {
+@@ -64,33 +70,40 @@ dependencies {
      apiAndDocs("net.kyori:adventure-text-logger-slf4j")
      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:8.0.0-rc.2") // Pufferfish // Leaf - Bump Dependencies
++    api("io.sentry:sentry:8.0.0-rc.3") // Pufferfish // Leaf - Bump Dependencies
 
      implementation("org.ow2.asm:asm:9.7.1")
      implementation("org.ow2.asm:asm-commons:9.7.1")
@@ -77,7 +82,7 @@ index 5fac022f2373105df7f9cfb292642c4a399c7db4..0758acfb5ad6793e5ffd1feb6bb32153
 
      // Paper start - add checker
 -    val checkerQual = "org.checkerframework:checker-qual:3.33.0"
-+    val checkerQual = "org.checkerframework:checker-qual:3.48.3" // Leaf - Bump Dependencies
++    val checkerQual = "org.checkerframework:checker-qual:3.48.4" // Leaf - Bump Dependencies
      compileOnlyApi(checkerQual)
      testCompileOnly(checkerQual)
      // Paper end
@@ -87,29 +92,28 @@ index 5fac022f2373105df7f9cfb292642c4a399c7db4..0758acfb5ad6793e5ffd1feb6bb32153
 -    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
 -    testImplementation("org.hamcrest:hamcrest:2.2")
 -    testImplementation("org.mockito:mockito-core:5.14.1")
-+    // Leaf start - Bump Dependencies
 +    testImplementation("org.apache.commons:commons-lang3:3.17.0")
-+    testImplementation("org.junit.jupiter:junit-jupiter:5.11.3")
++    testImplementation("org.junit.jupiter:junit-jupiter:5.11.4")
 +    testImplementation("org.hamcrest:hamcrest:3.0")
-+    testImplementation("org.mockito:mockito-core:5.14.2")
-+    // Leaf end - Bump Dependencies
++    testImplementation("org.mockito:mockito-core:5.15.2")
      testImplementation("org.ow2.asm:asm-tree:9.7.1")
-     mockitoAgent("org.mockito:mockito-core:5.14.1") { isTransitive = false } // Paper - configure mockito agent that is needed in newer java versions
+-    mockitoAgent("org.mockito:mockito-core:5.14.1") { isTransitive = false } // Paper - configure mockito agent that is needed in newer java versions
++    mockitoAgent("org.mockito:mockito-core:5.15.1") { isTransitive = false } // Paper - configure mockito agent that is needed in newer java versions
 +
-+    // Leaf - Bump Dependencies
 +    // commons-lang3 is removed in maven-resolver-provider since 3.9.8
 +    // Add this because bukkit api still need it.
 +    compileOnly("org.apache.commons:commons-lang3:3.17.0")
++    // Leaf end - Bump Dependencies
  }
 
  // Paper start
-@@ -182,13 +193,13 @@ tasks.withType<Javadoc> {
+@@ -182,13 +195,13 @@ tasks.withType<Javadoc> {
      options.use()
      options.isDocFilesSubDirs = true
      options.links(
 -        "https://guava.dev/releases/32.1.2-jre/api/docs/",
 -        "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
-+        "https://guava.dev/releases/33.3.1-jre/api/docs/", // Leaf - Bump Dependencies
++        "https://guava.dev/releases/33.4.0-jre/api/docs/", // Leaf - Bump Dependencies
 +        "https://javadoc.io/doc/org.yaml/snakeyaml/2.3/", // Leaf - Bump Dependencies
          "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
          // "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // Paper - don't link to bungee chat
@@ -121,7 +125,7 @@ index 5fac022f2373105df7f9cfb292642c4a399c7db4..0758acfb5ad6793e5ffd1feb6bb32153
          "https://jspecify.dev/docs/api/",
          // Paper end
          // Paper start
-@@ -200,9 +211,9 @@ tasks.withType<Javadoc> {
+@@ -200,9 +213,9 @@ tasks.withType<Javadoc> {
          "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/",
@@ -133,7 +137,7 @@ index 5fac022f2373105df7f9cfb292642c4a399c7db4..0758acfb5ad6793e5ffd1feb6bb32153
      )
      options.tags("apiNote:a:API Note:")
 
-@@ -250,6 +261,11 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.
+@@ -250,6 +263,11 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.
      jarToScan.set(tasks.jar.flatMap { it.archiveFile })
      classpath.from(configurations.compileClasspath)
  }

diff --git a/patches/server/0015-Bump-Dependencies.patch b/patches/server/0015-Bump-Dependencies.patch
@@ -6,31 +6,44 @@ Subject: [PATCH] Bump Dependencies
 TODO - Dreeam: Bump & test dependencies, impl new features?
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 3b0cd45cb07d9563c84901729f1f7edc498653bd..c35ffb8565218d9368cc583ae96ea86424184eed 100644
+index 3b0cd45cb07d9563c84901729f1f7edc498653bd..635ec3ef8bd96f73527ee50ca87c8f2e6b8232b2 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -44,28 +44,32 @@ dependencies {
+@@ -34,38 +34,42 @@ dependencies {
+     // Leaf end - Leaf Config
+
+     // Paper start
+-    implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
+-    implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
++    // Leaf start - Bump Dependencies
++    implementation("org.jline:jline-terminal-ffm:3.28.0") // use ffm on java 22+ // Leaf Bu
++    implementation("org.jline:jline-terminal-jni:3.28.0") // fall back to jni on java 21
+     implementation("net.minecrell:terminalconsoleappender:1.3.0")
+-    implementation("net.kyori:adventure-text-serializer-ansi:4.17.0") // Keep in sync with adventureVersion from Paper-API build file
++    implementation("net.kyori:adventure-text-serializer-ansi:4.18.0") // Keep in sync with adventureVersion from Paper-API build file
+     /*
+           Required to add the missing Log4j2Plugins.dat file from log4j-core
+           which has been removed by Mojang. Without it, log4j has to classload
            all its classes to check if they are plugins.
            Scanning takes about 1-2 seconds so adding this speeds up the server start.
       */
 -    implementation("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - implementation
 -    log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - Needed to generate meta for our Log4j plugins
-+    // Leaf start - Bump Dependencies
-+    implementation("org.apache.logging.log4j:log4j-core:2.24.2") // Paper - implementation
-+    log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.24.2") // Paper - Needed to generate meta for our Log4j plugins
++    implementation("org.apache.logging.log4j:log4j-core:2.24.3") // Paper - implementation
++    log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.24.3") // Paper - Needed to generate meta for our Log4j plugins
      runtimeOnly(log4jPlugins.output)
      alsoShade(log4jPlugins.output)
 -    implementation("io.netty:netty-codec-haproxy:4.1.97.Final") // Paper - Add support for proxy protocol
-+    implementation("io.netty:netty-codec-haproxy:4.1.115.Final") // Paper - Add support for proxy protocol
++    implementation("io.netty:netty-codec-haproxy:4.1.116.Final") // Paper - Add support for proxy protocol
      // Paper end
 -    implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion
-+    implementation("org.apache.logging.log4j:log4j-iostreams:2.24.2") // Paper - remove exclusion
++    implementation("org.apache.logging.log4j:log4j-iostreams:2.24.3") // Paper - remove exclusion
 +    // Leaf end - Bump Dependencies
      implementation("org.ow2.asm:asm-commons:9.7.1")
      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.1.3")
-+    runtimeOnly("org.xerial:sqlite-jdbc:3.47.1.0") // Leaf - Bump Dependencies
++    runtimeOnly("org.xerial:sqlite-jdbc:3.47.2.0") // Leaf - Bump Dependencies
      runtimeOnly("com.mysql:mysql-connector-j:9.1.0")
 -    runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
 +    runtimeOnly("com.lmax:disruptor:3.4.4") // Paper // Dreeam TODO - Waiting Log4j 3.x to support disruptor 4.0.0
@@ -64,11 +77,11 @@ index 3b0cd45cb07d9563c84901729f1f7edc498653bd..c35ffb8565218d9368cc583ae96ea864
 -    mockitoAgent("org.mockito:mockito-core:5.14.1") { isTransitive = false } // Paper - configure mockito agent that is needed in newer java versions
 +    // Leaf start - Bump Dependencies
 +    testImplementation("io.github.classgraph:classgraph:4.8.179") // Paper - mob goal test
-+    testImplementation("org.junit.jupiter:junit-jupiter:5.11.3")
-+    testImplementation("org.junit.platform:junit-platform-suite-engine:1.11.3")
++    testImplementation("org.junit.jupiter:junit-jupiter:5.11.4")
++    testImplementation("org.junit.platform:junit-platform-suite-engine:1.11.4")
 +    testImplementation("org.hamcrest:hamcrest:3.0")
-+    testImplementation("org.mockito:mockito-core:5.14.2")
-+    mockitoAgent("org.mockito:mockito-core:5.14.2") { isTransitive = false } // Paper - configure mockito agent that is needed in newer java versions
++    testImplementation("org.mockito:mockito-core:5.15.2")
++    mockitoAgent("org.mockito:mockito-core:5.15.2") { isTransitive = false } // Paper - configure mockito agent that is needed in newer java versions
      testImplementation("org.ow2.asm:asm-tree:9.7.1")
 -    testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest
 +    testImplementation("org.junit-pioneer:junit-pioneer:2.3.0") // Paper - CartesianTest
@@ -81,7 +94,7 @@ index 3b0cd45cb07d9563c84901729f1f7edc498653bd..c35ffb8565218d9368cc583ae96ea864
      implementation("me.lucko:spark-paper:1.10.119-SNAPSHOT")
      // Paper end - spark
 +
-+    implementation("io.netty:netty-all:4.1.115.Final") // Leaf - Bump Dependencies // Dreeam TODO - Update to 4.2.0
++    implementation("io.netty:netty-all:4.1.116.Final") // Leaf - Bump Dependencies // Dreeam TODO - Update to 4.2.0
  }
 
  paperweight {

diff --git a/patches/server/0045-Linear-region-file-format.patch b/patches/server/0045-Linear-region-file-format.patch
@@ -12,21 +12,21 @@ 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 c35ffb8565218d9368cc583ae96ea86424184eed..1e3dc0cf613a621bbf0873bcffb01c69aa119e92 100644
+index 635ec3ef8bd96f73527ee50ca87c8f2e6b8232b2..92fc2ab1fd20d31d1c5476f8f2349f0f64fbec9d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -33,6 +33,11 @@ dependencies {
      }
      // Leaf end - Leaf Config
 
 +    // LinearPaper start
-+    implementation("com.github.luben:zstd-jni:1.5.6-8")
++    implementation("com.github.luben:zstd-jni:1.5.6-9")
 +    implementation("org.lz4:lz4-java:1.8.0")
 +    // LinearPaper end
 +
      // Paper start
-     implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
-     implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
+     // Leaf start - Bump Dependencies
+     implementation("org.jline:jline-terminal-ffm:3.28.0") // use ffm on java 22+ // Leaf Bu
 diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/io/ChunkSystemRegionFileStorage.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/io/ChunkSystemRegionFileStorage.java
 index a814512fcfb85312474ae2c2c21443843bf57831..f80c75c561313625b694b433692aa429b8f8fde9 100644
 --- a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/io/ChunkSystemRegionFileStorage.java

diff --git a/patches/server/0065-Cache-player-profileResult.patch b/patches/server/0065-Cache-player-profileResult.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cache player profileResult
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 1e3dc0cf613a621bbf0873bcffb01c69aa119e92..a42eb55c2f26a0048ea688655c5bb1dfed6d5adf 100644
+index 92fc2ab1fd20d31d1c5476f8f2349f0f64fbec9d..e83f011f8f2b37a7c8b04284b5510a131b1b7259 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -38,6 +38,10 @@ dependencies {
@@ -17,8 +17,8 @@ index 1e3dc0cf613a621bbf0873bcffb01c69aa119e92..a42eb55c2f26a0048ea688655c5bb1df
 +    // Leaf end - Libraries
 +
      // Paper start
-     implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
-     implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
+     // Leaf start - Bump Dependencies
+     implementation("org.jline:jline-terminal-ffm:3.28.0") // use ffm on java 22+ // Leaf Bu
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 index e442fd1b80dd57d4420cab4da69ec3598ffc22d3..52fdc27ae63c2524e316620d905af7cd97112482 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java