Merge branch 'dev/1.1.0' into dev/2.0.0

# Conflicts:
#	build.gradle
#	native/src/main/java/com/velocitypowered/natives/compression/Java11VelocityCompressor.java
This commit is contained in:
Andrew Steinborn
2020-11-17 04:49:32 -05:00
14 changed files with 143 additions and 40 deletions

View File

@@ -7,6 +7,11 @@ plugins {
apply from: '../gradle/checkstyle.gradle'
apply from: '../gradle/publish.gradle'
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
dependencies {
implementation "com.google.guava:guava:${guavaVersion}"
implementation "io.netty:netty-handler:${nettyVersion}"