9
0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-06 15:51:31 +00:00

Bump Gradle & dependencies

Nils Hoffmann - Next Life
Genre: Melodic House
This commit is contained in:
Dreeam
2025-11-02 13:12:28 -05:00
parent 17952bb013
commit b3248c0710
8 changed files with 95 additions and 67 deletions

View File

@@ -76,28 +76,28 @@
+ implementation("com.github.thatsmusic99:ConfigurationMaster-API:v2.0.0-rc.3") { // Leaf config
+ exclude(group = "org.yaml", module = "snakeyaml")
+ }
+ implementation("com.github.luben:zstd-jni:1.5.7-3") // LinearPaper
+ implementation("org.lz4:lz4-java:1.8.0") // LinearPaper
+ implementation("com.github.ben-manes.caffeine:caffeine:3.2.0")
+ //implementation("com.github.luben:zstd-jni:1.5.7-6") // LinearPaper // TODO - move to buffered linear
+ //implementation("org.lz4:lz4-java:1.8.0") // LinearPaper // TODO - move to buffered linear
+ implementation("com.github.ben-manes.caffeine:caffeine:3.2.3")
+ // Leaf end - Libraries
+
implementation("ca.spottedleaf:concurrentutil:0.0.3")
- 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("org.jline:jline-terminal-ffm:3.29.0") // use ffm on java 22+ // Leaf - Bump Dependencies
+ implementation("org.jline:jline-terminal-jni:3.29.0") // fall back to jni on java 21 // Leaf - Bump Dependencies
+ implementation("org.jline:jline-terminal-ffm:3.30.6") // use ffm on java 22+ // Leaf - Bump Dependencies
+ implementation("org.jline:jline-terminal-jni:3.30.6") // fall back to jni on java 21 // Leaf - Bump Dependencies
implementation("net.minecrell:terminalconsoleappender:1.3.0")
implementation("net.kyori:adventure-text-serializer-ansi")
runtimeConfiguration(sourceSets.main.map { it.runtimeClasspath })
@@ -143,24 +_,39 @@
@@ -143,36 +_,53 @@
all its classes to check if they are plugins.
Scanning takes about 1-2 seconds so adding this speeds up the server start.
*/
- implementation("org.apache.logging.log4j:log4j-core:2.24.1")
- log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.24.1") // Needed to generate meta for our Log4j plugins
+ // Leaf start - Bump Dependencies
+ implementation("org.apache.logging.log4j:log4j-core:2.24.3")
+ log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.24.3") // Needed to generate meta for our Log4j plugins
+ implementation("org.apache.logging.log4j:log4j-core:2.25.2")
+ log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.25.2") // Needed to generate meta for our Log4j plugins
+ // Leaf end - Bump Dependencies
runtimeOnly(log4jPlugins.output)
alsoShade(log4jPlugins.output)
@@ -107,11 +107,12 @@
}
- implementation("io.netty:netty-codec-haproxy:4.1.118.Final") // Add support for proxy protocol
- implementation("org.apache.logging.log4j:log4j-iostreams:2.24.1")
- implementation("org.ow2.asm:asm-commons:9.8")
+ // Leaf start - Bump Dependencies
+ implementation("io.netty:netty-codec-haproxy:4.2.7.Final") // Add support for proxy protocol // Leaf - Bump netty to 4.2.x
+ implementation("org.apache.logging.log4j:log4j-iostreams:2.24.3")
+ implementation("org.apache.logging.log4j:log4j-iostreams:2.25.2")
+ implementation("org.ow2.asm:asm-commons:9.9")
+ // Leaf end - Bump Dependencies
implementation("org.ow2.asm:asm-commons:9.8")
implementation("org.spongepowered:configurate-yaml:4.2.0")
+ // Purpur start
@@ -122,32 +123,37 @@
+
// Deps that were previously in the API but have now been moved here for backwards compat, eventually to be removed
runtimeOnly("commons-lang:commons-lang:2.6")
runtimeOnly("org.xerial:sqlite-jdbc:3.49.1.0")
- runtimeOnly("org.xerial:sqlite-jdbc:3.49.1.0")
- runtimeOnly("com.mysql:mysql-connector-j:9.2.0")
- runtimeOnly("com.lmax:disruptor:3.4.4")
+ // Leaf start - Bump Dependencies
+ runtimeOnly("com.mysql:mysql-connector-j:9.2.0") {
+ runtimeOnly("org.xerial:sqlite-jdbc:3.50.3.0")
+ runtimeOnly("com.mysql:mysql-connector-j:9.5.0") {
+ exclude("com.google.protobuf", "protobuf-java") // Leaf - Exclude outdated protobuf version
+ }
+ runtimeOnly("com.google.protobuf:protobuf-java:4.30.1")
+ runtimeOnly("com.google.protobuf:protobuf-java:4.33.0")
+ runtimeOnly("com.lmax:disruptor:3.4.4") // Dreeam TODO - Waiting Log4j 3.x to support disruptor 4.0.0
+ // Leaf end - Bump Dependencies
implementation("com.googlecode.json-simple:json-simple:1.1.1") { // change to runtimeOnly once Timings is removed
isTransitive = false // includes junit
}
@@ -168,11 +_,13 @@
testImplementation("io.github.classgraph:classgraph:4.8.179") // For mob goal test
testImplementation("org.junit.jupiter:junit-jupiter:5.12.2")
testImplementation("org.junit.platform:junit-platform-suite-engine:1.12.2")
- testImplementation("io.github.classgraph:classgraph:4.8.179") // For mob goal test
- testImplementation("org.junit.jupiter:junit-jupiter:5.12.2")
- testImplementation("org.junit.platform:junit-platform-suite-engine:1.12.2")
- testImplementation("org.hamcrest:hamcrest:2.2")
- testImplementation("org.mockito:mockito-core:5.14.1")
- mockitoAgent("org.mockito:mockito-core:5.14.1") { isTransitive = false } // Configure mockito agent that is needed in newer java versions
+ // Leaf start - Bump Dependencies
+ testImplementation("org.hamcrest:hamcrest:3.0")
+ testImplementation("org.mockito:mockito-core:5.16.1")
+ mockitoAgent("org.mockito:mockito-core:5.16.1") { isTransitive = false } // Configure mockito agent that is needed in newer java versions
testImplementation("org.ow2.asm:asm-tree:9.8")
- testImplementation("org.ow2.asm:asm-tree:9.8")
- testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // CartesianTest
+ // Leaf start - Bump Dependencies
+ testImplementation("io.github.classgraph:classgraph:4.8.184") // For mob goal test
+ testImplementation("org.junit.jupiter:junit-jupiter:6.0.1")
+ testImplementation("org.junit.platform:junit-platform-suite-engine:6.0.1")
+ testImplementation("org.hamcrest:hamcrest:3.0")
+ testImplementation("org.mockito:mockito-core:5.20.0")
+ mockitoAgent("org.mockito:mockito-core:5.20.0") { isTransitive = false } // Configure mockito agent that is needed in newer java versions
+ testImplementation("org.ow2.asm:asm-tree:9.9")
+ testImplementation("org.junit-pioneer:junit-pioneer:2.3.0") // CartesianTest
+ // Leaf end - Bump Dependencies
@@ -162,8 +168,8 @@
- implementation("me.lucko:spark-api:0.1-20240720.200737-2")
- implementation("me.lucko:spark-paper:1.10.133-20250413.112336-1")
-}
+ implementation("me.lucko:spark-api:0.1-dev-462d7f8-SNAPSHOT")
+ implementation("me.lucko:spark-paper:1.10-dev-462d7f8-SNAPSHOT")
+ implementation("me.lucko:spark-api:0.1-dev-9a706d5-SNAPSHOT")
+ implementation("me.lucko:spark-paper:1.10-dev-9a706d5-SNAPSHOT")
+
+ implementation("io.netty:netty-all:4.2.7.Final") // Leaf - Bump netty to 4.2.x
+ // Leaf end - Bump Dependencies