mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2026-01-04 15:41:40 +00:00
Update dependencies
This commit is contained in:
Dreeam
@@ -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 c5b725b28b11878f31b358ea9719acb53aacac41..b1c11eaee0d53ed9ece3ddf768bded98c92dde98 100644
|
||||
index c5b725b28b11878f31b358ea9719acb53aacac41..4340d8061447101667f09cf6422a58537ba77f03 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -44,6 +44,7 @@ dependencies {
|
||||
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:6.19.1") // Pufferfish
|
||||
+ api("io.sentry:sentry:6.22.0") // Pufferfish
|
||||
|
||||
implementation("org.ow2.asm:asm:9.4")
|
||||
implementation("org.ow2.asm:asm-commons:9.4")
|
||||
|
||||
@@ -5,19 +5,19 @@ Subject: [PATCH] Bump Dependencies
|
||||
|
||||
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index b1c11eaee0d53ed9ece3ddf768bded98c92dde98..6885418db2deec33622fac66428b432b690d5621 100644
|
||||
index 4340d8061447101667f09cf6422a58537ba77f03..a13e2a46ab967929117c5bce1fd6dfaf50f4c517 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -26,15 +26,17 @@ val annotationsVersion = "24.0.1"
|
||||
@@ -25,16 +25,16 @@ val annotationsVersion = "24.0.1"
|
||||
|
||||
dependencies {
|
||||
// api dependencies are listed transitively to API consumers
|
||||
api("com.google.guava:guava:31.1-jre")
|
||||
- api("com.google.guava:guava:31.1-jre")
|
||||
- api("com.google.code.gson:gson:2.10")
|
||||
- api("net.md-5:bungeecord-chat:1.16-R0.4-deprecated+build.9") // Paper
|
||||
+ // Leaf start - Bump Dependencies
|
||||
+ api("com.google.guava:guava:32.0.1-jre") // Leaf - Bump Dependencies
|
||||
+ api("com.google.code.gson:gson:2.10.1")
|
||||
+ api("net.md-5:bungeecord-chat:1.19-R0.1-SNAPSHOT") // Paper
|
||||
+ // Leaf end
|
||||
+ api("net.md-5:bungeecord-chat:1.20-R0.1-SNAPSHOT") // Paper // Leaf - Bump Dependencies
|
||||
api("org.yaml:snakeyaml:2.0")
|
||||
api("org.joml:joml:1.10.5")
|
||||
// Paper start
|
||||
@@ -29,7 +29,7 @@ index b1c11eaee0d53ed9ece3ddf768bded98c92dde98..6885418db2deec33622fac66428b432b
|
||||
apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
|
||||
apiAndDocs("net.kyori:adventure-api")
|
||||
apiAndDocs("net.kyori:adventure-text-minimessage")
|
||||
@@ -42,34 +44,37 @@ dependencies {
|
||||
@@ -42,34 +42,37 @@ dependencies {
|
||||
apiAndDocs("net.kyori:adventure-text-serializer-legacy")
|
||||
apiAndDocs("net.kyori:adventure-text-serializer-plain")
|
||||
apiAndDocs("net.kyori:adventure-text-logger-slf4j")
|
||||
@@ -38,7 +38,7 @@ index b1c11eaee0d53ed9ece3ddf768bded98c92dde98..6885418db2deec33622fac66428b432b
|
||||
+ // Leaf start - Bump Dependencies
|
||||
+ api("org.apache.logging.log4j:log4j-api:2.20.0")
|
||||
+ api("org.slf4j:slf4j-api:2.0.7")
|
||||
api("io.sentry:sentry:6.19.1") // Pufferfish
|
||||
api("io.sentry:sentry:6.22.0") // Pufferfish
|
||||
|
||||
- implementation("org.ow2.asm:asm:9.4")
|
||||
- implementation("org.ow2.asm:asm-commons:9.4")
|
||||
@@ -58,34 +58,34 @@ index b1c11eaee0d53ed9ece3ddf768bded98c92dde98..6885418db2deec33622fac66428b432b
|
||||
|
||||
// Paper start - add checker
|
||||
- val checkerQual = "org.checkerframework:checker-qual:3.21.0"
|
||||
+ val checkerQual = "org.checkerframework:checker-qual:3.33.0"
|
||||
+ val checkerQual = "org.checkerframework:checker-qual:3.35.0"
|
||||
compileOnlyApi(checkerQual)
|
||||
testCompileOnly(checkerQual)
|
||||
// Paper end
|
||||
- testImplementation("org.mockito:mockito-core:4.9.0") // Paper - add mockito
|
||||
+ testImplementation("org.mockito:mockito-core:5.2.0") // Paper - add mockito
|
||||
+ testImplementation("org.mockito:mockito-core:5.3.1") // Paper - add mockito
|
||||
|
||||
testImplementation("org.apache.commons:commons-lang3:3.12.0")
|
||||
testImplementation("junit:junit:4.13.2")
|
||||
- testImplementation("junit:junit:4.13.2")
|
||||
- testImplementation("org.hamcrest:hamcrest-library:1.3")
|
||||
+ testImplementation("junit:junit:4.13.2") // Leaf TODO - update to 5?
|
||||
+
|
||||
+ testImplementation("org.hamcrest:hamcrest-library:2.2")
|
||||
+ testImplementation("org.hamcrest:hamcrest:2.2")
|
||||
testImplementation("org.ow2.asm:asm-tree:9.5")
|
||||
+ // Leaf end
|
||||
}
|
||||
|
||||
configure<PublishingExtension> {
|
||||
@@ -115,7 +120,9 @@ tasks.withType<Javadoc> {
|
||||
@@ -115,7 +118,7 @@ tasks.withType<Javadoc> {
|
||||
options.use()
|
||||
options.isDocFilesSubDirs = true
|
||||
options.links(
|
||||
+ // Leaf - Bump Dependencies
|
||||
"https://guava.dev/releases/31.1-jre/api/docs/",
|
||||
+ // Leaf - end
|
||||
- "https://guava.dev/releases/31.1-jre/api/docs/",
|
||||
+ "https://guava.dev/releases/32.0.1-jre/api/docs/", // Leaf - Bump Dependencies
|
||||
"https://javadoc.io/doc/org.yaml/snakeyaml/2.0/",
|
||||
"https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
|
||||
// Paper start
|
||||
@@ -158,6 +165,9 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.
|
||||
@@ -158,6 +161,9 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.
|
||||
jarToScan.set(tasks.jar.flatMap { it.archiveFile })
|
||||
classpath.from(configurations.compileClasspath)
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Leaf Config
|
||||
|
||||
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index d209ac7c8fe639a23904e4ebd5bade0637fb8eab..d18f72faf22e7cabee833525f08e75012471eed8 100644
|
||||
index d209ac7c8fe639a23904e4ebd5bade0637fb8eab..a043849d4979255fac8d7fcdb925beb81f89983a 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -48,6 +48,13 @@ dependencies {
|
||||
@@ -13,8 +13,8 @@ index d209ac7c8fe639a23904e4ebd5bade0637fb8eab..d18f72faf22e7cabee833525f08e7501
|
||||
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10")
|
||||
|
||||
+ // Pufferfish start
|
||||
+ implementation("org.yaml:snakeyaml:1.33")
|
||||
+ implementation("me.carleslc.Simple-YAML:Simple-Yaml:1.8.3") {
|
||||
+ implementation("org.yaml:snakeyaml:2.0")
|
||||
+ implementation("me.carleslc.Simple-YAML:Simple-Yaml:1.8.4") {
|
||||
+ exclude(group = "org.yaml", module = "snakeyaml")
|
||||
+ }
|
||||
+ // Pufferfish end
|
||||
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
|
||||
|
||||
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index d18f72faf22e7cabee833525f08e75012471eed8..d4593da8d4cf893847705e394264dabf303c7912 100644
|
||||
index a043849d4979255fac8d7fcdb925beb81f89983a..e6b4de522a47797899e977c7aff3c8e017b8cf89 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -16,7 +16,7 @@ dependencies {
|
||||
@@ -17,7 +17,7 @@ index d18f72faf22e7cabee833525f08e75012471eed8..d4593da8d4cf893847705e394264dabf
|
||||
implementation("net.minecrell:terminalconsoleappender:1.3.0")
|
||||
/*
|
||||
Required to add the missing Log4j2Plugins.dat file from log4j-core
|
||||
@@ -24,14 +24,16 @@ dependencies {
|
||||
@@ -24,22 +24,24 @@ dependencies {
|
||||
all its classes to check if they are plugins.
|
||||
Scanning takes about 1-2 seconds so adding this speeds up the server start.
|
||||
*/
|
||||
@@ -27,21 +27,23 @@ index d18f72faf22e7cabee833525f08e75012471eed8..d4593da8d4cf893847705e394264dabf
|
||||
+ // Leaf start - Bump Dependencies
|
||||
+ implementation("org.apache.logging.log4j:log4j-core:2.20.0") // Paper - implementation
|
||||
+ annotationProcessor("org.apache.logging.log4j:log4j-core:2.20.0") // Paper - Needed to generate meta for our Log4j plugins
|
||||
+ implementation("io.netty:netty-codec-haproxy:4.1.91.Final") // Paper - Add support for proxy protocol
|
||||
+ implementation("io.netty:netty-codec-haproxy:4.1.93.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")
|
||||
- implementation("org.ow2.asm:asm-commons:9.4") // Paper - ASM event executor generation
|
||||
- testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito
|
||||
- implementation("org.spongepowered:configurate-yaml:4.1.2") // Paper - config files
|
||||
+ implementation("org.apache.logging.log4j:log4j-iostreams:2.20.0") // Paper - remove exclusion
|
||||
+ implementation("org.ow2.asm:asm:9.5")
|
||||
+ implementation("org.ow2.asm:asm-commons:9.5") // Paper - ASM event executor generation
|
||||
+ testImplementation("org.mockito:mockito-core:5.2.0") // Paper - switch to mockito
|
||||
+ testImplementation("org.mockito:mockito-core:5.3.1") // Paper - switch to mockito
|
||||
+ implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
|
||||
+ // Leaf end
|
||||
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
|
||||
@@ -39,7 +41,7 @@ dependencies {
|
||||
- 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.lmax:disruptor:3.4.4") // Paper
|
||||
// Paper start - Use Velocity cipher
|
||||
@@ -50,25 +52,19 @@ index d18f72faf22e7cabee833525f08e75012471eed8..d4593da8d4cf893847705e394264dabf
|
||||
isTransitive = false
|
||||
}
|
||||
// Paper end
|
||||
@@ -50,16 +52,18 @@ dependencies {
|
||||
|
||||
// Pufferfish start
|
||||
implementation("org.yaml:snakeyaml:1.33")
|
||||
- implementation("me.carleslc.Simple-YAML:Simple-Yaml:1.8.3") {
|
||||
+ // Leaf start - Bump Dependencies
|
||||
+ implementation("me.carleslc.Simple-YAML:Simple-Yaml:1.8.4") {
|
||||
exclude(group = "org.yaml", module = "snakeyaml")
|
||||
@@ -55,11 +57,13 @@ dependencies {
|
||||
}
|
||||
// Pufferfish end
|
||||
|
||||
- testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
|
||||
+ testImplementation("io.github.classgraph:classgraph:4.8.157") // Paper - mob goal test
|
||||
+ // Leaf start - Bump Dependencies
|
||||
+ testImplementation("io.github.classgraph:classgraph:4.8.160") // Paper - mob goal test
|
||||
testImplementation("junit:junit:4.13.2")
|
||||
- testImplementation("org.hamcrest:hamcrest-library:1.3")
|
||||
+ testImplementation("org.hamcrest:hamcrest-library:2.2")
|
||||
+ 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.91.Final"); // Paper - Bump netty
|
||||
+ implementation("io.netty:netty-all:4.1.93.Final"); // Paper - Bump netty
|
||||
+ // Leaf end
|
||||
}
|
||||
|
||||
|
||||
19
patches/server/0028-Fix-compile-error.patch
Normal file
19
patches/server/0028-Fix-compile-error.patch
Normal file
@@ -0,0 +1,19 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
|
||||
Date: Sat, 10 Jun 2023 11:28:24 +0800
|
||||
Subject: [PATCH] Fix compile error
|
||||
|
||||
|
||||
diff --git a/src/main/java/io/papermc/paper/plugin/provider/configuration/serializer/PermissionConfigurationSerializer.java b/src/main/java/io/papermc/paper/plugin/provider/configuration/serializer/PermissionConfigurationSerializer.java
|
||||
index d1088e4b7fa5f8e689f23b150b83645ce1ae5a0e..f951f4024745503e9cdfa7ff17b9313ac6d7b4c4 100644
|
||||
--- a/src/main/java/io/papermc/paper/plugin/provider/configuration/serializer/PermissionConfigurationSerializer.java
|
||||
+++ b/src/main/java/io/papermc/paper/plugin/provider/configuration/serializer/PermissionConfigurationSerializer.java
|
||||
@@ -39,7 +39,7 @@ public class PermissionConfigurationSerializer {
|
||||
try {
|
||||
result.add(Permission.loadPermission(entry.getKey().toString(), (Map<?, ?>) entry.getValue(), permissionDefault, result));
|
||||
} catch (Throwable ex) {
|
||||
- throw new SerializationException(null, "Error loading permission %s".formatted(entry.getKey()), ex);
|
||||
+ throw new SerializationException((Type) null, "Error loading permission %s".formatted(entry.getKey()), ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user