--- a/gale-api/build.gradle.kts +++ b/gale-api/build.gradle.kts @@ -12,8 +_,10 @@ val annotationsVersion = "26.0.1" val bungeeCordChatVersion = "1.20-R0.2" val adventureVersion = "4.18.0" -val slf4jVersion = "2.0.9" -val log4jVersion = "2.17.1" +// Leaf start - Bump Dependencies +val slf4jVersion = "2.0.16" +val log4jVersion = "2.24.3" +// Leaf end - Bump Dependencies val apiAndDocs: Configuration by configurations.creating { attributes { @@ -41,9 +_,9 @@ dependencies { // api dependencies are listed transitively to API consumers - api("com.google.guava:guava:33.3.1-jre") + api("com.google.guava:guava:33.4.0-jre") // Leaf - Bump Dependencies api("com.google.code.gson:gson:2.11.0") - api("org.yaml:snakeyaml:2.2") + api("org.yaml:snakeyaml:2.3") // Leaf - Bump Dependencies api("org.joml:joml:1.10.8") { isTransitive = false // https://github.com/JOML-CI/JOML/issues/352 } @@ -54,6 +_,7 @@ api("org.apache.logging.log4j:log4j-api:$log4jVersion") api("org.slf4j:slf4j-api:$slf4jVersion") api("com.mojang:brigadier:1.3.10") + api("io.sentry:sentry:8.0.0-rc.3") // Pufferfish // Deprecate bungeecord-chat in favor of adventure api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.19") { @@ -68,29 +_,39 @@ 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") - compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18") + // Leaf start - Bump Dependencies + api("org.apache.maven:maven-resolver-provider:3.9.9") // make API dependency for Paper Plugins + compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.22") // Dreeam TODO - Update to 2.0.1 + compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.22") // Dreeam TODO - Update to 2.0.1 + // Leaf start - Bump Dependencies // Annotations - Slowly migrate to jspecify val annotations = "org.jetbrains:annotations:$annotationsVersion" compileOnly(annotations) testCompileOnly(annotations) - val checkerQual = "org.checkerframework:checker-qual:3.33.0" + val checkerQual = "org.checkerframework:checker-qual:3.48.4" // Leaf - Bump Dependencies compileOnlyApi(checkerQual) testCompileOnly(checkerQual) 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") + // Leaf start - Bump Dependencies + testImplementation("org.apache.commons:commons-lang3:3.17.0") + testImplementation("org.junit.jupiter:junit-jupiter:5.11.4") + testImplementation("org.hamcrest:hamcrest:3.0") + testImplementation("org.mockito:mockito-core:5.15.2") + // Leaf end - Bump Dependencies testImplementation("org.ow2.asm:asm-tree:9.7.1") - mockitoAgent("org.mockito:mockito-core:5.14.1") { isTransitive = false } // configure mockito agent that is needed in newer java versions + mockitoAgent("org.mockito:mockito-core:5.15.2") { isTransitive = false } // configure mockito agent that is needed in newer java versions // Leaf - Bump Dependencies testRuntimeOnly("org.junit.platform:junit-platform-launcher") + + // Leaf start - Bump Dependencies + // commons-lang3 is removed in maven-resolver-provider since 3.9.8 + // Add this because bukkit api still need it. + compileOnly("org.apache.commons:commons-lang3:3.17.0") + // Leaf end - Bump Dependencies } val generatedApiPath: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath() // Gale - project setup @@ -105,17 +_,21 @@ srcDir(generatedApiPath) // Gale start - project setup srcDir(file("../paper-api/src/main/java")) + srcDir(file("../gale-api/src/main/java")) // Leaf - project setup } resources { srcDir(file("../paper-api/src/main/resources")) + srcDir(file("../gale-api/src/main/resources")) // Leaf - project setup } } test { java { srcDir(file("../paper-api/src/test/java")) + srcDir(file("../gale-api/src/test/java")) // Leaf - project setup } resources { srcDir(file("../paper-api/src/test/resources")) + srcDir(file("../gale-api/src/test/resources")) // Leaf - project setup // Gale end - project setup } } @@ -203,8 +_,8 @@ options.use() options.isDocFilesSubDirs = true options.links( - "https://guava.dev/releases/33.3.1-jre/api/docs/", - "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/", + "https://guava.dev/releases/33.4.0-jre/api/docs/", // Leaf - Bump Dependencies + "https://javadoc.io/doc/org.yaml/snakeyaml/2.3/", // Leaf - Bump Dependencies "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", "https://javadoc.io/doc/org.joml/joml/1.10.8/", "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0", @@ -217,8 +_,8 @@ "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.maven.resolver/maven-resolver-api/1.7.3", + "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/2.20.0/", // Leaf - Bump Dependencies + "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.9.22", // Leaf - Bump Dependencies ) options.tags("apiNote:a:API Note:") @@ -276,6 +_,11 @@ jarToScan.set(tasks.jar.flatMap { it.archiveFile }) classpath.from(configurations.compileClasspath) } +// Leaf start - Bump Dependencies +repositories { + mavenCentral() +} +// Leaf end - Bump Dependencies tasks.check { dependsOn(scanJarForOldGeneratedCode) }