Skip to content
This repository has been archived by the owner on Dec 17, 2024. It is now read-only.

Commit

Permalink
Bump Dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
404Setup committed Sep 9, 2024
1 parent 3929d3f commit 225c7fd
Show file tree
Hide file tree
Showing 3 changed files with 96 additions and 6 deletions.
65 changes: 65 additions & 0 deletions patches/api/0010-Bump-Dependencies.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: 404Setup <153366651+404Setup@users.noreply.github.com>
Date: Mon, 9 Sep 2024 08:56:43 +0800
Subject: [PATCH] Bump Dependencies


diff --git a/build.gradle.kts b/build.gradle.kts
index f60e269d861a157798ee46e730a46f83bc6a82a0..7c962b92e1f6ad3dda1794ff0980e8982dad3dd8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,8 +12,8 @@ java {
val annotationsVersion = "24.1.0"
val bungeeCordChatVersion = "1.20-R0.2"
val adventureVersion = "4.17.0"
-val slf4jVersion = "2.0.9"
-val log4jVersion = "2.17.1"
+val slf4jVersion = "2.0.16"
+val log4jVersion = "2.23.1"
val apiAndDocs: Configuration by configurations.creating {
attributes {
attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
@@ -29,20 +29,20 @@ configurations.api {
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.2.1-jre")
+ api("com.google.code.gson:gson:2.11.0")
// Paper start - adventure
api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.18") {
exclude("com.google.guava", "guava")
}
// Paper - adventure
- 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.8")
// 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")
apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
apiAndDocs("net.kyori:adventure-api")
apiAndDocs("net.kyori:adventure-text-minimessage")
@@ -170,13 +170,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.1.0-jre/api/docs/",
+ "https://javadoc.io/doc/org.yaml/snakeyaml/2.3/",
"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
// Paper start - add missing javadoc links
- "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html",
- "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1",
+ "https://javadoc.io/doc/org.joml/joml/1.10.8/index.html",
+ "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0",
// Paper end
// Paper start
"https://jd.advntr.dev/api/$adventureVersion/",
Original file line number Diff line number Diff line change
@@ -1,14 +1,40 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: 404Setup <153366651+404Setup@users.noreply.github.com>
Date: Wed, 21 Aug 2024 21:26:00 +0800
Subject: [PATCH] Add some required dependencies
Subject: [PATCH] Add some required dependencies and bump


diff --git a/build.gradle.kts b/build.gradle.kts
index 5ecc93bb8a1828bbe44e0cc76c72eeb41b120001..0dfe4f14099d5e3ff4da943d32bd14a1e788d903 100644
index 5ecc93bb8a1828bbe44e0cc76c72eeb41b120001..e4c65e034f363e840c4277056fb0ea76ecc4ff5c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -85,6 +85,27 @@ dependencies {
@@ -27,13 +27,13 @@ dependencies {
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
+ implementation("org.apache.logging.log4j:log4j-core:2.23.1") // Paper - implementation
+ log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.23.1") // 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
// Paper end
- implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion
+ implementation("org.apache.logging.log4j:log4j-iostreams:2.23.1") // Paper - remove exclusion
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")
@@ -55,7 +55,7 @@ dependencies {
implementation("dev.omega24:upnp4j:1.0") // Purpur

// Pufferfish start
- implementation("org.yaml:snakeyaml:2.2")
+ implementation("org.yaml:snakeyaml:2.3")
implementation ("me.carleslc.Simple-YAML:Simple-Yaml:1.8.4") {
exclude(group="org.yaml", module="snakeyaml")
}
@@ -85,6 +85,26 @@ dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.2")
// Vine end

Expand All @@ -18,7 +44,6 @@ index 5ecc93bb8a1828bbe44e0cc76c72eeb41b120001..0dfe4f14099d5e3ff4da943d32bd14a1
+ implementation("org.lz4:lz4-java:1.8.0")
+
+ implementation("org.reflections:reflections:0.10.2")
+ implementation("org.simdjson:simdjson-java:0.3.0")
+
+ val brotli4jVersion = "1.16.0"
+ implementation ( group = "com.aayushatharva.brotli4j", name = "brotli4j", version = brotli4jVersion )
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0042-Leaf-Cache-player-profileResult.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Leaf: Cache player profileResult


diff --git a/build.gradle.kts b/build.gradle.kts
index 0dfe4f14099d5e3ff4da943d32bd14a1e788d903..4777451dc9378f1bed1c5f663cf444dabe42ff4e 100644
index e4c65e034f363e840c4277056fb0ea76ecc4ff5c..b93eb251d0c37840239381d8d0078a92b898ec1e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -106,6 +106,7 @@ dependencies {
@@ -105,6 +105,7 @@ dependencies {
runtimeOnly ( group = "com.aayushatharva.brotli4j", name = "native-osx-x86_64", version = brotli4jVersion )
runtimeOnly ( group = "com.aayushatharva.brotli4j", name = "native-osx-aarch64", version = brotli4jVersion )
// Vine end
Expand Down

0 comments on commit 225c7fd

Please sign in to comment.