diff --git a/paper-api/build.gradle.kts b/paper-api/build.gradle.kts index 849380593c..82d3005910 100644 --- a/paper-api/build.gradle.kts +++ b/paper-api/build.gradle.kts @@ -11,8 +11,7 @@ java { val annotationsVersion = "26.0.2" // Keep in sync with paper-server adventure-text-serializer-ansi dep -val adventureVersion = "4.21.0-mc1215-SNAPSHOT" // FIXME move to release asap -val adventureJavadocVersion = "4.20.0" // Fixme remove me +val adventureVersion = "4.21.0" val bungeeCordChatVersion = "1.21-R0.2-deprecated+build.21" val slf4jVersion = "2.0.16" val log4jVersion = "2.24.1" @@ -58,15 +57,13 @@ dependencies { exclude("com.google.guava", "guava") } - // FIXME remove me when we are using a release again - val adventureGroup = "io.papermc.adventure" - apiAndDocs(platform("$adventureGroup:adventure-bom:$adventureVersion")) - apiAndDocs("$adventureGroup:adventure-api") - apiAndDocs("$adventureGroup:adventure-text-minimessage") - apiAndDocs("$adventureGroup:adventure-text-serializer-gson") - apiAndDocs("$adventureGroup:adventure-text-serializer-legacy") - apiAndDocs("$adventureGroup:adventure-text-serializer-plain") - apiAndDocs("$adventureGroup:adventure-text-logger-slf4j") + apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion")) + apiAndDocs("net.kyori:adventure-api") + apiAndDocs("net.kyori:adventure-text-minimessage") + apiAndDocs("net.kyori:adventure-text-serializer-gson") + apiAndDocs("net.kyori:adventure-text-serializer-legacy") + apiAndDocs("net.kyori:adventure-text-serializer-plain") + apiAndDocs("net.kyori:adventure-text-logger-slf4j") api("org.apache.maven:maven-resolver-provider:3.9.6") // make API dependency for Paper Plugins compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18") @@ -179,13 +176,13 @@ tasks.withType { "https://javadoc.io/doc/org.joml/joml/1.10.8/", "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0", "https://jspecify.dev/docs/api/", - "https://jd.advntr.dev/api/$adventureJavadocVersion/", - "https://jd.advntr.dev/key/$adventureJavadocVersion/", - "https://jd.advntr.dev/text-minimessage/$adventureJavadocVersion/", - "https://jd.advntr.dev/text-serializer-gson/$adventureJavadocVersion/", - "https://jd.advntr.dev/text-serializer-legacy/$adventureJavadocVersion/", - "https://jd.advntr.dev/text-serializer-plain/$adventureJavadocVersion/", - "https://jd.advntr.dev/text-logger-slf4j/$adventureJavadocVersion/", + "https://jd.advntr.dev/api/$adventureVersion/", + "https://jd.advntr.dev/key/$adventureVersion/", + "https://jd.advntr.dev/text-minimessage/$adventureVersion/", + "https://jd.advntr.dev/text-serializer-gson/$adventureVersion/", + "https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/", + "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://logging.apache.org/log4j/2.x/javadoc/log4j-api/", "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3", diff --git a/paper-server/build.gradle.kts b/paper-server/build.gradle.kts index bce275705d..4591bd259c 100644 --- a/paper-server/build.gradle.kts +++ b/paper-server/build.gradle.kts @@ -135,7 +135,7 @@ dependencies { implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21 implementation("net.minecrell:terminalconsoleappender:1.3.0") - implementation("io.papermc.adventure:adventure-text-serializer-ansi:4.21.0-mc1215-SNAPSHOT") // Keep in sync with adventureVersion from Paper-API build file // FIXME back to release + implementation("net.kyori:adventure-text-serializer-ansi:4.21.0") // Keep in sync with adventureVersion from Paper-API build file runtimeConfiguration(sourceSets.main.map { it.runtimeClasspath }) /*