Mirrors/Velocity
1
0
Fork 1
mirror of https://github.com/PaperMC/Velocity.git synced 2026-02-17 14:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev/1.1.0' into dev/2.0.0

Browse Source 
# 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
parent c140599a53 3d0cb50569
commit 5bd7b66bda
14 changed files with 143 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/build.gradle
View File

@@ -8,6 +8,11 @@ apply from: '../gradle/checkstyle.gradle'
apply from: '../gradle/publish.gradle'
apply plugin: 'com.github.johnrengelman.shadow'
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
sourceSets {
ap {
compileClasspath += main.compileClasspath + main.output
@@ -31,7 +36,7 @@ dependencies {
api "org.slf4j:slf4j-api:${slf4jVersion}"
api 'com.google.inject:guice:4.2.3'
api "org.checkerframework:checker-qual:${checkerFrameworkVersion}"
api 'com.mojang:brigadier:1.0.17'
api 'com.velocitypowered:velocity-brigadier:1.0.0-SNAPSHOT'
api "org.spongepowered:configurate-hocon:${configurateVersion}"
api "org.spongepowered:configurate-yaml:${configurateVersion}"