Archived
0

Merge remote-tracking branch 'origin/develop' into anarok/merge/loop-3

# Conflicts:
#	build.gradle
#	proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java
#	settings.gradle
This commit is contained in:
Daniil
2018-08-10 03:24:30 +07:00
33 changed files with 591 additions and 554 deletions

View File

@@ -1,4 +1,4 @@
subprojects {
allprojects {
apply plugin: 'java'
compileJava {
@@ -10,7 +10,9 @@ subprojects {
repositories {
mavenCentral()
}
}
subprojects {
ext {
slf4j_version = '1.7.21'
spring_version = '4.2.5.RELEASE'
@@ -46,3 +48,23 @@ subprojects {
delete 'libs'
}
}
task runApp(type: JavaExec) {
main = 'mc.core.Main'
workingDir = (project.hasProperty("workDir") ? project.workDir : '.')
subprojects.findAll().each{ prj ->
classpath += prj.sourceSets.main.runtimeClasspath
}
/* Uncomment, if your Log Implements are folder '{workDir}/log-impl' */
//classpath += files(fileTree(dir: new File(workingDir, "log-impl")))
/* Uncomment, if you used VM args */
//jvmArgs = [
// "-DspringConfig=app.xml",
// "-Dlog4j.configurationFile=log4j2.xml"
//]
ignoreExitValue = true
}