Archived
0

Merge branch 'develop' into dmitriymx/location-refactory

# Conflicts:
#	core/src/main/java/mc/core/Location.java
#	flat_world/src/main/java/mc/world/flat/FlatWorld.java
#	generated_world/src/main/java/mc/world/generated_world/world/CubicWorld.java
#	proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java
This commit is contained in:
2018-08-10 12:00:13 +03:00
65 changed files with 2132 additions and 391 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'
@@ -33,6 +35,9 @@ subprojects {
/* Components */
compile (group: 'org.projectlombok', name: 'lombok', version: '1.16.16')
/* Test */
testCompile (group: 'junit', name: 'junit', version: '4.12')
}
task copyDep(type: Copy) {
@@ -44,3 +49,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
}