Archived
0

bridge-protocol -> libprotocol

This commit is contained in:
2017-06-15 22:52:09 +03:00
parent 2fca454179
commit 6ffb63ceb2
17 changed files with 6 additions and 7 deletions

View File

@@ -17,11 +17,10 @@ configurations {
}
compileJava {
dependsOn ':bridge-protocol:compileJava'
dependsOn ':libprotocol:compileJava'
}
jar {
dependsOn ':bridge-protocol:jar'
dependsOn configurations.include
from { configurations.include.collect { it.isDirectory() ? it : zipTree(it) } }
}
@@ -31,7 +30,7 @@ ext {
}
dependencies {
include files(project(':bridge-protocol').sourceSets.main.output.classesDir)
include files(project(':libprotocol').sourceSets.main.output.classesDir)
compile (group: 'org.bukkit', name: 'bukkit', version: '1.8.8-R0.1-SNAPSHOT') {
exclude group: 'junit'
exclude group: 'commons-lang'

View File

@@ -13,7 +13,7 @@ subprojects {
}
subprojects {
if (!it.name.startsWith('bridge')) {
if (it.name != 'bridge' || !it.name.startsWith('lib')) {
ext {
slf4jVersion = '1.7.21'
}

View File

@@ -9,7 +9,7 @@ configurations {
}
compileJava {
dependsOn ':bridge-protocol:compileJava'
dependsOn ':libprotocol:compileJava'
}
jar {
@@ -35,7 +35,7 @@ ext {
dependencies {
compile project(':core')
compile project(':webinterface')
include files(project(':bridge-protocol').sourceSets.main.output.classesDir)
include files(project(':libprotocol').sourceSets.main.output.classesDir)
compile group: 'io.netty', name: 'netty-codec', version: nettyVersion
compile group: 'io.netty', name: 'netty-codec-http', version: nettyVersion
}

View File

@@ -2,5 +2,5 @@ rootProject.name = 'asys'
include 'core'
include 'webinterface'
include 'mcserver-manager'
include 'bridge-protocol'
include 'libprotocol'
include 'bridge'