mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-19 15:09:25 +00:00
111 lines
4.7 KiB
Diff
111 lines
4.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
|
|
Date: Fri, 28 Oct 2022 17:24:16 -0400
|
|
Subject: [PATCH] Bump Dependencies
|
|
|
|
|
|
diff --git a/build.gradle.kts b/build.gradle.kts
|
|
index 0d9531a62d7667b98a57bd6b8e627a3e2f105001..bd863ad35b4ed1da320ab6276ebedbaf52ab2d67 100644
|
|
--- a/build.gradle.kts
|
|
+++ b/build.gradle.kts
|
|
@@ -9,11 +9,11 @@ java {
|
|
withJavadocJar()
|
|
}
|
|
|
|
-val annotationsVersion = "24.0.1"
|
|
+val annotationsVersion = "24.1.0" // Leaf - Bump Dependencies
|
|
val bungeeCordChatVersion = "1.20-R0.1"
|
|
val adventureVersion = "4.15.0"
|
|
-val slf4jVersion = "2.0.9"
|
|
-val log4jVersion = "2.17.1"
|
|
+val slf4jVersion = "2.0.11"
|
|
+val log4jVersion = "2.22.1" // Leaf - Bump Dependencies
|
|
val apiAndDocs: Configuration by configurations.creating {
|
|
attributes {
|
|
attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
|
|
@@ -28,7 +28,7 @@ configurations.api {
|
|
|
|
dependencies {
|
|
// api dependencies are listed transitively to API consumers
|
|
- api("com.google.guava:guava:32.1.2-jre")
|
|
+ api("com.google.guava:guava:33.0.0-jre") // Leaf - Bump Dependencies
|
|
api("com.google.code.gson:gson:2.10.1")
|
|
// Paper start - adventure
|
|
api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.14") {
|
|
@@ -41,7 +41,7 @@ dependencies {
|
|
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.12") // Leaf - Bump Dependencies
|
|
apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
|
|
apiAndDocs("net.kyori:adventure-api")
|
|
apiAndDocs("net.kyori:adventure-text-minimessage")
|
|
@@ -53,11 +53,12 @@ dependencies {
|
|
api("org.slf4j:slf4j-api:$slf4jVersion")
|
|
api("io.sentry:sentry:7.2.0") // Pufferfish
|
|
|
|
- implementation("org.ow2.asm:asm:9.5")
|
|
- implementation("org.ow2.asm:asm-commons:9.5")
|
|
+ // Leaf start - Bump Dependencies
|
|
+ implementation("org.ow2.asm:asm:9.6")
|
|
+ implementation("org.ow2.asm:asm-commons:9.6")
|
|
// Paper end
|
|
|
|
- api("org.apache.maven:maven-resolver-provider:3.9.6") // Paper - make API dependency for Paper Plugins
|
|
+ api("org.apache.maven:maven-resolver-provider:3.9.6")
|
|
compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
|
|
compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
|
|
|
|
@@ -66,16 +67,17 @@ dependencies {
|
|
testCompileOnly(annotations)
|
|
|
|
// Paper start - add checker
|
|
- val checkerQual = "org.checkerframework:checker-qual:3.33.0"
|
|
+ val checkerQual = "org.checkerframework:checker-qual:3.42.0" // Leaf - Bump Dependencies
|
|
compileOnlyApi(checkerQual)
|
|
testCompileOnly(checkerQual)
|
|
// Paper end
|
|
|
|
- testImplementation("org.apache.commons:commons-lang3:3.12.0")
|
|
- testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
|
|
+ testImplementation("org.apache.commons:commons-lang3:3.14.0")
|
|
+ testImplementation("org.junit.jupiter:junit-jupiter:5.10.1")
|
|
testImplementation("org.hamcrest:hamcrest:2.2")
|
|
- testImplementation("org.mockito:mockito-core:5.5.0")
|
|
- testImplementation("org.ow2.asm:asm-tree:9.5")
|
|
+ testImplementation("org.mockito:mockito-core:5.8.0")
|
|
+ testImplementation("org.ow2.asm:asm-tree:9.6")
|
|
+ // Leaf end
|
|
}
|
|
|
|
// Paper start
|
|
@@ -143,7 +145,7 @@ tasks.withType<Javadoc> {
|
|
options.use()
|
|
options.isDocFilesSubDirs = true
|
|
options.links(
|
|
- "https://guava.dev/releases/32.1.2-jre/api/docs/",
|
|
+ "https://guava.dev/releases/33.0.0-jre/api/docs/", // Leaf - Bump Dependencies
|
|
"https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
|
|
"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
|
|
@@ -161,7 +163,7 @@ tasks.withType<Javadoc> {
|
|
"https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
|
|
"https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/",
|
|
// Paper end
|
|
- "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3", // Paper
|
|
+ "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.9.18", // Paper // Leaf - Bump Dependencies
|
|
)
|
|
options.tags("apiNote:a:API Note:")
|
|
|
|
@@ -204,6 +206,9 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.
|
|
jarToScan.set(tasks.jar.flatMap { it.archiveFile })
|
|
classpath.from(configurations.compileClasspath)
|
|
}
|
|
+repositories {
|
|
+ mavenCentral()
|
|
+}
|
|
tasks.check {
|
|
dependsOn(scanJar)
|
|
}
|