mirror of
https://github.com/BX-Team/DivineMC.git
synced 2025-12-19 14:59:25 +00:00
d39afc08ca
Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@2af2e71 Updated Upstream (Paper) PurpurMC/Purpur@ffeb49d ignore `item_model` component for don't run with scissors feature alongside `custom_model_data` component
82 lines
4.1 KiB
Diff
82 lines
4.1 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 95af32719a74893b0c0c7f20f178f222f8d24777..d6deb2136e314f9e9d66123ab4aaa60342156d3a 100644
|
|
--- a/build.gradle.kts
|
|
+++ b/build.gradle.kts
|
|
@@ -9,11 +9,17 @@ java {
|
|
withJavadocJar()
|
|
}
|
|
|
|
+// DivineMC start - Bump Dependencies
|
|
+repositories {
|
|
+ mavenCentral()
|
|
+}
|
|
+// DivineMC end
|
|
+
|
|
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))
|
|
@@ -72,23 +78,23 @@ dependencies {
|
|
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")
|
|
+ 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
|
|
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.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.14.1")
|
|
testImplementation("org.ow2.asm:asm-tree:9.7.1")
|
|
@@ -182,7 +188,7 @@ tasks.withType<Javadoc> {
|
|
"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.8/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.11.0",
|
|
"https://jspecify.dev/docs/api/",
|
|
// Paper end
|
|
@@ -195,9 +201,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:")
|
|
|