Bump Dependencies

404Setup · Nov 12, 2024 · 60355c1 · 60355c1
1 parent 1f33982
commit 60355c1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 19 deletions.
diff --git a/patches/api/0010-Bump-Dependencies.patch b/patches/api/0010-Bump-Dependencies.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 7cb844b49caa3b98f3fefcc3bb90ce51780adfa0..894e27ea1e2abe10dcb73058eb2b3b8edfd2cfa0 100644
+index 7cb844b49caa3b98f3fefcc3bb90ce51780adfa0..54a3083b3e8d7ddda5e18d63329c601e19f3a4cf 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -12,8 +12,8 @@ java {
@@ -25,7 +25,7 @@ index 7cb844b49caa3b98f3fefcc3bb90ce51780adfa0..894e27ea1e2abe10dcb73058eb2b3b8e
      // 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.guava:guava:33.3.1-jre")
 +    api("com.google.code.gson:gson:2.11.0")
      // Paper start - adventure
      api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.18") {
@@ -41,26 +41,17 @@ index 7cb844b49caa3b98f3fefcc3bb90ce51780adfa0..894e27ea1e2abe10dcb73058eb2b3b8e
          isTransitive = false // includes junit
      }
 -    api("it.unimi.dsi:fastutil:8.5.6")
-+    api("it.unimi.dsi:fastutil:8.5.13")
++    api("it.unimi.dsi:fastutil:8.5.15")
      apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
      apiAndDocs("net.kyori:adventure-api")
      apiAndDocs("net.kyori:adventure-text-minimessage")
-@@ -66,6 +66,8 @@ dependencies {
-     api("org.jetbrains.kotlinx:atomicfu:0.26.0")
-     api("org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3")
-     api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
-+
-+    api("one.util:streamex:0.8.3")
-     // Vine end
-
-     api("org.apache.maven:maven-resolver-provider:3.9.6") // Paper - make API dependency for Paper Plugins
-@@ -170,13 +172,13 @@ tasks.withType<Javadoc> {
+@@ -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://guava.dev/releases/33.3.1-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

diff --git a/patches/server/0002-Add-some-required-dependencies-and-bump.patch b/patches/server/0002-Add-some-required-dependencies-and-bump.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add some required dependencies and bump
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 5ecc93bb8a1828bbe44e0cc76c72eeb41b120001..881dff56e12453109dc66f520ecb74dfaa350f31 100644
+index 5ecc93bb8a1828bbe44e0cc76c72eeb41b120001..e9618559e28da476e02d938966a4d6a14a9902d5 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -27,13 +27,13 @@ dependencies {
@@ -34,7 +34,7 @@ index 5ecc93bb8a1828bbe44e0cc76c72eeb41b120001..881dff56e12453109dc66f520ecb74df
      implementation ("me.carleslc.Simple-YAML:Simple-Yaml:1.8.4") {
          exclude(group="org.yaml", module="snakeyaml")
      }
-@@ -79,12 +79,29 @@ dependencies {
+@@ -79,12 +79,31 @@ dependencies {
 
      // Vine start
      implementation(kotlin("reflect"))
@@ -50,11 +50,13 @@ index 5ecc93bb8a1828bbe44e0cc76c72eeb41b120001..881dff56e12453109dc66f520ecb74df
 
 +    // Vine start
 +    implementation("org.xerial.snappy:snappy-java:1.1.10.7")
-+    implementation("com.github.luben:zstd-jni:1.5.6-6")
++    implementation("com.github.luben:zstd-jni:1.5.6-7")
 +    implementation("org.lz4:lz4-java:1.8.0")
 +
 +    implementation("com.github.weisj:darklaf-core:3.0.2") // Swing Theme
 +
++    implementation("net.intelie.tinymap:tinymap:0.7")
++
 +    val brotli4jVersion = "1.17.0"
 +    implementation ( group = "com.aayushatharva.brotli4j", name = "brotli4j", version = brotli4jVersion )
 +    runtimeOnly ( group = "com.aayushatharva.brotli4j", name = "native-windows-x86_64", version = brotli4jVersion )

diff --git a/patches/server/0048-Leaf-Cache-player-profileResult.patch b/patches/server/0048-Leaf-Cache-player-profileResult.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Leaf: Cache player profileResult
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 881dff56e12453109dc66f520ecb74dfaa350f31..196f64e58b813ef36aa9046f0d9cf83f36ca83d7 100644
+index e9618559e28da476e02d938966a4d6a14a9902d5..378813002b1ee4b5437220ab93084476afe75e39 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -102,6 +102,7 @@ dependencies {
+@@ -104,6 +104,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