mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-21 16:09:19 +00:00
147 lines
6.8 KiB
Diff
147 lines
6.8 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 1cc87374beed7b4a2cfdd278b076e20b1e9febc8..336b6891d246a43f8fb66bdcda04c565cc925c7e 100644
|
|
--- a/build.gradle.kts
|
|
+++ b/build.gradle.kts
|
|
@@ -9,11 +9,13 @@ java {
|
|
withJavadocJar()
|
|
}
|
|
|
|
-val annotationsVersion = "24.1.0"
|
|
+val annotationsVersion = "26.0.1" // Leaf - Bump Dependencies
|
|
val bungeeCordChatVersion = "1.20-R0.2"
|
|
val adventureVersion = "4.17.0"
|
|
-val slf4jVersion = "2.0.9"
|
|
-val log4jVersion = "2.17.1"
|
|
+// Leaf start - Bump Dependencies
|
|
+val slf4jVersion = "2.0.16"
|
|
+val log4jVersion = "2.24.1"
|
|
+// Leaf end - Bump Dependencies
|
|
val apiAndDocs: Configuration by configurations.creating {
|
|
attributes {
|
|
attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
|
|
@@ -29,20 +31,20 @@ configurations.api {
|
|
dependencies {
|
|
api("com.mojang:brigadier:1.2.9") // Paper - Brigadier command api
|
|
// api dependencies are listed transitively to API consumers
|
|
- api("com.google.guava:guava:32.1.2-jre")
|
|
- api("com.google.code.gson:gson:2.10.1")
|
|
+ api("com.google.guava:guava:33.3.1-jre") // Leaf - Bump Dependencies
|
|
+ api("com.google.code.gson:gson:2.11.0") // Leaf - Bump Dependencies
|
|
// Paper start - adventure
|
|
api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.18") {
|
|
exclude("com.google.guava", "guava")
|
|
}
|
|
// Paper - adventure
|
|
- api("org.yaml:snakeyaml:2.2")
|
|
- api("org.joml:joml:1.10.5")
|
|
+ api("org.yaml:snakeyaml:2.3")
|
|
+ api("org.joml:joml:1.10.5") // Leaf - Bump Dependencies // Dreeam TODO - Waiting update to 1.10.8, Dont bump
|
|
// 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.15") // Leaf - Bump Dependencies
|
|
apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
|
|
apiAndDocs("net.kyori:adventure-api")
|
|
apiAndDocs("net.kyori:adventure-text-minimessage")
|
|
@@ -52,32 +54,41 @@ 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:5.4.0") // Pufferfish
|
|
+ api("io.sentry:sentry:8.0.0-beta.1") // Pufferfish // Leaf - Bump Dependencies
|
|
|
|
implementation("org.ow2.asm:asm:9.7.1")
|
|
implementation("org.ow2.asm:asm-commons:9.7.1")
|
|
// Paper end
|
|
|
|
- api("org.apache.maven:maven-resolver-provider:3.9.6") // Paper - make API dependency for Paper Plugins
|
|
- compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
|
|
- compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
|
|
+ // Leaf start - Bump Dependencies
|
|
+ api("org.apache.maven:maven-resolver-provider:3.9.9") // Paper - make API dependency for Paper Plugins
|
|
+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.22") // Dreeam TODO - Update to 2.0.1
|
|
+ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.22") // Dreeam TODO - Update to 2.0.1
|
|
+ // Leaf end - Bump Dependencies
|
|
|
|
val annotations = "org.jetbrains:annotations:$annotationsVersion" // Paper - we don't want Java 5 annotations...
|
|
compileOnly(annotations)
|
|
testCompileOnly(annotations)
|
|
|
|
// Paper start - add checker
|
|
- val checkerQual = "org.checkerframework:checker-qual:3.33.0"
|
|
+ val checkerQual = "org.checkerframework:checker-qual:3.48.1" // Leaf - Bump Dependencies
|
|
compileOnlyApi(checkerQual)
|
|
testCompileOnly(checkerQual)
|
|
// Paper end
|
|
api("org.jspecify:jspecify:1.0.0") // Paper - add jspecify
|
|
|
|
- testImplementation("org.apache.commons:commons-lang3:3.12.0")
|
|
- testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
|
|
- testImplementation("org.hamcrest:hamcrest:2.2")
|
|
- testImplementation("org.mockito:mockito-core:5.14.1")
|
|
+ // Leaf start - Bump Dependencies
|
|
+ testImplementation("org.apache.commons:commons-lang3:3.17.0")
|
|
+ testImplementation("org.junit.jupiter:junit-jupiter:5.11.3")
|
|
+ testImplementation("org.hamcrest:hamcrest:3.0")
|
|
+ testImplementation("org.mockito:mockito-core:5.14.2")
|
|
+ // Leaf end - Bump Dependencies
|
|
testImplementation("org.ow2.asm:asm-tree:9.7.1")
|
|
+
|
|
+ // Leaf - Bump Dependencies
|
|
+ // commons-lang3 is removed in maven-resolver-provider since 3.9.8
|
|
+ // Add this because bukkit api still need it.
|
|
+ compileOnly("org.apache.commons:commons-lang3:3.17.0")
|
|
}
|
|
|
|
// Paper start
|
|
@@ -165,13 +176,13 @@ tasks.withType<Javadoc> {
|
|
options.use()
|
|
options.isDocFilesSubDirs = true
|
|
options.links(
|
|
- "https://guava.dev/releases/32.1.2-jre/api/docs/",
|
|
- "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
|
|
+ "https://guava.dev/releases/33.3.1-jre/api/docs/", // Leaf - Bump Dependencies
|
|
+ "https://javadoc.io/doc/org.yaml/snakeyaml/2.3/", // Leaf - Bump Dependencies
|
|
"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
|
|
// Paper start - add missing javadoc links
|
|
- "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html",
|
|
- "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1",
|
|
+ "https://javadoc.io/doc/org.joml/joml/latest/index.html", // Leaf - Bump Dependencies
|
|
+ "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0",
|
|
"https://jspecify.dev/docs/api/",
|
|
// Paper end
|
|
// Paper start
|
|
@@ -183,9 +194,9 @@ tasks.withType<Javadoc> {
|
|
"https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
|
|
"https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
|
|
"https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
|
|
- "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/",
|
|
+ "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/2.20.0", // Leaf - Bump Dependencies
|
|
// 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.22", // Paper // Leaf - Bump Dependencies
|
|
)
|
|
options.tags("apiNote:a:API Note:")
|
|
|
|
@@ -228,6 +239,11 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.
|
|
jarToScan.set(tasks.jar.flatMap { it.archiveFile })
|
|
classpath.from(configurations.compileClasspath)
|
|
}
|
|
+// Leaf start - Bump Dependencies
|
|
+repositories {
|
|
+ mavenCentral()
|
|
+}
|
|
+// Leaf end - Bump Dependencies
|
|
tasks.check {
|
|
dependsOn(scanJar)
|
|
}
|