From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Fri, 28 Oct 2022 17:24:16 -0400 Subject: [PATCH] Bump Dependencies TODO - Dreeam: Bump & test dependencies, impl new features? diff --git a/build.gradle.kts b/build.gradle.kts index e8963d72ffbfe1fe6cd5e0d55b06897b7ecac560..391e05b63663331a4404514bdb6ab30707fd8b49 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,8 +12,10 @@ java { 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" +// Leaf start - Bump Dependencies +val slf4jVersion = "2.0.13" +val log4jVersion = "2.23.1" +// Leaf end - Bump Dependencies val apiAndDocs: Configuration by configurations.creating { attributes { attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION)) @@ -29,20 +31,20 @@ configurations.api { dependencies { api("com.mojang:brigadier:1.2.9") // Paper - Brigadier command api // api dependencies are listed transitively to API consumers - api("com.google.guava:guava:32.1.2-jre") - api("com.google.code.gson:gson:2.10.1") + api("com.google.guava:guava:33.2.1-jre") // Leaf - Bump Dependencies + api("com.google.code.gson:gson:2.11.0") // Leaf - Bump Dependencies // Paper start - adventure api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.18") { exclude("com.google.guava", "guava") } // Paper - adventure api("org.yaml:snakeyaml:2.2") - api("org.joml:joml:1.10.5") + api("org.joml:joml:1.10.5") // Leaf - Bump Dependencies // Dreeam TODO - Waiting update to 1.10.7 // Paper start api("com.googlecode.json-simple:json-simple:1.1.1") { isTransitive = false // includes junit } - api("it.unimi.dsi:fastutil:8.5.6") + api("it.unimi.dsi:fastutil:8.5.13") // Leaf - Bump Dependencies apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion")) apiAndDocs("net.kyori:adventure-api") apiAndDocs("net.kyori:adventure-text-minimessage") @@ -52,31 +54,40 @@ dependencies { apiAndDocs("net.kyori:adventure-text-logger-slf4j") api("org.apache.logging.log4j:log4j-api:$log4jVersion") api("org.slf4j:slf4j-api:$slf4jVersion") - api("io.sentry:sentry:5.4.0") // Pufferfish + api("io.sentry:sentry:7.12.0") // Pufferfish // Leaf - Bump Dependencies // Dreeam TODO - Update to 8.0.0 implementation("org.ow2.asm:asm:9.7") implementation("org.ow2.asm:asm-commons:9.7") // 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") + // Leaf start - Bump Dependencies + api("org.apache.maven:maven-resolver-provider:3.9.8") // Paper - make API dependency for Paper Plugins + compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.21") // Dreeam TODO - Update to 2.0.0 + compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.21") + // Leaf end - 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.45.0" // Leaf - Bump Dependencies compileOnlyApi(checkerQual) testCompileOnly(checkerQual) // Paper end - testImplementation("org.apache.commons:commons-lang3:3.12.0") - testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") + // Leaf start - Bump Dependencies + testImplementation("org.apache.commons:commons-lang3:3.15.0") + testImplementation("org.junit.jupiter:junit-jupiter:5.11.0-M2") + // Leaf end - Bump Dependencies testImplementation("org.hamcrest:hamcrest:2.2") - testImplementation("org.mockito:mockito-core:5.11.0") + testImplementation("org.mockito:mockito-core:5.12.0") // Leaf - Bump Dependencies testImplementation("org.ow2.asm:asm-tree:9.7") + + // Leaf - Bump Dependencies + // commons-lang3 is removed in maven-resolver-provider since 3.9.8 + // Add this because bukkit api still need it. + implementation("org.apache.commons:commons-lang3:3.15.0") } // Paper start @@ -164,12 +175,12 @@ tasks.withType { options.use() options.isDocFilesSubDirs = true options.links( - "https://guava.dev/releases/32.1.2-jre/api/docs/", + "https://guava.dev/releases/33.1.0-jre/api/docs/", // Leaf - Bump Dependencies "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.joml/joml/1.10.5/index.html", + "https://javadoc.io/doc/org.joml/joml/latest/index.html", // Leaf - Bump Dependencies "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1", // Paper end // Paper start @@ -181,9 +192,9 @@ tasks.withType { "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", // Leaf - 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.21", // Paper // Leaf - Bump Dependencies ) options.tags("apiNote:a:API Note:") @@ -226,6 +237,11 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks. jarToScan.set(tasks.jar.flatMap { it.archiveFile }) classpath.from(configurations.compileClasspath) } +// Leaf start - Bump Dependencies +repositories { + mavenCentral() +} +// Leaf end - Bump Dependencies tasks.check { dependsOn(scanJar) }