diff options
Diffstat (limited to 'paper-api')
| -rw-r--r-- | paper-api/build.gradle.kts | 68 |
1 files changed, 28 insertions, 40 deletions
diff --git a/paper-api/build.gradle.kts b/paper-api/build.gradle.kts index 7dd682b4b9..9a03c630be 100644 --- a/paper-api/build.gradle.kts +++ b/paper-api/build.gradle.kts @@ -1,7 +1,7 @@ plugins { `java-library` `maven-publish` - idea // Paper + idea } java { @@ -14,6 +14,7 @@ val bungeeCordChatVersion = "1.20-R0.2" val adventureVersion = "4.17.0" val slf4jVersion = "2.0.9" val log4jVersion = "2.17.1" + val apiAndDocs: Configuration by configurations.creating { attributes { attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION)) @@ -26,7 +27,7 @@ configurations.api { extendsFrom(apiAndDocs) } -// Paper start - configure mockito agent that is needed in newer java versions +// Configure mockito agent that is needed in newer Java versions val mockitoAgent = configurations.register("mockitoAgent") abstract class MockitoAgentProvider : CommandLineArgumentProvider { @get:CompileClasspath @@ -36,27 +37,29 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider { return listOf("-javaagent:" + fileCollection.files.single().absolutePath) } } -// Paper end - configure mockito agent that is needed in newer java versions dependencies { - api("com.mojang:brigadier:1.3.10") // Paper - Brigadier command api + // api dependencies are listed transitively to API consumers api("com.google.guava:guava:33.3.1-jre") api("com.google.code.gson:gson:2.11.0") - // Paper start - adventure - api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.19") { - exclude("com.google.guava", "guava") - } - // Paper - adventure api("org.yaml:snakeyaml:2.2") api("org.joml:joml:1.10.8") { isTransitive = false // https://github.com/JOML-CI/JOML/issues/352 } - // Paper start api("com.googlecode.json-simple:json-simple:1.1.1") { isTransitive = false // includes junit } api("it.unimi.dsi:fastutil:8.5.15") + api("org.apache.logging.log4j:log4j-api:$log4jVersion") + api("org.slf4j:slf4j-api:$slf4jVersion") + api("com.mojang:brigadier:1.3.10") + + // Deprecate bungeecord-chat in favor of adventure + api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.19") { + exclude("com.google.guava", "guava") + } + apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion")) apiAndDocs("net.kyori:adventure-api") apiAndDocs("net.kyori:adventure-text-minimessage") @@ -64,38 +67,35 @@ dependencies { apiAndDocs("net.kyori:adventure-text-serializer-legacy") apiAndDocs("net.kyori:adventure-text-serializer-plain") apiAndDocs("net.kyori:adventure-text-logger-slf4j") - api("org.apache.logging.log4j:log4j-api:$log4jVersion") - api("org.slf4j:slf4j-api:$slf4jVersion") 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 + 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") compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18") - val annotations = "org.jetbrains:annotations:$annotationsVersion" // Paper - we don't want Java 5 annotations... + // Annotations - Slowly migrate to jspecify + val annotations = "org.jetbrains:annotations:$annotationsVersion" compileOnly(annotations) testCompileOnly(annotations) - // Paper start - add checker val checkerQual = "org.checkerframework:checker-qual:3.33.0" compileOnlyApi(checkerQual) testCompileOnly(checkerQual) - // Paper end - api("org.jspecify:jspecify:1.0.0") // Paper - add jspecify + api("org.jspecify:jspecify:1.0.0") + + // Test dependencies 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") testImplementation("org.ow2.asm:asm-tree:9.7.1") - mockitoAgent("org.mockito:mockito-core:5.14.1") { isTransitive = false } // Paper - configure mockito agent that is needed in newer java versions + mockitoAgent("org.mockito:mockito-core:5.14.1") { isTransitive = false } // configure mockito agent that is needed in newer java versions testRuntimeOnly("org.junit.platform:junit-platform-launcher") } -// Paper start val generatedApiPath: java.nio.file.Path = rootProject.projectDir.toPath().resolve("paper-api-generator/generated") idea { module { @@ -109,8 +109,7 @@ sourceSets { } } } -// Paper end -// Paper start - brigadier API + val outgoingVariants = arrayOf("runtimeElements", "apiElements", "sourcesElements", "javadocElements") val mainCapability = "${project.group}:${project.name}:${project.version}" configurations { @@ -133,15 +132,13 @@ configurations { } } } -// Paper end configure<PublishingExtension> { publications.create<MavenPublication>("maven") { - // Paper start - brigadier API + // For Brigadier API outgoingVariants.forEach { suppressPomMetadataWarningsFor(it) } - // Paper end from(components["java"]) } } @@ -181,14 +178,10 @@ tasks.withType<Javadoc> { options.links( "https://guava.dev/releases/33.3.1-jre/api/docs/", "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.jetbrains/annotations/$annotationsVersion/", "https://javadoc.io/doc/org.joml/joml/1.10.8/index.html", "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0", "https://jspecify.dev/docs/api/", - // Paper end - // Paper start "https://jd.advntr.dev/api/$adventureVersion/", "https://jd.advntr.dev/key/$adventureVersion/", "https://jd.advntr.dev/text-minimessage/$adventureVersion/", @@ -198,8 +191,7 @@ tasks.withType<Javadoc> { "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/", - // 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.7.3", ) options.tags("apiNote:a:API Note:") @@ -227,20 +219,18 @@ tasks.withType<Javadoc> { tasks.test { useJUnitPlatform() - // Paper start - configure mockito agent that is needed in newer java versions + + // configure mockito agent that is needed in newer java versions val provider = objects.newInstance<MockitoAgentProvider>() provider.fileCollection.from(mockitoAgent) jvmArgumentProviders.add(provider) - // Paper end - configure mockito agent that is needed in newer java versions } -// Paper start - compile tests with -parameters for better junit parameterized test names +// Compile tests with -parameters for better junit parameterized test names tasks.compileTestJava { options.compilerArgs.add("-parameters") } -// Paper end -// Paper start val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.ScanJarForBadCalls::class) { badAnnotations.add("Lio/papermc/paper/annotation/DoNotUse;") jarToScan.set(tasks.jar.flatMap { it.archiveFile }) @@ -249,8 +239,7 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks. tasks.check { dependsOn(scanJar) } -// Paper end -// Paper start + val scanJarForOldGeneratedCode = tasks.register("scanJarForOldGeneratedCode", io.papermc.paperweight.tasks.ScanJarForOldGeneratedCode::class) { mcVersion.set(providers.gradleProperty("mcVersion")) annotation.set("Lio/papermc/paper/generated/GeneratedFrom;") @@ -260,4 +249,3 @@ val scanJarForOldGeneratedCode = tasks.register("scanJarForOldGeneratedCode", io tasks.check { dependsOn(scanJarForOldGeneratedCode) } -// Paper end |