diff --git a/bridge-protocol/build.gradle b/bridge-protocol/build.gradle new file mode 100644 index 0000000..03006c3 --- /dev/null +++ b/bridge-protocol/build.gradle @@ -0,0 +1,15 @@ +group = 'asys' +version = '0.1-SNAPSHOT' + +task jar(type: Jar, overwrite: true) { + // не собирать jar +} + +ext { + nettyVersion = '4.1.9.Final' +} + +dependencies { + compile group: 'com.google.guava', name: 'guava', version: '21.0' + compile group: 'io.netty', name: 'netty-codec', version: nettyVersion +} diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/packets/CS_Handshake.java b/bridge-protocol/src/main/java/asys/mcsmanager/packets/CS_Handshake.java similarity index 100% rename from mcserver-manager/src/main/java/asys/mcsmanager/packets/CS_Handshake.java rename to bridge-protocol/src/main/java/asys/mcsmanager/packets/CS_Handshake.java diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/packets/CS_Ping.java b/bridge-protocol/src/main/java/asys/mcsmanager/packets/CS_Ping.java similarity index 100% rename from mcserver-manager/src/main/java/asys/mcsmanager/packets/CS_Ping.java rename to bridge-protocol/src/main/java/asys/mcsmanager/packets/CS_Ping.java diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/packets/IPacketHandler.java b/bridge-protocol/src/main/java/asys/mcsmanager/packets/IPacketHandler.java similarity index 100% rename from mcserver-manager/src/main/java/asys/mcsmanager/packets/IPacketHandler.java rename to bridge-protocol/src/main/java/asys/mcsmanager/packets/IPacketHandler.java diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/packets/Packet.java b/bridge-protocol/src/main/java/asys/mcsmanager/packets/Packet.java similarity index 100% rename from mcserver-manager/src/main/java/asys/mcsmanager/packets/Packet.java rename to bridge-protocol/src/main/java/asys/mcsmanager/packets/Packet.java diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/packets/SC_HandshakeResult.java b/bridge-protocol/src/main/java/asys/mcsmanager/packets/SC_HandshakeResult.java similarity index 100% rename from mcserver-manager/src/main/java/asys/mcsmanager/packets/SC_HandshakeResult.java rename to bridge-protocol/src/main/java/asys/mcsmanager/packets/SC_HandshakeResult.java diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/packets/codec/PacketDecoder.java b/bridge-protocol/src/main/java/asys/mcsmanager/packets/codec/PacketDecoder.java similarity index 100% rename from mcserver-manager/src/main/java/asys/mcsmanager/packets/codec/PacketDecoder.java rename to bridge-protocol/src/main/java/asys/mcsmanager/packets/codec/PacketDecoder.java diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/packets/codec/PacketEncoder.java b/bridge-protocol/src/main/java/asys/mcsmanager/packets/codec/PacketEncoder.java similarity index 100% rename from mcserver-manager/src/main/java/asys/mcsmanager/packets/codec/PacketEncoder.java rename to bridge-protocol/src/main/java/asys/mcsmanager/packets/codec/PacketEncoder.java diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/packets/codec/PacketHandler.java b/bridge-protocol/src/main/java/asys/mcsmanager/packets/codec/PacketHandler.java similarity index 100% rename from mcserver-manager/src/main/java/asys/mcsmanager/packets/codec/PacketHandler.java rename to bridge-protocol/src/main/java/asys/mcsmanager/packets/codec/PacketHandler.java diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/packets/codec/Params.java b/bridge-protocol/src/main/java/asys/mcsmanager/packets/codec/Params.java similarity index 100% rename from mcserver-manager/src/main/java/asys/mcsmanager/packets/codec/Params.java rename to bridge-protocol/src/main/java/asys/mcsmanager/packets/codec/Params.java diff --git a/build.gradle b/build.gradle index 9b4b2d9..23f171a 100644 --- a/build.gradle +++ b/build.gradle @@ -5,18 +5,22 @@ subprojects { mavenCentral() } - ext { - slf4jVersion = '1.7.21' - } - - dependencies { - compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion - compile group: 'org.osgi', name: 'org.osgi.core', version: '6.0.0' - } - compileJava { sourceCompatibility = 1.8 targetCompatibility = 1.8 options.encoding = 'UTF-8' } } + +subprojects { + if (!it.name.startsWith('bridge')) { + ext { + slf4jVersion = '1.7.21' + } + + dependencies { + compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion + compile group: 'org.osgi', name: 'org.osgi.core', version: '6.0.0' + } + } +} \ No newline at end of file diff --git a/mcserver-manager/build.gradle b/mcserver-manager/build.gradle index 7792ce7..ac63d5a 100644 --- a/mcserver-manager/build.gradle +++ b/mcserver-manager/build.gradle @@ -1,13 +1,21 @@ group = 'asys' -version = '0.5-SNAPSHOT' +version = '0.6-SNAPSHOT' apply plugin: 'osgi' +configurations { + include + compile.extendsFrom include +} + jar { manifest { name = 'ASys MC server manager' instruction 'Bundle-Activator', 'asys.mcsmanager.Activator' } + + dependsOn configurations.include + from { configurations.include.collect { it.isDirectory() ? it : zipTree(it) } } } ext { @@ -17,5 +25,6 @@ ext { dependencies { compile project(':core') compile project(':webinterface') + include files(project(':bridge-protocol').sourceSets.main.output.classesDir) compile group: 'io.netty', name: 'netty-codec', version: nettyVersion } diff --git a/settings.gradle b/settings.gradle index a53a709..756f383 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,3 +2,4 @@ rootProject.name = 'asys' include 'core' include 'webinterface' include 'mcserver-manager' +include 'bridge-protocol'