Skip to content

Commit

Permalink
Bump dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Dreeam-qwq committed Jul 25, 2023
1 parent 7b3e0fa commit 821228f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions patches/api/0001-Pufferfish-Sentry.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ Original license: GPL v3
Original project: https://github.com/pufferfish-gg/Pufferfish

diff --git a/build.gradle.kts b/build.gradle.kts
index adcee0a55ed720cb76f9dcd67be9be8f46fb925c..58bae199b8fcdfcc40a159748e723d7d163515a5 100644
index adcee0a55ed720cb76f9dcd67be9be8f46fb925c..9796d6d0a1b8fba6f694e8c4d9446d0887aed1ee 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -46,6 +46,7 @@ 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:6.23.0") // Pufferfish
+ api("io.sentry:sentry:6.25.2") // Pufferfish

implementation("org.ow2.asm:asm:9.4")
implementation("org.ow2.asm:asm-commons:9.4")
Expand Down
4 changes: 2 additions & 2 deletions patches/api/0004-Bump-Dependencies.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies


diff --git a/build.gradle.kts b/build.gradle.kts
index 58bae199b8fcdfcc40a159748e723d7d163515a5..19c0c18ccbbf8e547ba8ce0e54b851fd725f4164 100644
index 9796d6d0a1b8fba6f694e8c4d9446d0887aed1ee..ada7bddaad17ec3cc4cf942ade0bc1faf1b9ba38 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,8 +9,8 @@ java {
Expand Down Expand Up @@ -42,7 +42,7 @@ index 58bae199b8fcdfcc40a159748e723d7d163515a5..19c0c18ccbbf8e547ba8ce0e54b851fd
apiAndDocs("net.kyori:adventure-text-minimessage")
@@ -48,30 +48,33 @@ dependencies {
api("org.slf4j:slf4j-api:$slf4jVersion")
api("io.sentry:sentry:6.23.0") // Pufferfish
api("io.sentry:sentry:6.25.2") // Pufferfish

- implementation("org.ow2.asm:asm:9.4")
- implementation("org.ow2.asm:asm-commons:9.4")
Expand Down
9 changes: 5 additions & 4 deletions patches/server/0012-Bump-Dependencies.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies


diff --git a/build.gradle.kts b/build.gradle.kts
index 53240be3a1bea29c0d26aecc8801642c0bc147c4..635b8dbcd170574877e181be79cfc5fbbfc8cf1a 100644
index 53240be3a1bea29c0d26aecc8801642c0bc147c4..8e1622a17c0a7f69f5aaa7aae0da7a904d05706e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
Expand All @@ -29,7 +29,7 @@ index 53240be3a1bea29c0d26aecc8801642c0bc147c4..635b8dbcd170574877e181be79cfc5fb
runtimeOnly(log4jPlugins.output)
alsoShade(log4jPlugins.output)
- implementation("io.netty:netty-codec-haproxy:4.1.87.Final") // Paper - Add support for proxy protocol
+ implementation("io.netty:netty-codec-haproxy:4.1.94.Final") // Paper - Add support for proxy protocol
+ implementation("io.netty:netty-codec-haproxy:4.1.95.Final") // Paper - Add support for proxy protocol
// Paper end
- implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
- implementation("org.ow2.asm:asm:9.4")
Expand All @@ -46,7 +46,8 @@ index 53240be3a1bea29c0d26aecc8801642c0bc147c4..635b8dbcd170574877e181be79cfc5fb
- implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
+ implementation("net.fabricmc:mapping-io:0.4.2") // Paper - needed to read mappings for stacktrace deobfuscation // Leaf - Bump Dependencies
runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0")
runtimeOnly("com.mysql:mysql-connector-j:8.0.33")
- runtimeOnly("com.mysql:mysql-connector-j:8.0.33")
+ runtimeOnly("com.mysql:mysql-connector-j:8.1.0") // Leaf - Bump Dependencies
runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
// Paper start - Use Velocity cipher
- implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT") {
Expand Down Expand Up @@ -81,7 +82,7 @@ index 53240be3a1bea29c0d26aecc8801642c0bc147c4..635b8dbcd170574877e181be79cfc5fb
+ testImplementation("org.hamcrest:hamcrest:2.2")

- implementation("io.netty:netty-all:4.1.87.Final"); // Paper - Bump netty
+ implementation("io.netty:netty-all:4.1.94.Final"); // Paper - Bump netty
+ implementation("io.netty:netty-all:4.1.95.Final"); // Paper - Bump netty
+ // Leaf end
}

Expand Down

0 comments on commit 821228f

Please sign in to comment.