Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-04 15:41:40 +00:00
Code Issues Releases Activity

Update dependencies

Browse Source
This commit is contained in:
Dreeam
2023-06-10 11:33:24 +08:00
parent 5d4f74ba00
commit f7b108df63
5 changed files with 55 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/api/0001-Pufferfish-Sentry.patch
View File

@@ -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")

34
patches/api/0003-Bump-Dependencies.patch
View File

@@ -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)
}