mirror of
https://github.com/BX-Team/DivineMC.git
synced 2025-12-23 00:39:16 +00:00
Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@b3709b1 Updated Upstream (Paper)
110 lines
5.4 KiB
Diff
110 lines
5.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
|
|
Date: Thu, 11 Jul 2024 18:55:47 +0300
|
|
Subject: [PATCH] Bump Dependencies
|
|
|
|
|
|
diff --git a/build.gradle.kts b/build.gradle.kts
|
|
index 9b9eafd38572317816553646ea38d0057a8c22fa..b2e5080e20df5b394b337118bb952d74447b86f7 100644
|
|
--- a/build.gradle.kts
|
|
+++ b/build.gradle.kts
|
|
@@ -12,8 +12,8 @@ java {
|
|
val annotationsVersion = "24.1.0"
|
|
val bungeeCordChatVersion = "1.20-R0.2"
|
|
val adventureVersion = "4.17.0"
|
|
-val slf4jVersion = "2.0.9"
|
|
-val log4jVersion = "2.17.1"
|
|
+val slf4jVersion = "2.0.13" // DivineMC - Bump Dependencies
|
|
+val log4jVersion = "2.23.1" // DivineMC - Bump Dependencies
|
|
val apiAndDocs: Configuration by configurations.creating {
|
|
attributes {
|
|
attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
|
|
@@ -26,11 +26,17 @@ configurations.api {
|
|
extendsFrom(apiAndDocs)
|
|
}
|
|
|
|
+// DivineMC start - Bump Dependencies
|
|
+repositories {
|
|
+ mavenCentral()
|
|
+}
|
|
+// DivineMC end
|
|
+
|
|
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.2.1-jre") // DivineMC - Bump Dependencies
|
|
+ api("com.google.code.gson:gson:2.11.0") // DivineMC - Bump Dependencies
|
|
// Paper start - adventure
|
|
api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.18") {
|
|
exclude("com.google.guava", "guava")
|
|
@@ -42,7 +48,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.13") // DivineMC - Bump Dependencies
|
|
apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
|
|
apiAndDocs("net.kyori:adventure-api")
|
|
apiAndDocs("net.kyori:adventure-text-minimessage")
|
|
@@ -57,24 +63,24 @@ dependencies {
|
|
implementation("org.ow2.asm:asm-commons:9.7")
|
|
// 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")
|
|
+ api("org.apache.maven:maven-resolver-provider:3.9.7") // Paper - make API dependency for Paper Plugins // DivineMC - Bump Dependencies
|
|
+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.20") // DivineMC - Bump Dependencies
|
|
+ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.20") // DivineMC - 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.44.0" // DivineMC - 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.2")
|
|
+ testImplementation("org.apache.commons:commons-lang3:3.14.0") // DivineMC - Bump Dependencies
|
|
+ testImplementation("org.junit.jupiter:junit-jupiter:5.11.0-M2") // DivineMC - Bump Dependencies
|
|
testImplementation("org.hamcrest:hamcrest:2.2")
|
|
- testImplementation("org.mockito:mockito-core:5.11.0")
|
|
+ testImplementation("org.mockito:mockito-core:5.12.0") // DivineMC - Bump Dependencies
|
|
testImplementation("org.ow2.asm:asm-tree:9.7")
|
|
}
|
|
|
|
@@ -149,12 +155,12 @@ 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.1.0-jre/api/docs/", // DivineMC - 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
|
|
// Paper start - add missing javadoc links
|
|
- "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html",
|
|
+ "https://javadoc.io/doc/org.joml/joml/latest/index.html", // DivineMC - Bump Dependencies
|
|
"https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1",
|
|
// Paper end
|
|
// Paper start
|
|
@@ -166,9 +172,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", // DivineMC - 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.19", // Paper // DivineMC - Bump Dependencies
|
|
)
|
|
options.tags("apiNote:a:API Note:")
|
|
|