mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-24 01:19:25 +00:00
6acb949d2d
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@681c013 Bundle spark (#11093) PaperMC/Paper@5fee9c6 Move configuration option to a system property PaperMC/Paper@aa3b356 Improve server startup logging (#11110) PaperMC/Paper@9aea240 Properly lookup plugin classes when looked up by spark PaperMC/Paper@7e91a2c Update the bundled spark version Gale Changes: Dreeam-qwq/Gale@a4ed885 Updated Upstream (Paper) Dreeam-qwq/Gale@3932464 [ci skip] Remove TODOs Purpur Changes: PurpurMC/Purpur@936c29a Updated Upstream (Paper) PurpurMC/Purpur@032697e Updated Upstream (Paper) PurpurMC/Purpur@b2d1fea always output bukkit/paper plugin header in plugin command
94 lines
4.8 KiB
Diff
94 lines
4.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
|
|
Date: Fri, 28 Oct 2022 17:48:45 -0400
|
|
Subject: [PATCH] Bump Dependencies
|
|
|
|
|
|
diff --git a/build.gradle.kts b/build.gradle.kts
|
|
index 2053bb1c466dcc34b9057e75062d2dc1d17355a8..f8345586b3e72cb222adf5ae8986f3e92a670eac 100644
|
|
--- a/build.gradle.kts
|
|
+++ b/build.gradle.kts
|
|
@@ -22,7 +22,7 @@ dependencies {
|
|
// Leaf end - Leaf Config
|
|
|
|
// Paper start
|
|
- implementation("org.jline:jline-terminal-jansi:3.21.0")
|
|
+ implementation("org.jline:jline-terminal-jansi:3.26.1") // Leaf - Bump Dependencies
|
|
implementation("net.minecrell:terminalconsoleappender:1.3.0")
|
|
implementation("net.kyori:adventure-text-serializer-ansi:4.17.0") // Keep in sync with adventureVersion from Paper-API build file
|
|
/*
|
|
@@ -31,28 +31,32 @@ dependencies {
|
|
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.19.0") // Paper - implementation
|
|
- log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - Needed to generate meta for our Log4j plugins
|
|
+ // Leaf start - Bump Dependencies
|
|
+ implementation("org.apache.logging.log4j:log4j-core:2.23.1") // Paper - implementation
|
|
+ log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.23.1") // Paper - Needed to generate meta for our Log4j plugins
|
|
runtimeOnly(log4jPlugins.output)
|
|
alsoShade(log4jPlugins.output)
|
|
- implementation("io.netty:netty-codec-haproxy:4.1.97.Final") // Paper - Add support for proxy protocol
|
|
+ implementation("io.netty:netty-codec-haproxy:4.1.111.Final") // Paper - Add support for proxy protocol
|
|
// Paper end
|
|
- implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion
|
|
+ implementation("org.apache.logging.log4j:log4j-iostreams:2.23.1") // Paper - remove exclusion
|
|
+ // Leaf end - Bump Dependencies
|
|
implementation("org.ow2.asm:asm-commons:9.7")
|
|
implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
|
|
implementation("commons-lang:commons-lang:2.6")
|
|
runtimeOnly("org.xerial:sqlite-jdbc:3.46.0.0")
|
|
runtimeOnly("com.mysql:mysql-connector-j:8.4.0")
|
|
- runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
|
|
+ runtimeOnly("com.lmax:disruptor:3.4.4") // Paper // Leaf - Bump Dependencies - Waiting Log4j 3.x to support disruptor 4.0.0
|
|
// Paper start - Use Velocity cipher
|
|
- implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT") {
|
|
+ implementation("com.velocitypowered:velocity-native:3.3.0-SNAPSHOT") { // Leaf - Bump Dependencies
|
|
isTransitive = false
|
|
}
|
|
// Paper end - Use Velocity cipher
|
|
|
|
- runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
|
|
- runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
|
|
- runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
|
|
+ // Leaf start - Bump Dependencies
|
|
+ runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.7")
|
|
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.20")
|
|
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.20")
|
|
+ // Leaf end
|
|
|
|
// Purpur start
|
|
implementation("org.mozilla:rhino-runtime:1.7.15")
|
|
@@ -60,10 +64,10 @@ dependencies {
|
|
implementation("dev.omega24:upnp4j:1.0")
|
|
// Purpur end
|
|
|
|
- testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
|
|
- testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
|
|
+ testImplementation("io.github.classgraph:classgraph:4.8.173") // Paper - mob goal test // Leaf - Bump Dependencies
|
|
+ testImplementation("org.junit.jupiter:junit-jupiter:5.11.0-M2") // Leaf - 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")
|
|
testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest
|
|
implementation("net.neoforged:srgutils:1.0.9") // Paper - mappings handling
|
|
@@ -78,6 +82,8 @@ dependencies {
|
|
implementation("me.lucko:spark-api:0.1-20240720.200737-2")
|
|
implementation("me.lucko:spark-paper:1.10.84-20240720.204128-1")
|
|
// Paper end - spark
|
|
+
|
|
+ implementation("io.netty:netty-all:4.1.111.Final") // Leaf - Bump Dependencies
|
|
}
|
|
|
|
paperweight {
|
|
@@ -271,3 +277,8 @@ sourceSets {
|
|
}
|
|
}
|
|
// Gale end - package license into jar
|
|
+// Leaf start - Bump Dependencies
|
|
+repositories {
|
|
+ mavenCentral()
|
|
+}
|
|
+// Leaf end - Bump Dependencies
|