Update Paper upstream to 26.3
This commit is contained in:
@@ -26,17 +26,17 @@ paperCheckstyle {
|
||||
}
|
||||
*/
|
||||
|
||||
val annotationsVersion = "26.0.2"
|
||||
val annotationsVersion = "26.1.0"
|
||||
val adventureVersion = "5.2.0"
|
||||
val bungeeCordChatVersion = "1.21-R0.2-deprecated+build.21"
|
||||
val slf4jVersion = "2.0.17"
|
||||
val log4jVersion = "2.26.0"
|
||||
|
||||
val apiAndDocs: Configuration by configurations.creating
|
||||
val apiAndDocs: Configuration = configurations.create("apiAndDocs")
|
||||
configurations.api {
|
||||
extendsFrom(apiAndDocs)
|
||||
}
|
||||
val javadocSourcepath: Configuration by configurations.creating {
|
||||
val javadocSourcepath: Configuration = configurations.create("javadocSourcepath") {
|
||||
attributes {
|
||||
attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
|
||||
attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL))
|
||||
@@ -61,13 +61,11 @@ dependencies {
|
||||
api("com.google.guava:guava:33.6.0-jre")
|
||||
api("com.google.code.gson:gson:2.14.0")
|
||||
api("org.yaml:snakeyaml:2.2")
|
||||
api("org.joml:joml:1.10.8") {
|
||||
isTransitive = false // https://github.com/JOML-CI/JOML/issues/352
|
||||
}
|
||||
api("org.joml:joml:1.10.9")
|
||||
api("it.unimi.dsi:fastutil:8.5.18")
|
||||
api("org.apache.logging.log4j:log4j-api:$log4jVersion")
|
||||
api("org.slf4j:slf4j-api:$slf4jVersion")
|
||||
api("com.mojang:brigadier:1.3.10")
|
||||
api("com.mojang:brigadier:1.3.11")
|
||||
|
||||
// Deprecate bungeecord-chat in favor of adventure
|
||||
api("net.md-5:bungeecord-chat:$bungeeCordChatVersion") {
|
||||
@@ -93,7 +91,7 @@ dependencies {
|
||||
testCompileOnly(annotations)
|
||||
javadocSourcepath(annotations) // For adventure-api module requirements
|
||||
|
||||
val checkerQual = "org.checkerframework:checker-qual:3.49.2"
|
||||
val checkerQual = "org.checkerframework:checker-qual:4.2.3"
|
||||
compileOnlyApi(checkerQual)
|
||||
testCompileOnly(checkerQual)
|
||||
|
||||
@@ -223,7 +221,7 @@ tasks.withType<Javadoc>().configureEach {
|
||||
"https://guava.dev/releases/33.6.0-jre/api/docs/",
|
||||
"https://www.javadocs.dev/org.yaml/snakeyaml/2.2/",
|
||||
"https://www.javadocs.dev/org.jetbrains/annotations/$annotationsVersion/",
|
||||
"https://www.javadocs.dev/org.joml/joml/1.10.8/",
|
||||
"https://www.javadocs.dev/org.joml/joml/1.10.9/",
|
||||
"https://www.javadocs.dev/com.google.code.gson/gson/2.14.0",
|
||||
"https://jspecify.dev/docs/api/",
|
||||
"https://jd.papermc.io/adventure/$adventureVersion/",
|
||||
@@ -269,7 +267,7 @@ tasks.compileTestJava {
|
||||
options.compilerArgs.add("-parameters")
|
||||
}
|
||||
|
||||
val scanJarForBadCalls by tasks.registering(io.papermc.paperweight.tasks.ScanJarForBadCalls::class) {
|
||||
val scanJarForBadCalls = tasks.register<io.papermc.paperweight.tasks.ScanJarForBadCalls>("scanJarForBadCalls") {
|
||||
badAnnotations.add("Lio/papermc/paper/annotation/DoNotUse;")
|
||||
jarToScan.set(tasks.jar.flatMap { it.archiveFile })
|
||||
classpath.from(configurations.compileClasspath)
|
||||
|
||||
Reference in New Issue
Block a user