Merge branch 'dev/1.1.0' into experiment/io_uring

# Conflicts:
#	proxy/build.gradle
This commit is contained in:
Andrew Steinborn
2020-12-10 06:50:44 -05:00
9 changed files with 95 additions and 38 deletions

View File

@@ -51,7 +51,7 @@ dependencies {
implementation "io.netty:netty-handler:${nettyVersion}"
implementation "io.netty:netty-transport-native-epoll:${nettyVersion}"
implementation "io.netty:netty-transport-native-epoll:${nettyVersion}:linux-x86_64"
implementation "io.netty:netty-transport-native-epoll:${nettyVersion}:linux-aarch64"
implementation "io.netty:netty-transport-native-epoll:${nettyVersion}:linux-aarch_64"
implementation "io.netty.incubator:netty-incubator-transport-native-io_uring:0.0.1.Final:linux-x86_64"
implementation "io.netty:netty-resolver-dns:${nettyVersion}"
@@ -67,7 +67,9 @@ dependencies {
implementation 'it.unimi.dsi:fastutil:8.4.1'
implementation 'net.kyori:event-method-asm:4.0.0-SNAPSHOT'
implementation 'net.kyori:adventure-nbt:4.0.0-SNAPSHOT'
implementation(platform("net.kyori:adventure-bom:${adventureVersion}"))
implementation("net.kyori:adventure-nbt")
implementation 'org.asynchttpclient:async-http-client:2.12.1'