9
0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-04 15:41:40 +00:00

Bump dependencies

This commit is contained in:
Dreeam
2023-02-03 13:16:58 -05:00
parent 93a778de42
commit b1f6f363c1
2 changed files with 51 additions and 16 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
diff --git a/build.gradle.kts b/build.gradle.kts
index a995ecc3b1d6181c58d5b4a0a6a893178bdc40aa..891637f6360985fee238d46f218406d6ebd17ed3 100644
index a995ecc3b1d6181c58d5b4a0a6a893178bdc40aa..991698f8daff823d64a09c369e1ee8a8b2023478 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -24,14 +24,14 @@ configurations.api {
@@ -26,7 +26,7 @@ index a995ecc3b1d6181c58d5b4a0a6a893178bdc40aa..891637f6360985fee238d46f218406d6
apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
apiAndDocs("net.kyori:adventure-api")
apiAndDocs("net.kyori:adventure-text-minimessage")
@@ -39,18 +39,18 @@ dependencies {
@@ -39,20 +39,20 @@ dependencies {
apiAndDocs("net.kyori:adventure-text-serializer-legacy")
apiAndDocs("net.kyori:adventure-text-serializer-plain")
apiAndDocs("net.kyori:adventure-text-logger-slf4j")
@@ -35,7 +35,7 @@ index a995ecc3b1d6181c58d5b4a0a6a893178bdc40aa..891637f6360985fee238d46f218406d6
- api("io.sentry:sentry:5.4.0") // Pufferfish
+ api("org.apache.logging.log4j:log4j-api:2.19.0")
+ api("org.slf4j:slf4j-api:1.8.0-beta4") // Leaf TODO - Bump later, need to fix breaking compatibility
+ api("io.sentry:sentry:6.11.0") // Pufferfish
+ api("io.sentry:sentry:6.13.0") // Pufferfish
- implementation("org.ow2.asm:asm:9.2")
- implementation("org.ow2.asm:asm-commons:9.2")
@@ -43,16 +43,20 @@ index a995ecc3b1d6181c58d5b4a0a6a893178bdc40aa..891637f6360985fee238d46f218406d6
+ implementation("org.ow2.asm:asm-commons:9.4")
// Paper end
compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
- compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
- compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
- compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
- compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper
+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.2")
+ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.2")
+ compileOnly("org.apache.maven:maven-resolver-provider:3.8.7")
+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") // Leaf TODO - Bump later, need to fix breaking compatibility
+ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") // Leaf TODO - Bump later, need to fix breaking compatibility
+ compileOnly("com.google.code.findbugs:jsr305:3.0.2") // Paper
val annotations = "org.jetbrains:annotations:23.0.0" // Paper - we don't want Java 5 annotations...
- val annotations = "org.jetbrains:annotations:23.0.0" // Paper - we don't want Java 5 annotations...
+ val annotations = "org.jetbrains:annotations:24.0.0" // Paper - we don't want Java 5 annotations...
compileOnly(annotations)
testCompileOnly(annotations)
@@ -64,8 +64,8 @@ dependencies {
testImplementation("org.apache.commons:commons-lang3:3.12.0")
@@ -64,6 +68,18 @@ index a995ecc3b1d6181c58d5b4a0a6a893178bdc40aa..891637f6360985fee238d46f218406d6
}
configure<PublishingExtension> {
@@ -108,9 +108,9 @@ tasks.withType<Javadoc> {
options.use()
options.isDocFilesSubDirs = true
options.links(
- "https://guava.dev/releases/31.0.1-jre/api/docs/",
+ "https://guava.dev/releases/31.1-jre/api/docs/",
"https://javadoc.io/doc/org.yaml/snakeyaml/1.33/",
- "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations
+ "https://javadoc.io/doc/org.jetbrains/annotations/24.0.0/", // Paper - we don't want Java 5 annotations
// Paper start
//"https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", // don't link to bungee chat
"https://jd.adventure.kyori.net/api/$adventureVersion/",
@@ -147,6 +147,9 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.
jarToScan.set(tasks.jar.flatMap { it.archiveFile })
classpath.from(configurations.compileClasspath)

View File

@@ -5,10 +5,25 @@ Subject: [PATCH] Bump Dependencies
diff --git a/build.gradle.kts b/build.gradle.kts
index b52c4f00f4a10c0f748182e39c9c1daeb0c4904b..cfc81a5c0c18b620028a69ae30918c9123b7a7c4 100644
index b52c4f00f4a10c0f748182e39c9c1daeb0c4904b..984ca60fcb400fa1fd2b742a4c9e165921b120d3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -22,13 +22,13 @@ dependencies {
@@ -9,12 +9,12 @@ plugins {
dependencies {
implementation(project(":leaf-api")) // Paper // Pufferfish // Leaf
// Pufferfish start
- implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") {
+ implementation("io.papermc.paper:paper-mojangapi:1.19.3-R0.1-SNAPSHOT") {
exclude("io.papermc.paper", "paper-api")
}
// Pufferfish end
// Paper start
- implementation("org.jline:jline-terminal-jansi:3.21.0")
+ implementation("org.jline:jline-terminal-jansi:3.22.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
/*
Required to add the missing Log4j2Plugins.dat file from log4j-core
@@ -22,40 +22,40 @@ dependencies {
all its classes to check if they are plugins.
Scanning takes about 1-2 seconds so adding this speeds up the server start.
*/
@@ -26,21 +41,25 @@ index b52c4f00f4a10c0f748182e39c9c1daeb0c4904b..cfc81a5c0c18b620028a69ae30918c91
implementation("org.spongepowered:configurate-yaml:4.1.2") // Paper - config files
implementation("commons-lang:commons-lang:2.6")
implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
@@ -37,25 +37,25 @@ dependencies {
// Paper start - Use Velocity cipher
- implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT") {
+ implementation("com.velocitypowered:velocity-native:3.2.0-SNAPSHOT") {
isTransitive = false
}
// Paper end
- runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
- runtimeOnly("mysql:mysql-connector-java:8.0.29")
+ runtimeOnly("org.xerial:sqlite-jdbc:3.40.0.0")
+ runtimeOnly("mysql:mysql-connector-java:8.0.30")
runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
- runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
+ runtimeOnly("org.xerial:sqlite-jdbc:3.40.1.0")
+ runtimeOnly("mysql:mysql-connector-java:8.0.32")
+ runtimeOnly("com.lmax:disruptor:4.0.0.RC1") // Paper
runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
- runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
- runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
- runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.2")
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.2")
+ runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.7") // Leaf TODO - Bump to 4.0.0 later, need to fix breaking compatibility
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") // Leaf TODO - Bump later, need to fix breaking compatibility
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") // Leaf TODO - Bump later, need to fix breaking compatibility
// Pufferfish start
- implementation("org.yaml:snakeyaml:1.32")