mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-29 03:49:21 +00:00
Update dependencies
This commit is contained in:
Dreeam
@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
|
||||
|
||||
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index 58bae199b8fcdfcc40a159748e723d7d163515a5..e9712e908567eda14f5dc09a42aa39e700f6b814 100644
|
||||
index 58bae199b8fcdfcc40a159748e723d7d163515a5..19c0c18ccbbf8e547ba8ce0e54b851fd725f4164 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -9,8 +9,8 @@ java {
|
||||
@@ -26,7 +26,7 @@ index 58bae199b8fcdfcc40a159748e723d7d163515a5..e9712e908567eda14f5dc09a42aa39e7
|
||||
- api("com.google.guava:guava:31.1-jre")
|
||||
- api("com.google.code.gson:gson:2.10")
|
||||
- api("net.md-5:bungeecord-chat:1.16-R0.4-deprecated+build.9") // Paper
|
||||
+ api("com.google.guava:guava:32.0.1-jre") // Leaf - Bump Dependencies
|
||||
+ api("com.google.guava:guava:32.1.1-jre") // Leaf - Bump Dependencies
|
||||
+ api("com.google.code.gson:gson:2.10.1")
|
||||
+ api("net.md-5:bungeecord-chat:1.20-R0.1-SNAPSHOT") // Paper // Leaf - Bump Dependencies
|
||||
api("org.yaml:snakeyaml:2.0")
|
||||
@@ -55,9 +55,9 @@ index 58bae199b8fcdfcc40a159748e723d7d163515a5..e9712e908567eda14f5dc09a42aa39e7
|
||||
- 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
|
||||
+ api("org.apache.maven:maven-resolver-provider:3.9.2")
|
||||
+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.12")
|
||||
+ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.12")
|
||||
+ api("org.apache.maven:maven-resolver-provider:3.9.3")
|
||||
+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.13")
|
||||
+ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.13")
|
||||
+ compileOnly("com.google.code.findbugs:jsr305:3.0.2") // Paper
|
||||
|
||||
val annotations = "org.jetbrains:annotations:$annotationsVersion" // Paper - we don't want Java 5 annotations...
|
||||
@@ -66,7 +66,7 @@ index 58bae199b8fcdfcc40a159748e723d7d163515a5..e9712e908567eda14f5dc09a42aa39e7
|
||||
|
||||
// Paper start - add checker
|
||||
- val checkerQual = "org.checkerframework:checker-qual:3.21.0"
|
||||
+ val checkerQual = "org.checkerframework:checker-qual:3.35.0"
|
||||
+ val checkerQual = "org.checkerframework:checker-qual:3.36.0"
|
||||
compileOnlyApi(checkerQual)
|
||||
testCompileOnly(checkerQual)
|
||||
// Paper end
|
||||
@@ -74,9 +74,8 @@ index 58bae199b8fcdfcc40a159748e723d7d163515a5..e9712e908567eda14f5dc09a42aa39e7
|
||||
+ testImplementation("org.mockito:mockito-core:5.4.0") // Paper - add mockito
|
||||
|
||||
testImplementation("org.apache.commons:commons-lang3:3.12.0")
|
||||
- testImplementation("junit:junit:4.13.2")
|
||||
testImplementation("junit:junit:4.13.2")
|
||||
- testImplementation("org.hamcrest:hamcrest-library:1.3")
|
||||
+ testImplementation("junit:junit:4.13.2") // Leaf TODO - update to 5?
|
||||
+
|
||||
+ testImplementation("org.hamcrest:hamcrest:2.2")
|
||||
testImplementation("org.ow2.asm:asm-tree:9.5")
|
||||
@@ -89,7 +88,7 @@ index 58bae199b8fcdfcc40a159748e723d7d163515a5..e9712e908567eda14f5dc09a42aa39e7
|
||||
options.isDocFilesSubDirs = true
|
||||
options.links(
|
||||
- "https://guava.dev/releases/31.1-jre/api/docs/",
|
||||
+ "https://guava.dev/releases/32.0.1-jre/api/docs/", // Leaf - Bump Dependencies
|
||||
+ "https://guava.dev/releases/32.1.1-jre/api/docs/", // Leaf - Bump Dependencies
|
||||
"https://javadoc.io/doc/org.yaml/snakeyaml/2.0/",
|
||||
"https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
|
||||
// Paper start
|
||||
|
||||
@@ -9,26 +9,20 @@ Original license: MIT
|
||||
Original project: https://github.com/PurpurMC/Purpur
|
||||
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index 4a7ae3c1513e5c979010ce7275052f27f029498a..4c205ef9ffdae157dab02342642d8da884de51d3 100644
|
||||
index 4a7ae3c1513e5c979010ce7275052f27f029498a..53240be3a1bea29c0d26aecc8801642c0bc147c4 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -54,9 +54,13 @@ dependencies {
|
||||
@@ -54,6 +54,10 @@ dependencies {
|
||||
}
|
||||
// Paper end
|
||||
|
||||
- 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")
|
||||
+ implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur
|
||||
+ implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
|
||||
+ implementation("dev.omega24:upnp4j:1.0") // Purpur
|
||||
+
|
||||
+ runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.2")
|
||||
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10")
|
||||
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10")
|
||||
|
||||
// Pufferfish start
|
||||
implementation("org.yaml:snakeyaml:2.0")
|
||||
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")
|
||||
@@ -182,7 +186,7 @@ fun TaskContainer.registerRunTask(
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
|
||||
|
||||
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index 4c205ef9ffdae157dab02342642d8da884de51d3..432ad055e89be33336eb0744ff2b3b5b1f784869 100644
|
||||
index 53240be3a1bea29c0d26aecc8801642c0bc147c4..635b8dbcd170574877e181be79cfc5fbbfc8cf1a 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -22,7 +22,7 @@ dependencies {
|
||||
@@ -54,27 +54,30 @@ index 4c205ef9ffdae157dab02342642d8da884de51d3..432ad055e89be33336eb0744ff2b3b5b
|
||||
isTransitive = false
|
||||
}
|
||||
// Paper end
|
||||
@@ -59,8 +61,8 @@ dependencies {
|
||||
@@ -58,9 +60,11 @@ dependencies {
|
||||
implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
|
||||
implementation("dev.omega24:upnp4j:1.0") // Purpur
|
||||
|
||||
runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.2")
|
||||
- runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10")
|
||||
- runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10")
|
||||
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.12") // Leaf - Bump Dependencies
|
||||
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.12") // Leaf - Bump Dependencies
|
||||
- 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")
|
||||
+ // Leaf start - Bump Dependencies
|
||||
+ runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.3")
|
||||
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.13")
|
||||
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.13")
|
||||
+ // Leaf end
|
||||
|
||||
// Pufferfish start
|
||||
implementation("org.yaml:snakeyaml:2.0")
|
||||
@@ -69,11 +71,13 @@ dependencies {
|
||||
@@ -69,11 +73,13 @@ dependencies {
|
||||
}
|
||||
// Pufferfish end
|
||||
|
||||
- testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
|
||||
- testImplementation("junit:junit:4.13.2")
|
||||
- testImplementation("org.hamcrest:hamcrest-library:1.3")
|
||||
+ // Leaf start - Bump Dependencies
|
||||
+ testImplementation("io.github.classgraph:classgraph:4.8.160") // Paper - mob goal test
|
||||
+ testImplementation("junit:junit:4.13.2") // Leaf TODO - update to 5?
|
||||
+ testImplementation("io.github.classgraph:classgraph:4.8.161") // Paper - mob goal test
|
||||
testImplementation("junit:junit:4.13.2")
|
||||
- testImplementation("org.hamcrest:hamcrest-library:1.3")
|
||||
+ testImplementation("org.hamcrest:hamcrest:2.2")
|
||||
|
||||
- implementation("io.netty:netty-all:4.1.87.Final"); // Paper - Bump netty
|
||||
@@ -83,7 +86,7 @@ index 4c205ef9ffdae157dab02342642d8da884de51d3..432ad055e89be33336eb0744ff2b3b5b
|
||||
}
|
||||
|
||||
val craftbukkitPackageVersion = "1_20_R1" // Paper
|
||||
@@ -244,3 +248,6 @@ tasks.registerRunTask("runDev") {
|
||||
@@ -244,3 +250,6 @@ tasks.registerRunTask("runDev") {
|
||||
description = "Spin up a non-relocated Mojang-mapped test server"
|
||||
classpath(sourceSets.main.map { it.runtimeClasspath })
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user