Merge remote-tracking branch 'origin/master'

# Conflicts:
#	build.gradle
This commit is contained in:
CaiHQ 2021-12-23 00:16:15 +08:00
commit d10337e42b

View File

@ -25,7 +25,9 @@ sourceCompatibility = 1.8
dependencies { dependencies {
api project(":gmhelper") api project(":gmhelper")
api 'berkeleydb:je:3.2.76' api 'berkeleydb:je:3.2.76'
api 'com.fifesoft:rsyntaxtextarea:3.1.3'
api 'commons-io:commons-io:2.11.0' api 'commons-io:commons-io:2.11.0'
api 'io.netty:netty-all:4.1.52.Final' api 'io.netty:netty-all:4.1.52.Final'
api 'org.antlr:antlr4:4.9.2' api 'org.antlr:antlr4:4.9.2'
@ -34,7 +36,9 @@ dependencies {
api 'org.apache.logging.log4j:log4j-api:2.17.0' api 'org.apache.logging.log4j:log4j-api:2.17.0'
//api 'org.apache.velocity:velocity-engine-core:2.3' //api 'org.apache.velocity:velocity-engine-core:2.3'
api 'org.rocksdb:rocksdbjni:6.22.1' api 'org.rocksdb:rocksdbjni:6.22.1'
api fileTree(dir: 'lib', include: '*.jar') api fileTree(dir: 'lib', include: '*.jar')
testImplementation 'junit:junit:4.13.2' testImplementation 'junit:junit:4.13.2'
} }