Update dependencies

Winds-Studio · Feb 8, 2023 · b8bcb2a · b8bcb2a
1 parent 63ac30a
commit b8bcb2a
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 20 deletions.
diff --git 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 780c9b40f69c247592c1fe469c05fd12e984b633..724840d317053a95a69b8bfd638bd9d39186e3b0 100644
+index 780c9b40f69c247592c1fe469c05fd12e984b633..ee6ae8fc9a918443f7f2b5c2f84e9b4dce58817d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -23,15 +23,15 @@ configurations.api {
@@ -16,44 +16,49 @@ index 780c9b40f69c247592c1fe469c05fd12e984b633..724840d317053a95a69b8bfd638bd9d3
 -    api("com.google.code.gson:gson:2.8.9")
 -    api("net.md-5:bungeecord-chat:1.16-R0.4-deprecated+build.6") // Paper
 +    api("com.google.guava:guava:31.1-jre")
-+    api("com.google.code.gson:gson:2.10")
++    api("com.google.code.gson:gson:2.10.1")
 +    api("net.md-5:bungeecord-chat:1.19-R0.1-SNAPSHOT") // Paper
      api("org.yaml:snakeyaml:1.33")
      // 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.9")
++    api("it.unimi.dsi:fastutil:8.5.11")
      apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
      apiAndDocs("net.kyori:adventure-api")
      apiAndDocs("net.kyori:adventure-text-minimessage")
-@@ -39,18 +39,18 @@ dependencies {
+@@ -39,20 +39,20 @@ dependencies {
      apiAndDocs("net.kyori:adventure-text-serializer-legacy")
      apiAndDocs("net.kyori:adventure-text-serializer-plain")
      apiAndDocs("net.kyori:adventure-text-logger-slf4j")
 -    api("org.apache.logging.log4j:log4j-api:2.17.1")
 -    api("org.slf4j:slf4j-api:1.8.0-beta4")
+-    api("io.sentry:sentry:5.4.0") // Pufferfish
 +    api("org.apache.logging.log4j:log4j-api:2.19.0")
 +    api("org.slf4j:slf4j-api:1.8.0-beta4") // Leaf TODO - Bump later, need to fix breaking compatibility
-     api("io.sentry:sentry:5.4.0") // Pufferfish
++    api("io.sentry:sentry:6.13.0") // Pufferfish
 
 -    implementation("org.ow2.asm:asm:9.2")
 -    implementation("org.ow2.asm:asm-commons:9.2")
 +    implementation("org.ow2.asm:asm:9.4")
 +    implementation("org.ow2.asm:asm-commons:9.4")
      // Paper end
 
-     compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
+-    compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
 -    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
 -    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
 -    compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper
-+    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.2")
-+    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.2")
++    compileOnly("org.apache.maven:maven-resolver-provider:3.8.7")
++    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") // Leaf TODO - Bump later, need to fix breaking compatibility
++    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") // Leaf TODO - Bump later, need to fix breaking compatibility
 +    compileOnly("com.google.code.findbugs:jsr305:3.0.2") // Paper
 
-     val annotations = "org.jetbrains:annotations:23.0.0" // Paper - we don't want Java 5 annotations...
+-    val annotations = "org.jetbrains:annotations:23.0.0" // Paper - we don't want Java 5 annotations...
++    val annotations = "org.jetbrains:annotations:24.0.0" // Paper - we don't want Java 5 annotations...
      compileOnly(annotations)
+     testCompileOnly(annotations)
+
 @@ -64,8 +64,8 @@ dependencies {
 
      testImplementation("org.apache.commons:commons-lang3:3.12.0")
@@ -65,3 +70,15 @@ index 780c9b40f69c247592c1fe469c05fd12e984b633..724840d317053a95a69b8bfd638bd9d3
  }
 
  configure<PublishingExtension> {
+@@ -108,9 +108,9 @@ tasks.withType<Javadoc> {
+     options.use()
+     options.isDocFilesSubDirs = true
+     options.links(
+-        "https://guava.dev/releases/31.0.1-jre/api/docs/",
++        "https://guava.dev/releases/31.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
++        "https://javadoc.io/doc/org.jetbrains/annotations/24.0.0/", // Paper - we don't want Java 5 annotations
+         // Paper start
+         //"https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", // don't link to bungee chat
+         "https://jd.adventure.kyori.net/api/$adventureVersion/",
diff --git a/patches/server/0003-Bump-Dependencies.patch b/patches/server/0003-Bump-Dependencies.patch
@@ -5,10 +5,19 @@ Subject: [PATCH] Bump Dependencies
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 2e82c5eea2d101d1413a8307edaadb16b968af0f..2e2313d93e217799d2713db9b9d9675d5af3b603 100644
+index 2e82c5eea2d101d1413a8307edaadb16b968af0f..1b7ffd1bcb928efaea1f60bc89bc5b5bae22799f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -22,14 +22,14 @@ dependencies {
+@@ -14,7 +14,7 @@ dependencies {
+     }
+     // Pufferfish end
+     // Paper start
+-    implementation("org.jline:jline-terminal-jansi:3.21.0")
++    implementation("org.jline:jline-terminal-jansi:3.22.0")
+     implementation("net.minecrell:terminalconsoleappender:1.3.0")
+     /*
+           Required to add the missing Log4j2Plugins.dat file from log4j-core
+@@ -22,47 +22,43 @@ dependencies {
            all its classes to check if they are plugins.
            Scanning takes about 1-2 seconds so adding this speeds up the server start.
       */
@@ -17,7 +26,7 @@ index 2e82c5eea2d101d1413a8307edaadb16b968af0f..2e2313d93e217799d2713db9b9d9675d
 -    implementation("io.netty:netty-codec-haproxy:4.1.77.Final")
 +    implementation("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - implementation
 +    annotationProcessor("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - Needed to generate meta for our Log4j plugins
-+    implementation("io.netty:netty-codec-haproxy:4.1.85.Final")
++    implementation("io.netty:netty-codec-haproxy:4.1.87.Final")
      // Paper end
 -    implementation("org.apache.logging.log4j:log4j-iostreams:2.17.1") // Paper
 -    implementation("org.apache.logging.log4j:log4j-slf4j18-impl:2.17.1") // Paper
@@ -30,21 +39,24 @@ index 2e82c5eea2d101d1413a8307edaadb16b968af0f..2e2313d93e217799d2713db9b9d9675d
      implementation("org.spongepowered:configurate-yaml:4.1.2") // Paper - config files
      implementation("commons-lang:commons-lang:2.6")
      implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
-@@ -38,31 +38,27 @@ dependencies {
+     // Paper start - Use Velocity cipher
+-    implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT") {
++    implementation("com.velocitypowered:velocity-native:3.2.0-SNAPSHOT") {
          isTransitive = false
      }
      // Paper end
 -    runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
 -    runtimeOnly("mysql:mysql-connector-java:8.0.29")
-+    runtimeOnly("org.xerial:sqlite-jdbc:3.40.0.0")
-+    runtimeOnly("mysql:mysql-connector-java:8.0.30")
++    runtimeOnly("org.xerial:sqlite-jdbc:3.40.1.0")
++    runtimeOnly("mysql:mysql-connector-java:8.0.32")
      runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
 
-     runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
+-    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")
-+    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.2")
-+    runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.2")
++    runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.7")
++    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") // Leaf TODO - Bump later, need to fix breaking compatibility
++    runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") // Leaf TODO - Bump later, need to fix breaking compatibility
 
      // Pufferfish start
 -    implementation("org.yaml:snakeyaml:1.32")
@@ -57,7 +69,7 @@ index 2e82c5eea2d101d1413a8307edaadb16b968af0f..2e2313d93e217799d2713db9b9d9675d
      implementation("com.github.technove:Flare:34637f3f87") // Pufferfish - flare
 
 -    testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
-+    testImplementation("io.github.classgraph:classgraph:4.8.152") // Paper - mob goal test
++    testImplementation("io.github.classgraph:classgraph:4.8.154") // Paper - mob goal test
      testImplementation("junit:junit:4.13.2")
 -    testImplementation("org.hamcrest:hamcrest-library:1.3")
 +    testImplementation("org.hamcrest:hamcrest-library:2.2")
@@ -67,7 +79,7 @@ index 2e82c5eea2d101d1413a8307edaadb16b968af0f..2e2313d93e217799d2713db9b9d9675d
 -    implementation ("me.carleslc.Simple-YAML:Simple-Yaml:1.8.3") {
 -        exclude(group="org.yaml", module="snakeyaml")
 -    }
-+    implementation("io.netty:netty-all:4.1.85.Final"); // Paper - Bump netty
++    implementation("io.netty:netty-all:4.1.87.Final"); // Paper - Bump netty
  }
 
  val craftbukkitPackageVersion = "1_19_R1" // Paper