From 94a00ccab8f133d309a7b362e08b9157817569af Mon Sep 17 00:00:00 2001
From: Zaxar163 <zahar.vcherachny@yandex.ru>
Date: Wed, 14 Aug 2019 09:49:19 +0300
Subject: [PATCH] =?UTF-8?q?[ANY]=20=D0=A0=D0=B0=D0=B7=D0=BE=D0=B1=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BD=20=D0=B7=D0=B0=D0=B2=D0=B0=D0=BB=20=D1=81=D0=BE=20?=
 =?UTF-8?q?=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D0=B0=D0=BC=D0=B8=20=D1=81?=
 =?UTF-8?q?=D0=B1=D0=BE=D1=80=D0=BA=D0=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LauncherTest/build.gradle                          | 2 +-
 modules                                            | 2 +-
 scripts/launch_module.gradle                       | 8 ++++++++
 module.gradle => scripts/lsrv_module.gradle        | 0
 scripts/srvwrap_module.gradle                      | 8 ++++++++
 test_support.gradle => scripts/test_support.gradle | 0
 settings.gradle                                    | 2 +-
 7 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 scripts/launch_module.gradle
 rename module.gradle => scripts/lsrv_module.gradle (100%)
 create mode 100644 scripts/srvwrap_module.gradle
 rename test_support.gradle => scripts/test_support.gradle (100%)

diff --git a/LauncherTest/build.gradle b/LauncherTest/build.gradle
index 26dd0c86..79de57c8 100644
--- a/LauncherTest/build.gradle
+++ b/LauncherTest/build.gradle
@@ -1,4 +1,4 @@
-apply from: '../test_support.gradle'
+apply from: '../scripts/test_support.gradle'
 
 dependencies {
     compile project(':LaunchServer')
diff --git a/modules b/modules
index 53293737..87fe3184 160000
--- a/modules
+++ b/modules
@@ -1 +1 @@
-Subproject commit 532937377fd774aeb49faaf61e50dbe20f2093e5
+Subproject commit 87fe3184197497065962f3013b1c0f4d1fe0b5e3
diff --git a/scripts/launch_module.gradle b/scripts/launch_module.gradle
new file mode 100644
index 00000000..8f742414
--- /dev/null
+++ b/scripts/launch_module.gradle
@@ -0,0 +1,8 @@
+dependencies {
+    compileOnly project(':Launcher')
+}
+
+jar {
+    from { configurations.runtime.collect { it.isDirectory() ? it : zipTree(it) } }
+}
+
diff --git a/module.gradle b/scripts/lsrv_module.gradle
similarity index 100%
rename from module.gradle
rename to scripts/lsrv_module.gradle
diff --git a/scripts/srvwrap_module.gradle b/scripts/srvwrap_module.gradle
new file mode 100644
index 00000000..29e568c3
--- /dev/null
+++ b/scripts/srvwrap_module.gradle
@@ -0,0 +1,8 @@
+dependencies {
+    compileOnly project(':ServerWrapper')
+}
+
+jar {
+    from { configurations.runtime.collect { it.isDirectory() ? it : zipTree(it) } }
+}
+
diff --git a/test_support.gradle b/scripts/test_support.gradle
similarity index 100%
rename from test_support.gradle
rename to scripts/test_support.gradle
diff --git a/settings.gradle b/settings.gradle
index ac4f0e76..f88da384 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,5 +10,5 @@
 include 'LauncherTest'
 include 'modules'
 file('modules').eachDir { sub ->
-    if (sub.name.endsWith('_module')) include 'modules:' + sub.name
+    if (sub.name.endsWith('_module') || sub.name.endsWith('_swmodule') || sub.name.endsWith('_lmodule')) include 'modules:' + sub.name
 }