3
0
Mirror von https://github.com/PaperMC/Velocity.git synchronisiert 2024-12-25 15:50:19 +01:00

Updated Guice to 6.0.0 and manually include updated ASM (#1016)

Dieser Commit ist enthalten in:
Adrian 2023-06-02 21:12:03 -05:00 committet von GitHub
Ursprung 40b76c6332
Commit e0cf2e211f
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
3 geänderte Dateien mit 4 neuen und 3 gelöschten Zeilen

Datei anzeigen

@ -12,6 +12,7 @@ spotless = "com.diffplug.spotless:6.12.0"
[libraries] [libraries]
adventure-bom = "net.kyori:adventure-bom:4.13.1" adventure-bom = "net.kyori:adventure-bom:4.13.1"
adventure-facet = "net.kyori:adventure-platform-facet:4.3.0" adventure-facet = "net.kyori:adventure-platform-facet:4.3.0"
asm = "org.ow2.asm:asm:9.5"
asynchttpclient = "org.asynchttpclient:async-http-client:2.12.3" asynchttpclient = "org.asynchttpclient:async-http-client:2.12.3"
brigadier = "com.velocitypowered:velocity-brigadier:1.0.0-SNAPSHOT" brigadier = "com.velocitypowered:velocity-brigadier:1.0.0-SNAPSHOT"
bstats = "org.bstats:bstats-base:3.0.1" bstats = "org.bstats:bstats-base:3.0.1"
@ -30,7 +31,7 @@ jopt = "net.sf.jopt-simple:jopt-simple:5.0.4"
junit = "org.junit.jupiter:junit-jupiter:5.9.0" junit = "org.junit.jupiter:junit-jupiter:5.9.0"
guava = "com.google.guava:guava:25.1-jre" guava = "com.google.guava:guava:25.1-jre"
gson = "com.google.code.gson:gson:2.10.1" gson = "com.google.code.gson:gson:2.10.1"
guice = "com.google.inject:guice:5.1.0" guice = "com.google.inject:guice:6.0.0"
lmbda = "org.lanternpowered:lmbda:2.0.0" lmbda = "org.lanternpowered:lmbda:2.0.0"
log4j-api = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4j" } log4j-api = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4j" }
log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" } log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }

Datei anzeigen

@ -114,6 +114,7 @@ dependencies {
implementation(libs.nightconfig) implementation(libs.nightconfig)
implementation(libs.bstats) implementation(libs.bstats)
implementation(libs.lmbda) implementation(libs.lmbda)
implementation(libs.asm)
implementation(libs.bundles.flare) implementation(libs.bundles.flare)
compileOnly(libs.spotbugs.annotations) compileOnly(libs.spotbugs.annotations)
testImplementation(libs.mockito) testImplementation(libs.mockito)

Datei anzeigen

@ -306,8 +306,7 @@ public class VelocityEventManager implements EventManager {
if (returnType != void.class && continuationType == Continuation.class) { if (returnType != void.class && continuationType == Continuation.class) {
errors.add("method return type must be void if a continuation parameter is provided"); errors.add("method return type must be void if a continuation parameter is provided");
} else if (returnType != void.class && returnType != EventTask.class) { } else if (returnType != void.class && returnType != EventTask.class) {
errors.add("method return type must be void, AsyncTask, " errors.add("method return type must be void or EventTask");
+ "AsyncTask.Basic or AsyncTask.WithContinuation");
} }
} }
final short order = (short) subscribe.order().ordinal(); final short order = (short) subscribe.order().ordinal();